[196740] v3 doc updates for wst server docs
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml b/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
index 220d7ef..19fd1a5 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/DocBuild.xml
@@ -21,6 +21,8 @@
ChangeLog:
2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
- Created.
+ 2008-01-09 Kate Price <katep@ca.ibm.com>
+ - modified for new DITA-OT version
-->
<project name="eclipsehelp" default="all">
@@ -44,14 +46,14 @@
<target name="eclipsehelp">
<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
<property name="args.copycss" value="no" />
- <property name="args.csspath" value="org.eclipse.wst.doc.user" />
+ <property name="args.csspath" value="../org.eclipse.wst.doc.user" />
<property name="args.eclipse.provider" value="Eclipse.org" />
- <property name="args.eclipse.version" value="1.5.0" />
- <property name="args.input" location="wtp_create.ditamap" />
+ <property name="args.eclipse.version" value="3.0.0" />
+ <property name="args.input" location="org.eclipse.wst.server.ui.doc.user.ditamap" />
<property name="clean.temp" value="true" />
<property name="dita.extname" value=".dita" />
<property name="dita.temp.dir" location="temp" />
- <property name="output.dir" location=".." />
+ <property name="output.dir" location="" />
<property name="transtype" value="eclipsehelp" />
</ant>
<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
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 e8493a3..cd0a19f 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.server.ui.doc.user; singleton:=true
-Bundle-Version: 1.0.303.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
Eclipse-LazyStart: true
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 8696b81..d1dfa68 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 @@
<?eclipse version="3.0"?>
<?NLS TYPE="org.eclipse.help.toc"?>
<!-- /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.xml b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.xml
index ed9d47d..5ed77fa 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/org.eclipse.wst.server.ui.doc.user.xml
@@ -1,35 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
<toc label="For building purposes" topic="topics/cwflow.html">
- <topic label="Which server will start" href="topics/cwflow.html"/>
- <topic label="Testing and publishing on your server" href="topics/cwover.html"/>
- <topic label="Resources used to test and publish on your server" href="topics/cwres.html"/>
- <topic label="Servers view" href="topics/rwrcview.html"/>
- <topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
- <topic label="Debugging a JSP file on a server" href="topics/tdbgjsp.html"/>
- <topic label="Debugging applications on a server" href="topics/tdebug.html"/>
- <topic label="Testing artifacts on a server" href="topics/testing.html"/>
- <topic label="Testing applications on a server" href="topics/tj2ee.html"/>
- <topic label="Limitations and restrictions" href="topics/tlimits.html"/>
- <topic label="Defining server preferences" href="topics/tpref.html"/>
- <topic label="Defining the audio preferences" href="topics/tprefaud.html"/>
- <topic label="Publishing applications to a server" href="topics/tpublish.html"/>
- <topic label="Debugging a servlet on a server" href="topics/tservlet.html"/>
- <topic label="Adding projects to a server" href="topics/twaddprj.html"/>
- <topic label="Creating a server" href="topics/twcrtins.html"/>
- <topic label="Deleting a server" href="topics/twdelins.html"/>
- <topic label="Editing a server" href="topics/twedtins.html"/>
- <topic label="Defining the installed server runtime environments preferences" href="topics/twinstprf.html"/>
- <topic label="Managing servers" href="topics/twmanage.html"/>
- <topic label="Setting a default server" href="topics/twprefin.html"/>
- <topic label="Publishing your application" href="topics/twpub.html"/>
- <topic label="Removing a project from a server" href="topics/twremprj.html"/>
- <topic label="Starting a server in debug mode" href="topics/twsrtdbg.html"/>
- <topic label="Starting a server" href="topics/twsrtins.html"/>
- <topic label="Defining the server preferences" href="topics/twsrvprf.html"/>
- <topic label="Stopping a server" href="topics/twstpins.html"/>
- <topic label="Defining the TCP/IP Monitor preferences" href="topics/twtcpprf.html"/>
- <topic label="Creating, editing, and deleting servers" href="topics/tcreate.html"/>
- <topic label="Displaying or hiding the metadata of the server" href="topics/tmetasrv.html"/>
- <topic label="Defining the launching preferences" href="topics/twlaunchpref.html"/>
-</toc>
\ No newline at end of file
+<topic label="Which server will start" href="topics/cwflow.html"/>
+<topic label="Testing and publishing on your server" href="topics/cwover.html"/>
+<topic label="Resources used to test and publish on your server" href="topics/cwres.html"/>
+<topic label="Servers view" href="topics/rwrcview.html"/>
+<topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
+<topic label="Debugging a JSP file on a server" href="topics/tdbgjsp.html"/>
+<topic label="Debugging applications on a server" href="topics/tdebug.html"/>
+<topic label="Testing artifacts on a server" href="topics/testing.html"/>
+<topic label="Testing applications on a server" href="topics/tj2ee.html"/>
+<topic label="Limitations and restrictions" href="topics/tlimits.html"/>
+<topic label="Defining server preferences" href="topics/tpref.html"/>
+<topic label="Defining the audio preferences" href="topics/tprefaud.html"/>
+<topic label="Publishing applications to a server" href="topics/tpublish.html"/>
+<topic label="Debugging a servlet on a server" href="topics/tservlet.html"/>
+<topic label="Adding projects to a server" href="topics/twaddprj.html"/>
+<topic label="Creating a server" href="topics/twcrtins.html"/>
+<topic label="Deleting a server" href="topics/twdelins.html"/>
+<topic label="Editing a server" href="topics/twedtins.html"/>
+<topic label="Defining the installed server runtime environments preferences" href="topics/twinstprf.html"/>
+<topic label="Managing servers" href="topics/twmanage.html"/>
+<topic label="Setting a default server" href="topics/twprefin.html"/>
+<topic label="Publishing your application" href="topics/twpub.html"/>
+<topic label="Removing a project from a server" href="topics/twremprj.html"/>
+<topic label="Starting a server in debug mode" href="topics/twsrtdbg.html"/>
+<topic label="Starting a server" href="topics/twsrtins.html"/>
+<topic label="Defining the server preference" href="topics/twsrvprf.html"/>
+<topic label="Stopping a server" href="topics/twstpins.html"/>
+<topic label="Defining the TCP/IP Monitor preferences" href="topics/twtcpprf.html"/>
+<topic label="Creating, editing, and deleting servers" href="topics/tcreate.html"/>
+<topic label="Displaying or hiding the metadata of the server" href="topics/tmetasrv.html"/>
+<topic label="Defining the launching preferences" href="topics/twlaunchpref.html"/>
+</toc>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml b/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
index 8696b81..d1dfa68 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/plugin.xml
@@ -2,7 +2,7 @@
<?eclipse version="3.0"?>
<?NLS TYPE="org.eclipse.help.toc"?>
<!-- /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
index be8c3c1..5c0f851 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwflow.html
@@ -2,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Which server will start" />
<meta name="abstract" content="You can start the server automatically as part of running a selected resource on the server, or you can simply start the server without running resources on the server. For example, the server is automatically started when you right-click a project or an application resource in the Project Explorer view and select Run As > Run on Server. If you want to start the server without running resources on the server, in the Servers view select a server and select the Start the server This is an image of the Run on Server icon icon, the Start the server in debug mode This is an image of the Debug on server icon. icon , or the Start the server in profiling mode This is an image of the Start the server in profiling mode icon. icon." />
<meta name="description" content="You can start the server automatically as part of running a selected resource on the server, or you can simply start the server without running resources on the server. For example, the server is automatically started when you right-click a project or an application resource in the Project Explorer view and select Run As > Run on Server. If you want to start the server without running resources on the server, in the Servers view select a server and select the Start the server This is an image of the Run on Server icon icon, the Start the server in debug mode This is an image of the Debug on server icon. icon , or the Start the server in profiling mode This is an image of the Start the server in profiling mode icon. icon." />
-<meta content="servers, starting, Run on Server wizard, wizards, Run on Server" name="DC.subject" />
-<meta content="servers, starting, Run on Server wizard, wizards, Run on Server" name="keywords" />
+<meta content="servers, starting" name="DC.subject" />
+<meta content="servers, starting" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="cwflow_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
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 4802744..7b0ea3b 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,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Testing and publishing on your server" />
<meta name="abstract" content="The testing and publishing tools provides runtime environments where you can test JSP files, servlets, HTML files, and Java classes." />
<meta name="description" content="The testing and publishing tools provides runtime environments where you can test JSP files, servlets, HTML files, and Java classes." />
-<meta content="servers, testing, publishing, JSP files, testing and publishing on a server, servlets, Dynamic Web projects, Static Web projects, Enterprise Applications projects, testing and publishing on a server, Application Client Projects" name="DC.subject" />
-<meta content="servers, testing, publishing, JSP files, testing and publishing on a server, servlets, Dynamic Web projects, Static Web projects, Enterprise Applications projects, testing and publishing on a server, Application Client Projects" name="keywords" />
+<meta content="application client projects, testing on servers, servers, testing project resources" name="DC.subject" />
+<meta content="application client projects, testing on servers, servers, testing project resources" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="cwover_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -61,6 +61,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.dita
index 3aa9e2f..d5845e4 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.dita
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/cwres.dita
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
"concept.dtd">
<concept id="cwres_wst" xml:lang="en-us">
@@ -7,8 +7,8 @@
<shortdesc id="cwres_shortdesc">To test and publish on your server, you need
to define one or more of the following resources:</shortdesc>
<prolog><metadata>
-<keywords id="index"><indexterm>preferences<indexterm>installed server runtime environments</indexterm></indexterm>
-<indexterm>runtime environments<indexterm>description</indexterm></indexterm>
+<keywords id="index"><indexterm>preferences<indexterm>installed server runtime
+environments</indexterm></indexterm><indexterm>runtime environments<indexterm>description</indexterm></indexterm>
<indexterm>servers<indexterm>testing applications</indexterm></indexterm>
</keywords>
</metadata></prolog>
@@ -24,7 +24,7 @@
project</i> contains servers and server configuration files. When a server
project is created automatically by the workbench, the name given to the project
is <uicontrol>Servers</uicontrol> and is available in the Project Explorer
-view under the Other Projects folder.</p></section>
+view.</p></section>
<section id="cwres_servers"><title id="cwres_servers_title">Server</title><p
id="cwres_servers_p1">A <i>server</i> identifies where you want to test or
publish your application. A server points to a specific runtime environment
@@ -37,9 +37,9 @@
to the <i>Displaying or hiding the metadata of the server</i> link at the
bottom of this topic.</p></section>
<section><title id="cwres_serverconfig_title">Server configurations</title><p
-id="cwres_serverconfig_p1"><ph>Server configurations are files that contains
-information that is required to set up and publish to a server. For example,
-these files may include information about what port to run the server, security
+id="cwres_serverconfig_p1"><ph>Server configurations are files that contain
+information <?Pub Caret?>to set up and publish to a server. For example, these
+files may include information about what port to run the server, security
preferences and other vendor-specific server settings.</ph></p><p id="cwres_serverconfig_p2">On
the workbench, the metadata of the server configurations is automatically
created and stored in a <i>configuration data folder</i> under a server project.
@@ -64,4 +64,4 @@
one or more projects. A project can be pointed from one or more server configurations.</p></section>
</conbody>
</concept>
-<?Pub *0000004654?>
+<?Pub *0000004248?>
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 f22c024..b1681ed 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Resources used to test and publish on your server" />
<meta name="abstract" content="To test and publish on your server, you need to define one or more of the following resources:" />
<meta name="description" content="To test and publish on your server, you need to define one or more of the following resources:" />
-<meta content="servers, overview, creating projects, runtime environment, description, server projects, server configurations, preferences, installed server runtime environments, applications, compiling" name="DC.subject" />
-<meta content="servers, overview, creating projects, runtime environment, description, server projects, server configurations, preferences, installed server runtime environments, applications, compiling" name="keywords" />
+<meta content="preferences, installed server runtime environments, runtime environments, description, servers, testing applications" name="DC.subject" />
+<meta content="preferences, installed server runtime environments, runtime environments, description, servers, testing applications" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="cwres_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -44,7 +44,7 @@
project</em> contains servers and server configuration files. When a server
project is created automatically by the workbench, the name given to the project
is <span class="uicontrol">Servers</span> and is available in the Project Explorer
-view under the Other Projects folder.</p>
+view.</p>
</div>
<div class="section" id="cwres_wst__cwres_servers"><a name="cwres_wst__cwres_servers"><!-- --></a><h4 class="sectiontitle">Server</h4><p id="cwres_wst__cwres_servers_p1"><a name="cwres_wst__cwres_servers_p1"><!-- --></a>A <em>server</em> identifies where you want to test or
@@ -60,9 +60,9 @@
bottom of this topic.</p>
</div>
-<div class="section"><h4 class="sectiontitle">Server configurations</h4><p id="cwres_wst__cwres_serverconfig_p1"><a name="cwres_wst__cwres_serverconfig_p1"><!-- --></a><span>Server configurations are files that contains
-information that is required to set up and publish to a server. For example,
-these files may include information about what port to run the server, security
+<div class="section"><h4 class="sectiontitle">Server configurations</h4><p id="cwres_wst__cwres_serverconfig_p1"><a name="cwres_wst__cwres_serverconfig_p1"><!-- --></a><span>Server configurations are files that contain
+information to set up and publish to a server. For example, these
+files may include information about what port to run the server, security
preferences and other vendor-specific server settings.</span></p>
<p id="cwres_wst__cwres_serverconfig_p2"><a name="cwres_wst__cwres_serverconfig_p2"><!-- --></a>On
the workbench, the metadata of the server configurations is automatically
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.dita
index 779c9d2..4e9a6b6 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.dita
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/rwrcview.dita
@@ -1,18 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
+<!--Arbortext, Inc., 1988-2006, v.4002-->
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"reference.dtd">
+<?Pub Sty _display FontColor="red"?>
<?Pub Inc?>
<reference id="rwrcview_wst" xml:lang="en-us">
<title id="rwrcview_title">Servers view</title>
<shortdesc><ph id="rwrcview_ph1">The Servers view (similar to the one shown
below) allows you to manage the servers. This view displays a list of all
-your servers and configurations that are associated with that server. You
-can use this view to start, start in debug mode,</ph><ph id="rwrcview_ph2"> restart,
-or stop the servers.</ph></shortdesc>
+your servers and projects that are associated with that server. A project
+displays under a server when a project from the workbench is added to the
+server. You can use this view to start, start in debug mode,</ph><ph id="rwrcview_ph2"> restart,
+or stop the servers. In addition, you can use the Servers view to determine
+the current status and state of the server; and the projects added to the
+server from the workbench.</ph></shortdesc>
<prolog><metadata>
-<keywords id="index"><indexterm>servers<indexterm>managing using the Servers view</indexterm></indexterm>
-<indexterm>views<indexterm>Servers</indexterm></indexterm>
+<keywords id="index"><indexterm>servers<indexterm>managing using the Servers
+view</indexterm></indexterm><indexterm>views<indexterm>Servers</indexterm></indexterm>
</keywords>
</metadata></prolog>
<refbody>
@@ -32,34 +36,71 @@
<li id="rwrcview_li11b">Displaying or hiding the metadata of the server from
the workbench</li>
<li id="rwrcview_li12">Add and remove projects from a server</li>
-</ul><p id="rwrcview_p3">The Servers view displays the current status of all
-the servers. The <b>Status</b> column indicates whether or not a server has
-been started. The following lists the possible server status:</p><ul>
-<li id="rwrcview_ul2li1">Starting</li>
-<li id="rwrcview_ul2li2">Started</li>
-<li id="rwrcview_ul2li3">Debugging</li>
-<li id="rwrcview_ul2li4">Stopping</li>
-<li id="rwrcview_ul2li5">Stopped</li>
-</ul><p id="rwrcview_p4">The Servers view also displays the current state
-of all the servers. Depending on the status of the server and the preference
-options that are selected for that particular server, the workbench determines
-the server actions that may be taken. Use the <b>State</b> column as an indicator
-for possible actions that you may want to take. For example, if the workbench
-detects that a file defined to run on a particular server has changed, and
-the <uicontrol>Automatically restart servers when necessary</uicontrol> check
-box has been selected on the Server preferences page ( <uicontrol>Window >
-Preferences > Server > Launching</uicontrol>), the server tools
-automatically restart that server. The <uicontrol>Status</uicontrol> column
+</ul></section>
+<section><title id="rwrcview_section_server_state_title">Server State</title><p
+id="rwrcview_rwrcview_section_server_state_p1">The Servers view displays the
+current state of all the servers. The <b>State</b> column indicates whether
+or not a server has been started. </p><p id="rwrcview_rwrcview_section_server_state_p2">The
+following table lists the possible states of the server:</p><table><title
+id="rwrcview_section_server_state_table_title">Description of the server states</title>
+<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>
+<thead id="rwrcview_section_server_state_table_thead">
+<row>
+<entry> Server state</entry>
+<entry> Description of state </entry>
+</row>
+</thead>
+<tbody>
+<row id="rwrcview_section_server_state_starting">
+<entry><ph>Starting</ph></entry>
+<entry>The workbench is in the process of connecting and begin the server
+process.<note type="tip">Verify the actual server is started.</note></entry>
+</row>
+<row id="rwrcview_section_server_state_started">
+<entry colname="COLSPEC0">Started</entry>
+<entry colname="COLSPEC1">The workbench is successfully connected to the server.
+Both the workbench and server are ready to run applications on the server.</entry>
+</row>
+<row id="rwrcview_section_server_state_debugging">
+<entry>Debugging</entry>
+<entry>The workbench is successfully connected to the server. Both the workbench
+and server are ready to diagnose applications on the server.</entry>
+</row>
+<row id="rwrcview_section_server_state_stopping">
+<entry>Stopping</entry>
+<entry>The workbench is in the process of connecting and ending the process
+on the server.</entry>
+</row>
+<row id="rwrcview_section_server_state_stopped">
+<entry>Stopped</entry>
+<entry>The server process has ended. Or the workbench is unable to connect
+to the server.<note type="tip">When attempting to connect to the server and
+the state of the server remains in stopped, verify the actual server is started
+and the port information is correctly provided in the workbench.</note></entry>
+</row>
+</tbody>
+</tgroup>
+</table></section>
+<section id="rwrcview_section_server_status"><title>Server Status</title><p>The
+Servers view also displays the current status of all the servers. Depending
+on the state of the server and the preference options that are selected for
+that particular server, the workbench determines the server actions that may
+be taken. Use the <b>Status</b> column as an indicator for possible actions
+that you may want to take. For example, if the workbench detects that a file
+defined to run on a particular server has changed, and the <uicontrol>Automatically
+restart servers when necessary</uicontrol> check box has been selected on
+the Server preferences page ( <uicontrol>Window > Preferences > Server > Launching</uicontrol>),
+the workbench automatically restart that server. The <uicontrol>State</uicontrol> column
in the Servers view changes from <varname>Started</varname> to <varname>Stopped</varname> to
<varname>Started</varname>. However, if this check box is not selected, the
- <uicontrol>State</uicontrol> column in the Servers view changes to <varname>Republish</varname>.</p><p
-id="rwrcview_p5">The following table lists the possible server states:</p><table
-id="rwrcview_table"><title>Description of server states</title>
+ <uicontrol>Status</uicontrol> column in the Servers view changes to <varname>Republish</varname>.</p><p>The
+following table lists the possible server status:</p><table><title>Description
+of the server status</title>
<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>
<thead>
<row>
-<entry> Server states </entry>
-<entry> Description of states </entry>
+<entry> Server status </entry>
+<entry> Description of status </entry>
</row>
</thead>
<tbody>
@@ -69,8 +110,8 @@
</row>
<row>
<entry colname="COLSPEC0">Publishing</entry>
-<entry colname="COLSPEC1">Files (projects, resource files, and server configurations)
-are copied to the correct location for the server to find and use them.</entry>
+<entry colname="COLSPEC1">Files (projects and resource files) are copied to
+the correct location for the server to find and use them.</entry>
</row>
<row>
<entry>Restart</entry>
@@ -78,8 +119,8 @@
</row>
<row>
<entry>Republish</entry>
-<entry> Either the server or the applications or both have changed. The changed
-files need to be republished.</entry>
+<entry>Either the server or the applications or both have changed. The changed
+files need to be updated on the server.</entry>
</row>
<row>
<entry>Restart and republish</entry>
@@ -89,6 +130,65 @@
</tbody>
</tgroup>
</table></section>
+<section id="rwrcview_section_project_state"><title>Project State</title><p>The
+Servers view might display the current state of the application is either
+started or stopped. When the Servers view does not display a current state
+for the project, the workbench cannot retrieve the state of the project from
+the server or the server does not support this function.</p><p>If a project
+name appears in italic font style, this means the project has not yet been
+uploaded to the server. After the project is published into the server, the
+project name switches to the typical font style used in the Servers view.</p><p>The
+following table lists the possible states of the project:<table><title>Description
+of project states</title>
+<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>
+<thead>
+<row>
+<entry> Project states </entry>
+<entry> Description of states </entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry>Started</entry>
+<entry>The application on the server is ready to run on the server.</entry>
+</row>
+<row>
+<entry colname="COLSPEC0">Stopped</entry>
+<entry colname="COLSPEC1">The application on the server is ended and is not
+taking server requests to run.</entry>
+</row>
+</tbody>
+</tgroup>
+</table></p></section>
+<section id="rwrcview_section_project_status"><title>Project Status</title><p>The
+Servers view might display the current status of the application is either
+synchronized or republished. When the Servers view does not display a current
+status for the project, the workbench cannot retrieve the status of the project
+from the server, the server is stopped or the server does not support this
+function.</p><p id="rwrcview_p3a">The following table lists the possible project
+status:</p><table><?Pub Caret?><title>Description of project status</title>
+<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>
+<thead>
+<row>
+<entry> Project status </entry>
+<entry> Description of status </entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry>Synchronized</entry>
+<entry>Both copies of the application files on the server and in the workbench
+are matching.</entry>
+</row>
+<row>
+<entry colname="COLSPEC0">Republished</entry>
+<entry colname="COLSPEC1">The copy of the application files on the workbench
+has changed and does not match the copy on the server. The server needs to
+be updated.</entry>
+</row>
+</tbody>
+</tgroup>
+</table></section>
</refbody>
</reference>
-<?Pub *0000004579?>
+<?Pub *0000008712?>
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 911af08..2da892b 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,17 +2,17 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
<meta content="reference" name="DC.Type" />
<meta name="DC.Title" content="Servers view" />
-<meta name="abstract" content="The Servers view (similar to the one shown below) allows you to manage the servers. This view displays a list of all your servers and configurations that are associated with that server. You can use this view to start, start in debug mode, restart, or stop the servers." />
-<meta name="description" content="The Servers view (similar to the one shown below) allows you to manage the servers. This view displays a list of all your servers and configurations that are associated with that server. You can use this view to start, start in debug mode, restart, or stop the servers." />
-<meta content="views, Servers, servers, displaying status, displaying state, displaying configurations, managing using the Servers view, Servers view" name="DC.subject" />
-<meta content="views, Servers, servers, displaying status, displaying state, displaying configurations, managing using the Servers view, Servers view" name="keywords" />
+<meta name="abstract" content="The Servers view (similar to the one shown below) allows you to manage the servers. This view displays a list of all your servers and projects that are associated with that server. A project displays under a server when a project from the workbench is added to the server. You can use this view to start, start in debug mode, restart, or stop the servers. In addition, you can use the Servers view to determine the current status and state of the server; and the projects added to the server from the workbench." />
+<meta name="description" content="The Servers view (similar to the one shown below) allows you to manage the servers. This view displays a list of all your servers and projects that are associated with that server. A project displays under a server when a project from the workbench is added to the server. You can use this view to start, start in debug mode, restart, or stop the servers. In addition, you can use the Servers view to determine the current status and state of the server; and the projects added to the server from the workbench." />
+<meta content="servers, managing using the Servers view, views, Servers" name="DC.subject" />
+<meta content="servers, managing using the Servers view, views, Servers" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="rwrcview_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -28,9 +28,12 @@
<div><p><span id="rwrcview_ph1"><a name="rwrcview_ph1"><!-- --></a>The Servers view (similar to the one shown
below) allows you to manage the servers. This view displays a list of all
-your servers and configurations that are associated with that server. You
-can use this view to start, start in debug mode,</span><span id="rwrcview_ph2"><a name="rwrcview_ph2"><!-- --></a> restart,
-or stop the servers.</span></p>
+your servers and projects that are associated with that server. A project
+displays under a server when a project from the workbench is added to the
+server. You can use this view to start, start in debug mode,</span><span id="rwrcview_ph2"><a name="rwrcview_ph2"><!-- --></a> restart,
+or stop the servers. In addition, you can use the Servers view to determine
+the current status and state of the server; and the projects added to the
+server from the workbench.</span></p>
<div class="section"><p> <img src="../images/scpview.gif" alt="This is a screen capture of the Server view." /> </p>
<p id="rwrcview_wst__rwrcview_p2"><a name="rwrcview_wst__rwrcview_p2"><!-- --></a>Use
@@ -62,42 +65,99 @@
<li id="rwrcview_wst__rwrcview_li12"><a name="rwrcview_wst__rwrcview_li12"><!-- --></a>Add and remove projects from a server</li>
</ul>
-<p id="rwrcview_wst__rwrcview_p3"><a name="rwrcview_wst__rwrcview_p3"><!-- --></a>The Servers view displays the current status of all
-the servers. The <strong>Status</strong> column indicates whether or not a server has
-been started. The following lists the possible server status:</p>
-<ul>
-<li id="rwrcview_wst__rwrcview_ul2li1"><a name="rwrcview_wst__rwrcview_ul2li1"><!-- --></a>Starting</li>
+</div>
-<li id="rwrcview_wst__rwrcview_ul2li2"><a name="rwrcview_wst__rwrcview_ul2li2"><!-- --></a>Started</li>
+<div class="section"><h4 class="sectiontitle">Server State</h4><p id="rwrcview_wst__rwrcview_rwrcview_section_server_state_p1"><a name="rwrcview_wst__rwrcview_rwrcview_section_server_state_p1"><!-- --></a>The Servers view displays the
+current state of all the servers. The <strong>State</strong> column indicates whether
+or not a server has been started. </p>
+<p id="rwrcview_wst__rwrcview_rwrcview_section_server_state_p2"><a name="rwrcview_wst__rwrcview_rwrcview_section_server_state_p2"><!-- --></a>The
+following table lists the possible states of the server:</p>
-<li id="rwrcview_wst__rwrcview_ul2li3"><a name="rwrcview_wst__rwrcview_ul2li3"><!-- --></a>Debugging</li>
-
-<li id="rwrcview_wst__rwrcview_ul2li4"><a name="rwrcview_wst__rwrcview_ul2li4"><!-- --></a>Stopping</li>
-
-<li id="rwrcview_wst__rwrcview_ul2li5"><a name="rwrcview_wst__rwrcview_ul2li5"><!-- --></a>Stopped</li>
-
-</ul>
-<p id="rwrcview_wst__rwrcview_p4"><a name="rwrcview_wst__rwrcview_p4"><!-- --></a>The Servers view also displays the current state
-of all the servers. Depending on the status of the server and the preference
-options that are selected for that particular server, the workbench determines
-the server actions that may be taken. Use the <strong>State</strong> column as an indicator
-for possible actions that you may want to take. For example, if the workbench
-detects that a file defined to run on a particular server has changed, and
-the <span class="uicontrol">Automatically restart servers when necessary</span> check
-box has been selected on the Server preferences page ( <span class="uicontrol">Window >
-Preferences > Server > Launching</span>), the server tools
-automatically restart that server. The <span class="uicontrol">Status</span> column
-in the Servers view changes from <var class="varname">Started</var> to <var class="varname">Stopped</var> to
- <var class="varname">Started</var>. However, if this check box is not selected, the
- <span class="uicontrol">State</span> column in the Servers view changes to <var class="varname">Republish</var>.</p>
-<p id="rwrcview_wst__rwrcview_p5"><a name="rwrcview_wst__rwrcview_p5"><!-- --></a>The following table lists the possible server states:</p>
-
-<div class="tablenoborder"><a name="rwrcview_wst__rwrcview_table"><!-- --></a><table summary="" cellspacing="0" cellpadding="4" id="rwrcview_wst__rwrcview_table" frame="border" border="1" rules="all"><caption>Table 1. Description of server states</caption>
+<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all"><caption>Table 1. Description of the server states</caption>
<thead align="left">
<tr>
-<th valign="top" id="N10176"> Server states </th>
+<th valign="top" id="N10109"> Server state</th>
-<th valign="top" id="N1017D"> Description of states </th>
+<th valign="top" id="N10110"> Description of state </th>
+
+</tr>
+
+</thead>
+
+<tbody>
+<tr id="rwrcview_wst__rwrcview_section_server_state_starting">
+<td valign="top" headers="N10109 "><span>Starting</span></td>
+
+<td valign="top" headers="N10110 ">The workbench is in the process of connecting and begin the server
+process.<div class="tip"><span class="tiptitle">Tip:</span> Verify the actual server is started.</div>
+</td>
+
+</tr>
+
+<tr id="rwrcview_wst__rwrcview_section_server_state_started">
+<td valign="top" headers="N10109 ">Started</td>
+
+<td valign="top" headers="N10110 ">The workbench is successfully connected to the server.
+Both the workbench and server are ready to run applications on the server.</td>
+
+</tr>
+
+<tr id="rwrcview_wst__rwrcview_section_server_state_debugging">
+<td valign="top" headers="N10109 ">Debugging</td>
+
+<td valign="top" headers="N10110 ">The workbench is successfully connected to the server. Both the workbench
+and server are ready to diagnose applications on the server.</td>
+
+</tr>
+
+<tr id="rwrcview_wst__rwrcview_section_server_state_stopping">
+<td valign="top" headers="N10109 ">Stopping</td>
+
+<td valign="top" headers="N10110 ">The workbench is in the process of connecting and ending the process
+on the server.</td>
+
+</tr>
+
+<tr id="rwrcview_wst__rwrcview_section_server_state_stopped">
+<td valign="top" headers="N10109 ">Stopped</td>
+
+<td valign="top" headers="N10110 ">The server process has ended. Or the workbench is unable to connect
+to the server.<div class="tip"><span class="tiptitle">Tip:</span> When attempting to connect to the server and
+the state of the server remains in stopped, verify the actual server is started
+and the port information is correctly provided in the workbench.</div>
+</td>
+
+</tr>
+
+</tbody>
+
+</table>
+</div>
+</div>
+
+<div class="section" id="rwrcview_wst__rwrcview_section_server_status"><a name="rwrcview_wst__rwrcview_section_server_status"><!-- --></a><h4 class="sectiontitle">Server Status</h4><p>The
+Servers view also displays the current status of all the servers. Depending
+on the state of the server and the preference options that are selected for
+that particular server, the workbench determines the server actions that may
+be taken. Use the <strong>Status</strong> column as an indicator for possible actions
+that you may want to take. For example, if the workbench detects that a file
+defined to run on a particular server has changed, and the <span class="uicontrol">Automatically
+restart servers when necessary</span> check box has been selected on
+the Server preferences page ( <span class="uicontrol">Window > Preferences > Server > Launching</span>),
+the workbench automatically restart that server. The <span class="uicontrol">State</span> column
+in the Servers view changes from <var class="varname">Started</var> to <var class="varname">Stopped</var> to
+ <var class="varname">Started</var>. However, if this check box is not selected, the
+ <span class="uicontrol">Status</span> column in the Servers view changes to <var class="varname">Republish</var>.</p>
+<p>The
+following table lists the possible server status:</p>
+
+<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all"><caption>Table 2. Description
+of the server status</caption>
+<thead align="left">
+<tr>
+<th valign="top" id="N10208"> Server status </th>
+
+<th valign="top" id="N1020F"> Description of status </th>
</tr>
@@ -105,39 +165,39 @@
<tbody>
<tr>
-<td valign="top" headers="N10176 ">Synchronized</td>
+<td valign="top" headers="N10208 ">Synchronized</td>
-<td valign="top" headers="N1017D ">Both the server and the applications are in synch.</td>
+<td valign="top" headers="N1020F ">Both the server and the applications are in synch.</td>
</tr>
<tr>
-<td valign="top" headers="N10176 ">Publishing</td>
+<td valign="top" headers="N10208 ">Publishing</td>
-<td valign="top" headers="N1017D ">Files (projects, resource files, and server configurations)
-are copied to the correct location for the server to find and use them.</td>
+<td valign="top" headers="N1020F ">Files (projects and resource files) are copied to
+the correct location for the server to find and use them.</td>
</tr>
<tr>
-<td valign="top" headers="N10176 ">Restart</td>
+<td valign="top" headers="N10208 ">Restart</td>
-<td valign="top" headers="N1017D ">The server needs to be restarted in order for the changes to take place.</td>
+<td valign="top" headers="N1020F ">The server needs to be restarted in order for the changes to take place.</td>
</tr>
<tr>
-<td valign="top" headers="N10176 ">Republish</td>
+<td valign="top" headers="N10208 ">Republish</td>
-<td valign="top" headers="N1017D "> Either the server or the applications or both have changed. The changed
-files need to be republished.</td>
+<td valign="top" headers="N1020F ">Either the server or the applications or both have changed. The changed
+files need to be updated on the server.</td>
</tr>
<tr>
-<td valign="top" headers="N10176 ">Restart and republish</td>
+<td valign="top" headers="N10208 ">Restart and republish</td>
-<td valign="top" headers="N1017D "> Either the server or the applications or both have changed. When the
+<td valign="top" headers="N1020F "> Either the server or the applications or both have changed. When the
server is restarted, the changed files are also republished.</td>
</tr>
@@ -148,8 +208,99 @@
</div>
</div>
+<div class="section" id="rwrcview_wst__rwrcview_section_project_state"><a name="rwrcview_wst__rwrcview_section_project_state"><!-- --></a><h4 class="sectiontitle">Project State</h4><p>The
+Servers view might display the current state of the application is either
+started or stopped. When the Servers view does not display a current state
+for the project, the workbench cannot retrieve the state of the project from
+the server or the server does not support this function.</p>
+<p>If a project
+name appears in italic font style, this means the project has not yet been
+uploaded to the server. After the project is published into the server, the
+project name switches to the typical font style used in the Servers view.</p>
+<div class="p">The
+following table lists the possible states of the project:
+<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all"><caption>Table 3. Description
+of project states</caption>
+<thead align="left">
+<tr>
+<th valign="top" id="N102C1"> Project states </th>
+
+<th valign="top" id="N102C8"> Description of states </th>
+
+</tr>
+
+</thead>
+
+<tbody>
+<tr>
+<td valign="top" headers="N102C1 ">Started</td>
+
+<td valign="top" headers="N102C8 ">The application on the server is ready to run on the server.</td>
+
+</tr>
+
+<tr>
+<td valign="top" headers="N102C1 ">Stopped</td>
+
+<td valign="top" headers="N102C8 ">The application on the server is ended and is not
+taking server requests to run.</td>
+
+</tr>
+
+</tbody>
+
+</table>
+</div>
+</div>
+</div>
+
+<div class="section" id="rwrcview_wst__rwrcview_section_project_status"><a name="rwrcview_wst__rwrcview_section_project_status"><!-- --></a><h4 class="sectiontitle">Project Status</h4><p>The
+Servers view might display the current status of the application is either
+synchronized or republished. When the Servers view does not display a current
+status for the project, the workbench cannot retrieve the status of the project
+from the server, the server is stopped or the server does not support this
+function.</p>
+<p id="rwrcview_wst__rwrcview_p3a"><a name="rwrcview_wst__rwrcview_p3a"><!-- --></a>The following table lists the possible project
+status:</p>
+
+<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all"><caption>Table 4. Description of project status</caption>
+<thead align="left">
+<tr>
+<th valign="top" id="N1033A"> Project status </th>
+
+<th valign="top" id="N10341"> Description of status </th>
+
+</tr>
+
+</thead>
+
+<tbody>
+<tr>
+<td valign="top" headers="N1033A ">Synchronized</td>
+
+<td valign="top" headers="N10341 ">Both copies of the application files on the server and in the workbench
+are matching.</td>
+
+</tr>
+
+<tr>
+<td valign="top" headers="N1033A ">Republished</td>
+
+<td valign="top" headers="N10341 ">The copy of the application files on the workbench
+has changed and does not match the copy on the server. The server needs to
+be updated.</td>
+
+</tr>
+
+</tbody>
+
+</table>
+</div>
+</div>
+
</div>
+<div />
</body>
</html>
\ No newline at end of file
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 894b4c3..b889859 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="TCP/IP Monitor view" />
<meta name="abstract" content="The TCP/IP Monitor is a simple server that monitors all the requests and the responses between a Web browser and server. If you want the TCP/IP Monitor view to open when there is TCP/IP activity, select the Show TCP/IP Monitor view when there is activity check box on the TCPIP/IP Monitor preferences page ( Window > Run/Debug > TCP/IP Monitor)." />
<meta name="description" content="The TCP/IP Monitor is a simple server that monitors all the requests and the responses between a Web browser and server. If you want the TCP/IP Monitor view to open when there is TCP/IP activity, select the Show TCP/IP Monitor view when there is activity check box on the TCPIP/IP Monitor preferences page ( Window > Run/Debug > TCP/IP Monitor)." />
-<meta content="views, TCP/IP Monitor, TCP/IP, monitoring requests and responses, servers, monitoring requests and responses to and from Web browser, TCP/IP monitoring, Web browsers, monitoring requests and responses to and from servers, JSP files, servlets, TCP/IP monitoring, URLs" name="DC.subject" />
-<meta content="views, TCP/IP Monitor, TCP/IP, monitoring requests and responses, servers, monitoring requests and responses to and from Web browser, TCP/IP monitoring, Web browsers, monitoring requests and responses to and from servers, JSP files, servlets, TCP/IP monitoring, URLs" name="keywords" />
+<meta content="servers, TCP/IP monitors, overview, views" name="DC.subject" />
+<meta content="servers, TCP/IP monitors, overview, views" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="rwtcpvw_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
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 a7be537..c2ff238 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -29,15 +29,6 @@
<div><p />
</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/twcrtins.html">Creating a server</a></strong><br />
-<span>You can create a server to identify the runtime environment that you want to use for testing your project resources. The term <em>creating a server</em> defines creating a pointer from the workbench to an existing installation of an application server</span>.</li>
-<li class="ulchildlink"><strong><a href="../topics/twedtins.html">Editing a server</a></strong><br />
-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.</li>
-<li class="ulchildlink"><strong><a href="../topics/twdelins.html">Deleting a server</a></strong><br />
-You may delete a server from the Servers view.</li>
-</ul>
-</div>
+
</body>
</html>
\ No newline at end of file
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 a8fe6b5..22971f0 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -63,6 +63,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
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 17c0111..560d5cb 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -32,14 +32,7 @@
and examining the contents of the variables. You can debug the following artifacts
on a server without losing the state of your application:</p>
</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tservlet.html">servlets</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../topics/tdbgjsp.html">JavaServer Pages (JSP) files</a></strong><br />
-</li>
-</ul>
-</div>
+
</body>
</html>
\ No newline at end of file
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 328b2dd..55b45cf 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Testing artifacts on a server" />
<meta name="abstract" content="You can use the workbench to test one or more application artifacts on a server." />
<meta name="description" content="You can use the workbench to test one or more application artifacts on a server." />
-<meta content="servers, testing artifacts, artifacts, testing on server, wizards, Run on Server, Run on Server wizard" name="DC.subject" />
-<meta content="servers, testing artifacts, artifacts, testing on server, wizards, Run on Server, Run on Server wizard" name="keywords" />
+<meta content="artifacts, testing on servers, servers, testing artifacts" name="DC.subject" />
+<meta content="artifacts, testing on servers, servers, testing artifacts" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="testing_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -49,16 +49,16 @@
to select the server. Select from the following options:</span>
<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N1009E-option" align="left">Option</th>
-<th valign="bottom" id="N1009E-desc" align="left">Description</th></tr></thead>
+<thead><tr><th valign="bottom" id="N1008F-option" align="left">Option</th>
+<th valign="bottom" id="N1008F-desc" align="left">Description</th></tr></thead>
<tbody>
-<tr><td valign="top" headers="N1009E-option" id="N100A8"><strong>Choose an existing server</strong></td>
-<td valign="top" headers="N1009E-desc N100A8">This option uses
+<tr><td valign="top" headers="N1008F-option" id="N10099"><strong>Choose an existing server</strong></td>
+<td valign="top" headers="N1008F-desc N10099">This option uses
an existing server that is defined in your workbench. </td>
</tr>
-<tr><td valign="top" headers="N1009E-option" id="N100B7"><strong>Manually define a server</strong></td>
-<td valign="top" headers="N1009E-desc N100B7">This option creates
+<tr><td valign="top" headers="N1008F-option" id="N100A8"><strong>Manually define a server</strong></td>
+<td valign="top" headers="N1008F-desc N100A8">This option creates
a new server.</td>
</tr>
@@ -110,6 +110,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
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 38c0b68..7c52718 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Testing applications on a server" />
<meta name="abstract" content="You can use the workbench to test one or more projects on a server." />
<meta name="description" content="You can use the workbench to test one or more projects on a server." />
-<meta content="servers, testing applications, applications, testing on server" name="DC.subject" />
-<meta content="servers, testing applications, applications, testing on server" name="keywords" />
+<meta content="applications, testing on servers, servers, testing applications" name="DC.subject" />
+<meta content="applications, testing on servers, servers, testing applications" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="tj2ee_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tlimits.html b/docs/org.eclipse.wst.server.ui.doc.user/topics/tlimits.html
index 01101bd..03013e7 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tlimits.html
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tlimits.html
@@ -1,25 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html lang="en-us" xml:lang="en-us">
<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
+<meta content="public" name="security" />
+<meta content="index,follow" name="Robots" />
+<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
+<meta content="task" name="DC.Type" />
+<meta name="DC.Title" content="Limitations and restrictions" />
+<meta name="abstract" content="This section describes known server tools limitations and problems along with their solutions." />
+<meta name="description" content="This section describes known server tools limitations and problems along with their solutions." />
+<meta content="XHTML" name="DC.Format" />
+<meta content="tlimits_wst" name="DC.Identifier" />
+<meta content="en-us" name="DC.Language" />
+<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
<title>Limitations and restrictions</title>
</head>
-<body onresize="location.reload();" id="tlimits_wst"><a name="tlimits_wst"><!-- --></a>
+<body id="tlimits_wst"><a name="tlimits_wst"><!-- --></a>
+
+
<h1 class="topictitle1">Limitations and restrictions</h1>
-<div><div>This section describes known server tools limitations and problems
-along with their solutions.</div><div class="section"></div>
+
+
+<div><p>This section describes known server
+tools limitations and problems along with their solutions.</p>
+
+<div class="section" />
+
</div>
+
+<div />
+
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.dita
index a16c20d..0d3fd14 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.dita
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/tmetasrv.dita
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
<?Pub Inc?>
@@ -8,10 +8,11 @@
<shortdesc id="tmetasrv_wst_shortdesc">On the workbench, you have the option
to display or hide the metadata of the server.</shortdesc>
<prolog><metadata>
-<keywords id="index"><indexterm>serverName.server file<indexterm>displaying on workbench</indexterm></indexterm>
-<indexterm>servers<indexterm>displaying metadata</indexterm></indexterm>
-<indexterm>workbench<indexterm>displaying server metadata</indexterm></indexterm>
-</keywords>
+<keywords id="index"><indexterm>servers<indexterm>displaying metadata</indexterm><indexterm>hiding
+metadata</indexterm></indexterm><indexterm>workbench<indexterm>displaying
+server metadata</indexterm><indexterm>hiding server metadata</indexterm></indexterm>
+<indexterm>serverName.server file<indexterm>displaying on workbench</indexterm><indexterm>hiding
+from workbench</indexterm></indexterm></keywords>
</metadata></prolog>
<taskbody>
<context id="tmetasrv_wst_context"><p id="tmetasrv_wst_p1">The <i>metadata</i> contains
@@ -22,35 +23,36 @@
<li>The name assign to the server.</li>
<li>The name of the installed server runtime environment which defines the
runtime environment of an application server for compiling your application.</li>
-</ul></p><p id="tmetasrv_wst_p2">By default, the tool hides the metadata of
-the server to keep the development workspace clean. Displaying the metadata
+</ul></p><p id="tmetasrv_wst_p2">By default, the workbench hides the metadata
+of the server to keep the development workspace clean. Displaying the metadata
of the server on the workbench, allows you to persists the data of the server
in a <i>serverName</i>.server file, where <i>serverName</i> is the name assigned
to the server. The <i>serverName</i>.server file is useful when you are working
in a team development environment and you are required to maintain the metadata
-of the server in a source control repository.</p>To display the metadata of
-the server:</context>
+of the server in a source control repository.</p>To display or hide the metadata
+of the server:</context>
<steps id="tmetasrv_wst_steps">
<step id="tmetasrv_step1"><cmd>In the Servers view, right-click the server
-you want to display the metadata.</cmd></step>
-<step id="tmetasrv_step2"><cmd>Select the <uicontrol>Move to Workspace</uicontrol> option.</cmd>
-<info><note type="tip">If the <uicontrol>Move to Workspace</uicontrol> option
-is not available and you only see the <uicontrol>Move to Metadata</uicontrol> option,
-this means the metadata of your server is already on the workbench. The next
-step describes where you can find it on the workbench.</note></info></step>
-<step id="tmetasrv_step3"><cmd>In the Project Explorer view, expand the <b>Others
-Project</b> folder and then expand your server project to locate the <i>serverName</i>.server
+you want to display or hide the metadata and select <b>Properties</b>.</cmd>
+</step>
+<step id="tmetasrv_step2"><cmd><draft-comment>Modified the steps according
+to the GUI changes.<?Pub Caret?></draft-comment>In the <uicontrol>Info</uicontrol> page
+there is a <uicontrol>Location</uicontrol> field, select the <uicontrol>Switch
+location</uicontrol> button to toggle between displaying and hiding the metadata
+on the workbench.</cmd><info><note type="tip">If the value of the <uicontrol>Location</uicontrol> field
+contains <userinput>[workspace metadata]</userinput>, this means the workbench
+is hiding the metadata. To display the metadata on the workbench, select the <uicontrol>Switch
+location</uicontrol> button again until the <userinput>[workspace metadata]</userinput> changes
+to a file path directory. The file path directory specifies the location where
+the server metadata file is stored on the workbench. The next step describes
+where you can find the server metadata file in the workbench.</note></info>
+</step>
+<step id="tmetasrv_step3"><cmd>In the Project Explorer view, expand the <b>Servers</b> folder
+and then expand your server project to locate the <i>serverName</i>.server
file, where <i>serverName</i> is the name assigned to your server.</cmd></step>
-<step id="tmetasrv_step4"><cmd>(<b>Optional</b>) You can double click <i>serverName</i>.server
-file to edit the server's data in the server editor.</cmd></step>
+<step id="tmetasrv_step4"><cmd>(<b>Optional</b>) You can double-click <i>serverName</i>.server
+file to edit the data in the server editor.</cmd></step>
</steps>
-<result id="tmetasrv_wst_result">To hide the metadata of the server:<p><ol>
-<li>In the Servers view, right-click the server you want to hide the metadata.</li>
-<li>Select the <uicontrol>Move to Metadata</uicontrol> option.<note type="tip">If
-the <uicontrol>Move to Metadata</uicontrol> option is not available and you
-only see the <uicontrol>Move to Workspace</uicontrol> option, this means the
-metadata of your server is already hidden from the workbench.</note></li>
-</ol></p></result>
</taskbody>
</task>
-<?Pub *0000003518?>
+<?Pub *0000003569?>
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 2a3b995..af9c0bd 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -43,51 +43,46 @@
</ul>
</div>
-<p id="tmetasrv_wst__tmetasrv_wst_p2"><a name="tmetasrv_wst__tmetasrv_wst_p2"><!-- --></a>By default, the tool hides the metadata of
-the server to keep the development workspace clean. Displaying the metadata
+<p id="tmetasrv_wst__tmetasrv_wst_p2"><a name="tmetasrv_wst__tmetasrv_wst_p2"><!-- --></a>By default, the workbench hides the metadata
+of the server to keep the development workspace clean. Displaying the metadata
of the server on the workbench, allows you to persists the data of the server
in a <em>serverName</em>.server file, where <em>serverName</em> is the name assigned
to the server. The <em>serverName</em>.server file is useful when you are working
in a team development environment and you are required to maintain the metadata
of the server in a source control repository.</p>
-To display the metadata of
-the server:</div>
+To display or hide the metadata
+of the server:</div>
<a name="tmetasrv_wst__tmetasrv_wst_steps"><!-- --></a><ol id="tmetasrv_wst__tmetasrv_wst_steps">
<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step1"><a name="tmetasrv_wst__tmetasrv_step1"><!-- --></a><span>In the Servers view, right-click the server
-you want to display the metadata.</span></li>
-
-<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step2"><a name="tmetasrv_wst__tmetasrv_step2"><!-- --></a><span>Select the <span class="uicontrol">Move to Workspace</span> option.</span>
- <div class="tip"><span class="tiptitle">Tip:</span> If the <span class="uicontrol">Move to Workspace</span> option
-is not available and you only see the <span class="uicontrol">Move to Metadata</span> option,
-this means the metadata of your server is already on the workbench. The next
-step describes where you can find it on the workbench.</div>
+you want to display or hide the metadata and select <strong>Properties</strong>.</span>
</li>
-<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step3"><a name="tmetasrv_wst__tmetasrv_step3"><!-- --></a><span>In the Project Explorer view, expand the <strong>Others
-Project</strong> folder and then expand your server project to locate the <em>serverName</em>.server
+<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step2"><a name="tmetasrv_wst__tmetasrv_step2"><!-- --></a><span>In the <span class="uicontrol">Info</span> page
+there is a <span class="uicontrol">Location</span> field, select the <span class="uicontrol">Switch
+location</span> button to toggle between displaying and hiding the metadata
+on the workbench.</span> <div class="tip"><span class="tiptitle">Tip:</span> If the value of the <span class="uicontrol">Location</span> field
+contains <kbd class="userinput">[workspace metadata]</kbd>, this means the workbench
+is hiding the metadata. To display the metadata on the workbench, select the <span class="uicontrol">Switch
+location</span> button again until the <kbd class="userinput">[workspace metadata]</kbd> changes
+to a file path directory. The file path directory specifies the location where
+the server metadata file is stored on the workbench. The next step describes
+where you can find the server metadata file in the workbench.</div>
+
+</li>
+
+<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step3"><a name="tmetasrv_wst__tmetasrv_step3"><!-- --></a><span>In the Project Explorer view, expand the <strong>Servers</strong> folder
+and then expand your server project to locate the <em>serverName</em>.server
file, where <em>serverName</em> is the name assigned to your server.</span></li>
-<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step4"><a name="tmetasrv_wst__tmetasrv_step4"><!-- --></a><span>(<strong>Optional</strong>) You can double click <em>serverName</em>.server
-file to edit the server's data in the server editor.</span></li>
+<li class="stepexpand" id="tmetasrv_wst__tmetasrv_step4"><a name="tmetasrv_wst__tmetasrv_step4"><!-- --></a><span>(<strong>Optional</strong>) You can double-click <em>serverName</em>.server
+file to edit the data in the server editor.</span></li>
</ol>
-<div class="section" id="tmetasrv_wst__tmetasrv_wst_result"><a name="tmetasrv_wst__tmetasrv_wst_result"><!-- --></a>To hide the metadata of the server:<div class="p"><ol>
-<li>In the Servers view, right-click the server you want to hide the metadata.</li>
-
-<li>Select the <span class="uicontrol">Move to Metadata</span> option.<div class="tip"><span class="tiptitle">Tip:</span> If
-the <span class="uicontrol">Move to Metadata</span> option is not available and you
-only see the <span class="uicontrol">Move to Workspace</span> option, this means the
-metadata of your server is already hidden from the workbench.</div>
-</li>
-
-</ol>
-</div>
</div>
-</div>
-
+<div />
</body>
</html>
\ No newline at end of file
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 dc2ed4d..e46436c 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Defining server preferences" />
<meta name="abstract" content="The server tools allow you to define the following preferences:" />
<meta name="description" content="The server tools allow you to define the following preferences:" />
-<meta content="servers, defining preferences, preferences" name="DC.subject" />
-<meta content="servers, defining preferences, preferences" name="keywords" />
+<meta content="preferences, servers, overview" name="DC.subject" />
+<meta content="preferences, servers, overview" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="tpref_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -29,20 +29,7 @@
<div><p>The server tools allow you to define the following
preferences:</p>
</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/twsrvprf.html">Defining the server preferences</a></strong><br />
-Using the Preferences page, you can define attributes used for testing projects by the servers. To define these preferences, complete the following:</li>
-<li class="ulchildlink"><strong><a href="../topics/tprefaud.html">Defining the audio preferences</a></strong><br />
-Using the Preferences page, you can define the preferences that servers will use for audio purposes.</li>
-<li class="ulchildlink"><strong><a href="../topics/twlaunchpref.html">Defining the launching preferences</a></strong><br />
-<span>Using the Preferences page, you can define the preferences that the servers use when starting or switching server modes. Switching server modes occurs when you use the <span class="uicontrol">Run on Server</span></span><span> or <span class="uicontrol">Debug on Server</span> commands.</span></li>
-<li class="ulchildlink"><strong><a href="../topics/twinstprf.html">Defining the installed server runtime environments preferences</a></strong><br />
-Using the Preferences page, you can direct the workbench to use a specific runtime environment of an application server for compiling your application. You can complete this by defining the installation directory of the server:</li>
-<li class="ulchildlink"><strong><a href="../topics/twtcpprf.html">Defining the TCP/IP Monitor preferences</a></strong><br />
-Using the Preferences page, you can define the TCP/IP Monitor attributes. To define these preferences, complete the following:</li>
-</ul>
-</div>
+
</body>
</html>
\ No newline at end of file
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 278e16d..46d3975 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Defining the audio preferences" />
<meta name="abstract" content="Using the Preferences page, you can define the preferences that servers will use for audio purposes." />
<meta name="description" content="Using the Preferences page, you can define the preferences that servers will use for audio purposes." />
-<meta content="preferences, audio for servers, audio, defining preferences for servers, workbench, defining audio preferences for servers" name="DC.subject" />
-<meta content="preferences, audio for servers, audio, defining preferences for servers, workbench, defining audio preferences for servers" name="keywords" />
+<meta content="audio preferences, setting, preferences, server audio, workbench, server audio preferences" name="DC.subject" />
+<meta content="audio preferences, setting, preferences, server audio, workbench, server audio preferences" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="tprefaud_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -72,6 +72,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
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 ab5dac2..ed7d300 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Publishing applications to a server" />
<meta name="abstract" content="" />
<meta name="description" content="" />
-<meta content="servers, publishing applications, applications, publishing to servers" name="DC.subject" />
-<meta content="servers, publishing applications, applications, publishing to servers" name="keywords" />
+<meta content="servers, publishing applications" name="DC.subject" />
+<meta content="servers, publishing applications" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="tpublish_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -28,12 +28,7 @@
<div><p />
</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/twpub.html">Publishing your application</a></strong><br />
-<em>Publishing</em> involves copying files (projects, resource files, and server configurations) to the correct location for the server to find and use them. In the test environments, these files may already be in the correct location. In some cases, temporary copies of the server configurations may be created. You can either publish your application automatically or manually.</li>
-</ul>
-</div>
+
</body>
</html>
\ No newline at end of file
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 34094bb..350b7f8 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Debugging a servlet on a server" />
<meta name="abstract" content="The debugger enables you to detect and diagnose errors in your application. It allows you to control the execution of your program by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug a servlet on a server without losing the state of your application." />
<meta name="description" content="The debugger enables you to detect and diagnose errors in your application. It allows you to control the execution of your program by setting breakpoints, suspending threads, stepping through the code, and examining the contents of the variables. You can debug a servlet on a server without losing the state of your application." />
-<meta content="servlets, debugging on a server, servers, debugging servlets, breakpoints, adding to servlets, threads, suspending in a servlet" name="DC.subject" />
-<meta content="servlets, debugging on a server, servers, debugging servlets, breakpoints, adding to servlets, threads, suspending in a servlet" name="keywords" />
+<meta content="breakpoints, adding to servlets, servers, debugging servlets, servlets, debugging on servers, threads, suspending in servlets" name="DC.subject" />
+<meta content="breakpoints, adding to servlets, servers, debugging servlets, servlets, debugging on servers, threads, suspending in servlets" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="tservlet_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -80,6 +80,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.dita
index 1699c0f..825aa49 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.dita
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twaddprj.dita
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
<task id="twaddprj_wst" xml:lang="en-us">
@@ -9,21 +9,22 @@
and your server.</shortdesc>
<prolog><metadata>
<keywords id="index"><indexterm>servers<indexterm>adding projects</indexterm></indexterm>
-<indexterm>projects<indexterm>adding to a server</indexterm></indexterm>
-</keywords>
+<indexterm>projects<indexterm>adding to a server</indexterm></indexterm></keywords>
</metadata></prolog>
<taskbody>
<context id="context"><p>This is done by adding your project to a server:</p></context>
<steps id="steps">
<step><cmd>In the Servers view, right-click on the server and select <uicontrol>Add
-and remove projects</uicontrol>.</cmd></step>
+and Remove Projects</uicontrol>.</cmd></step>
<step><cmd>In the Available projects list, select the project that you want
to test and click <uicontrol>Add</uicontrol>.</cmd></step>
-<step><cmd>The project appears in the Configured projects list.</cmd><info>Click <uicontrol>Finish</uicontrol>.</info>
+<step><cmd>The project appears in the Configured projects list.</cmd><info>If
+a project name appears in italic font style, this means the project has not
+yet been uploaded to the server.<?Pub Caret?> Click <uicontrol>Finish</uicontrol>.</info>
</step>
</steps>
<result id="result"><note>When you select a project to add to the server,
only the projects that are applicable to the type of server will appear.</note></result>
</taskbody>
</task>
-<?Pub *0000001382?>
+<?Pub *0000001487?>
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 4ecee04..b53eb43 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -35,12 +35,14 @@
<a name="twaddprj_wst__steps"><!-- --></a><ol id="twaddprj_wst__steps">
<li class="stepexpand"><span>In the Servers view, right-click on the server and select <span class="uicontrol">Add
-and remove projects</span>.</span></li>
+and Remove Projects</span>.</span></li>
<li class="stepexpand"><span>In the Available projects list, select the project that you want
to test and click <span class="uicontrol">Add</span>.</span></li>
-<li class="stepexpand"><span>The project appears in the Configured projects list.</span> Click <span class="uicontrol">Finish</span>.
+<li class="stepexpand"><span>The project appears in the Configured projects list.</span> If
+a project name appears in italic font style, this means the project has not
+yet been uploaded to the server. Click <span class="uicontrol">Finish</span>.
</li>
</ol>
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 8ddb439..43445ab 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
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
+<?Pub Inc?>
<task id="twcrtins_wst" xml:lang="en-us">
<title id="title">Creating a server</title>
<shortdesc><ph id="shortdesc">You can create a server to identify the runtime
@@ -9,9 +10,9 @@
a server</i> defines creating a pointer from the workbench to an existing
installation of an application server</ph>.</shortdesc>
<prolog><metadata>
-<keywords id="index"><indexterm>servers<indexterm>creating</indexterm></indexterm>
-<indexterm>runtime environments<indexterm>creating servers</indexterm></indexterm>
-</keywords>
+<keywords id="index"><indexterm>servers<indexterm>creating</indexterm><indexterm>creating
+a pointer</indexterm></indexterm><indexterm>wizards<indexterm>New Server</indexterm></indexterm>
+<indexterm>New Server wizard</indexterm></keywords>
</metadata></prolog>
<taskbody>
<context id="context">To create a server:</context>
@@ -34,21 +35,32 @@
<substeps>
<substep><cmd>(Optional) Refer to the <uicontrol>Description</uicontrol> section
for brief details about the server you have selected.</cmd></substep>
-<substep><cmd>(Optional) In the <uicontrol>View By</uicontrol> drop-down list,
-select how you would like to display the list of available servers in the <uicontrol>Select
-the server type</uicontrol> list:</cmd><info></info></substep>
+<substep><cmd><draft-comment>Made documentation update here.</draft-comment>(Optional)
+In the text field under the <uicontrol>Select the server type</uicontrol> label,
+you can replace the text <userinput>type filter text</userinput> with keywords
+to filter the list of available application servers.</cmd><info>The following
+are examples of filter keywords:<dl><dlentry><?Pub Caret1?>
+<dt><userinput>Apache</userinput></dt>
+<dd>Filters the list of available servers where the vendor is Apache</dd>
+</dlentry><dlentry>
+<dt><userinput>WebSphere</userinput></dt>
+<dd>Filters the list of available servers where the name is WebSphere</dd>
+</dlentry><dlentry>
+<dt><userinput>ejb</userinput></dt>
+<dd>Filters the list of available servers that support ejb modules.</dd>
+</dlentry><dlentry>
+<dt><userinput>web</userinput></dt>
+<dd>Filters the list of available servers that support Web modules</dd>
+</dlentry><dlentry>
+<dt><userinput>5.0</userinput></dt>
+<dd>Filters the list of available servers that are at version, 5.0 or supports
+JEE 5 specification level.</dd>
+</dlentry><dlentry>
+<dt><userinput>1.2</userinput></dt>
+<dd>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.</dd>
+</dlentry></dl></info></substep>
</substeps>
-<choicetable>
-<chrow><choption>Name</choption><chdesc>Alphabetically sorts the list of available
-servers.</chdesc></chrow>
-<chrow><choption>Vendor</choption><chdesc>Categorize the list of available
-servers in vendor-specific folders.</chdesc></chrow>
-<chrow><choption>Version</choption><chdesc>Categorize the list of available
-servers in folders based on the version of the servers.</chdesc></chrow>
-<chrow><choption>Module Support</choption><chdesc>Categorize the list of available
-servers based on the supported J2EE module specification level by the server.</chdesc>
-</chrow>
-</choicetable>
</step>
<step><cmd>Click <uicontrol>Next</uicontrol> and follow the instructions in
the wizard to specify the details of the server that you want to create. For
@@ -60,4 +72,4 @@
</steps>
</taskbody>
</task>
-<?Pub *0000003376?>
+<?Pub *0000003833?>
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 4012400..136b946 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -57,40 +57,47 @@
<li class="substepexpand"><span>(Optional) Refer to the <span class="uicontrol">Description</span> section
for brief details about the server you have selected.</span></li>
-<li class="substepexpand"><span>(Optional) In the <span class="uicontrol">View By</span> drop-down list,
-select how you would like to display the list of available servers in the <span class="uicontrol">Select
-the server type</span> list:</span> </li>
+<li class="substepexpand"><span>(Optional)
+In the text field under the <span class="uicontrol">Select the server type</span> label,
+you can replace the text <kbd class="userinput">type filter text</kbd> with keywords
+to filter the list of available application servers.</span> The following
+are examples of filter keywords:<dl>
+<dt class="dlterm"><kbd class="userinput">Apache</kbd></dt>
+
+<dd>Filters the list of available servers where the vendor is Apache</dd>
+
+
+<dt class="dlterm"><kbd class="userinput">WebSphere</kbd></dt>
+
+<dd>Filters the list of available servers where the name is WebSphere</dd>
+
+
+<dt class="dlterm"><kbd class="userinput">ejb</kbd></dt>
+
+<dd>Filters the list of available servers that support ejb modules.</dd>
+
+
+<dt class="dlterm"><kbd class="userinput">web</kbd></dt>
+
+<dd>Filters the list of available servers that support Web modules</dd>
+
+
+<dt class="dlterm"><kbd class="userinput">5.0</kbd></dt>
+
+<dd>Filters the list of available servers that are at version, 5.0 or supports
+JEE 5 specification level.</dd>
+
+
+<dt class="dlterm"><kbd class="userinput">1.2</kbd></dt>
+
+<dd>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.</dd>
+
+</dl>
+</li>
</ol>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N100F8-option" align="left">Option</th>
-<th valign="bottom" id="N100F8-desc" align="left">Description</th></tr></thead>
-<tbody>
-<tr><td valign="top" headers="N100F8-option" id="N10102"><strong>Name</strong></td>
-<td valign="top" headers="N100F8-desc N10102">Alphabetically sorts the list of available
-servers.</td>
-</tr>
-
-<tr><td valign="top" headers="N100F8-option" id="N10111"><strong>Vendor</strong></td>
-<td valign="top" headers="N100F8-desc N10111">Categorize the list of available
-servers in vendor-specific folders.</td>
-</tr>
-
-<tr><td valign="top" headers="N100F8-option" id="N10120"><strong>Version</strong></td>
-<td valign="top" headers="N100F8-desc N10120">Categorize the list of available
-servers in folders based on the version of the servers.</td>
-</tr>
-
-<tr><td valign="top" headers="N100F8-option" id="N1012F"><strong>Module Support</strong></td>
-<td valign="top" headers="N100F8-desc N1012F">Categorize the list of available
-servers based on the supported J2EE module specification level by the server.</td>
-
-</tr>
-
-</tbody></table>
-
</li>
<li class="stepexpand"><span>Click <span class="uicontrol">Next</span> and follow the instructions in
@@ -106,6 +113,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
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 aa5a415..d86aefd 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Deleting a server" />
<meta name="abstract" content="You may delete a server from the Servers view." />
<meta name="description" content="You may delete a server from the Servers view." />
-<meta content="servers, deleting, wizards, Delete Server, Delete Server wizard" name="DC.subject" />
-<meta content="servers, deleting, wizards, Delete Server, Delete Server wizard" name="keywords" />
+<meta content="servers, deleting" name="DC.subject" />
+<meta content="servers, deleting" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="twdelins_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -41,23 +41,23 @@
depending on the status of the server in the Servers view:</span>
<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N10081-option" align="left">Option</th>
-<th valign="bottom" id="N10081-desc" align="left">Description</th></tr></thead>
+<thead><tr><th valign="bottom" id="N10072-option" align="left">Option</th>
+<th valign="bottom" id="N10072-desc" align="left">Description</th></tr></thead>
<tbody>
-<tr><td valign="top" headers="N10081-option" id="N1008B"><strong>Delete unused server configurations</strong></td>
-<td valign="top" headers="N10081-desc N1008B">If
+<tr><td valign="top" headers="N10072-option" id="N1007C"><strong>Delete unused server configurations</strong></td>
+<td valign="top" headers="N10072-desc N1007C">If
server configuration files were created in the workspace under a server project,
this option becomes available. Select this check box to remove the server
configuration files from the workspace.</td>
</tr>
-<tr><td valign="top" headers="N10081-option" id="N1009A"><strong>Delete running servers</strong></td>
-<td valign="top" headers="N10081-desc N1009A">This option specifies
+<tr><td valign="top" headers="N10072-option" id="N1008B"><strong>Delete running servers</strong></td>
+<td valign="top" headers="N10072-desc N1008B">This option specifies
to delete servers that are still running. </td>
</tr>
-<tr><td valign="top" headers="N10081-option" id="N100A9"><strong>Stop servers before deleting</strong></td>
-<td valign="top" headers="N10081-desc N100A9">This option
+<tr><td valign="top" headers="N10072-option" id="N1009A"><strong>Stop servers before deleting</strong></td>
+<td valign="top" headers="N10072-desc N1009A">This option
is only available if the <strong>Delete running servers</strong> option is selected.
This option specifies to stop running servers prior to removing them from
the Servers view. If this option is cleared and the <strong>Delete running servers</strong> option
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 b433fc7..75f68c7 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -64,6 +64,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita
index b630051..b0be305 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
<?Pub Inc?>
@@ -10,11 +10,15 @@
your application. You can complete this by defining the installation directory
of the server:</shortdesc>
<prolog><metadata>
-<keywords id="index"><indexterm>applications<indexterm>server runtime environments</indexterm></indexterm>
-<indexterm>runtime environments<indexterm>preferences</indexterm></indexterm>
-<indexterm>servers<indexterm>runtime environments</indexterm></indexterm>
-<indexterm>workbench<indexterm>server runtime environments</indexterm></indexterm>
-</keywords>
+<keywords id="index"><indexterm>preferences<indexterm>installed server runtime
+environments<indexterm>defining</indexterm></indexterm></indexterm><indexterm>servers<indexterm>runtime
+environment<indexterm>defining</indexterm></indexterm></indexterm><indexterm>runtime
+environment<indexterm>defining</indexterm></indexterm><indexterm>workbench<indexterm>defining
+server runtime environment</indexterm></indexterm><indexterm>wizards<indexterm>New
+Server Runtime</indexterm></indexterm><indexterm>applications<indexterm>defining
+server runtime environment</indexterm></indexterm><indexterm>New Server Runtime
+wizard</indexterm><indexterm>installed server runtime environments<indexterm>setting
+preferences</indexterm></indexterm></keywords>
</metadata></prolog>
<taskbody>
<steps id="steps">
@@ -42,8 +46,40 @@
<step><cmd>Click <uicontrol>Add</uicontrol>.</cmd><info>The New Server Runtime
wizard opens.</info>
<substeps>
-<substep><cmd>Select the target server runtime and click <uicontrol>Next</uicontrol>.
-The <i>product_name</i> Runtime panel is displayed.</cmd></substep>
+<substep><cmd><draft-comment>Modified this step</draft-comment>Under the <uicontrol>Select
+the runtime type</uicontrol> list, select a server and version level as the
+target installed server runtime environment.</cmd><info><note type="tip">In
+the text field under the <uicontrol>Select the runtime type</uicontrol> label,
+you can replace the text <userinput>type filter text</userinput> with keywords
+to filter the list of available application servers. The following are examples
+of filter keywords:<dl><dlentry>
+<dt><userinput>Apache</userinput></dt>
+<dd>Filters the list of available servers where the vendor is Apache</dd>
+</dlentry><dlentry>
+<dt><userinput>WebSphere</userinput></dt>
+<dd>Filters the list of available servers where the name is WebSphere</dd>
+</dlentry><dlentry>
+<dt><userinput>ejb</userinput></dt>
+<dd>Filters the list of available servers that support ejb modules.</dd>
+</dlentry><dlentry>
+<dt><userinput>web</userinput></dt>
+<dd>Filters the list of available servers that support Web modules</dd>
+</dlentry><dlentry>
+<dt><userinput>5.0</userinput></dt>
+<dd>Filters the list of available servers that are at version, 5.0 or supports
+JEE 5 specification level.</dd>
+</dlentry><dlentry>
+<dt><userinput>1.2</userinput></dt>
+<dd>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.</dd>
+</dlentry></dl></note></info></substep>
+<substep><cmd><draft-comment>Added this step</draft-comment>When you add an
+installed server runtime environment, by default a server is created and added
+as an entry in the Servers view. If you want to only add the installed server
+runtime environment and not create the server in the Servers view, clear the <uicontrol>Create
+a <?Pub Caret?>new local server</uicontrol> check box.</cmd></substep>
+<substep><cmd>Click <uicontrol>Next</uicontrol>. The Runtime panel for the
+server is displayed.</cmd></substep>
<substep><cmd>For <uicontrol>Installation directory</uicontrol> or <uicontrol>Location</uicontrol> field,
type or browse to the location of the target server.</cmd><info><note type="tip">If
you specify a false location for the target server, use the workbench to assemble
@@ -69,11 +105,12 @@
the target server for a module:<ol>
<li>Right-click on the module in the Project Explorer view and click <b>Properties
> Project Facets</b>. The Project Facets page opens.</li>
-<li>Select the <uicontrol>Add/Remove Project Facets</uicontrol> button. The
-Add/Remove Project Facets dialog box opens.</li>
+<li><draft-comment>Gui changed from "Add/Remove Project Facets" to "Modify
+Faceted Project "</draft-comment>Select the <uicontrol>Modify Project</uicontrol> button.
+The Modify Faceted Project dialog box opens.</li>
<li>Select the <uicontrol>Show Runtimes</uicontrol> button.</li>
<li>Under the <b>Runtimes</b> table, select the target servers for the module.</li>
</ol> </p></postreq>
</taskbody>
</task>
-<?Pub *0000004764?>
+<?Pub *0000006619?>
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 7184905..13ca223 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -62,8 +62,56 @@
<li class="stepexpand"><span>Click <span class="uicontrol">Add</span>.</span> The New Server Runtime
wizard opens.
<ol type="a">
-<li class="substepexpand"><span>Select the target server runtime and click <span class="uicontrol">Next</span>.
-The <em>product_name</em> Runtime panel is displayed.</span></li>
+<li class="substepexpand"><span>Under the <span class="uicontrol">Select
+the runtime type</span> list, select a server and version level as the
+target installed server runtime environment.</span> <div class="tip"><span class="tiptitle">Tip:</span> In
+the text field under the <span class="uicontrol">Select the runtime type</span> label,
+you can replace the text <kbd class="userinput">type filter text</kbd> with keywords
+to filter the list of available application servers. The following are examples
+of filter keywords:<dl>
+<dt class="dlterm"><kbd class="userinput">Apache</kbd></dt>
+
+<dd>Filters the list of available servers where the vendor is Apache</dd>
+
+
+<dt class="dlterm"><kbd class="userinput">WebSphere</kbd></dt>
+
+<dd>Filters the list of available servers where the name is WebSphere</dd>
+
+
+<dt class="dlterm"><kbd class="userinput">ejb</kbd></dt>
+
+<dd>Filters the list of available servers that support ejb modules.</dd>
+
+
+<dt class="dlterm"><kbd class="userinput">web</kbd></dt>
+
+<dd>Filters the list of available servers that support Web modules</dd>
+
+
+<dt class="dlterm"><kbd class="userinput">5.0</kbd></dt>
+
+<dd>Filters the list of available servers that are at version, 5.0 or supports
+JEE 5 specification level.</dd>
+
+
+<dt class="dlterm"><kbd class="userinput">1.2</kbd></dt>
+
+<dd>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.</dd>
+
+</dl>
+</div>
+</li>
+
+<li class="substepexpand"><span>When you add an
+installed server runtime environment, by default a server is created and added
+as an entry in the Servers view. If you want to only add the installed server
+runtime environment and not create the server in the Servers view, clear the <span class="uicontrol">Create
+a new local server</span> check box.</span></li>
+
+<li class="substepexpand"><span>Click <span class="uicontrol">Next</span>. The Runtime panel for the
+server is displayed.</span></li>
<li class="substepexpand"><span>For <span class="uicontrol">Installation directory</span> or <span class="uicontrol">Location</span> field,
type or browse to the location of the target server.</span> <div class="tip"><span class="tiptitle">Tip:</span> If
@@ -98,8 +146,8 @@
<li>Right-click on the module in the Project Explorer view and click <strong>Properties
> Project Facets</strong>. The Project Facets page opens.</li>
-<li>Select the <span class="uicontrol">Add/Remove Project Facets</span> button. The
-Add/Remove Project Facets dialog box opens.</li>
+<li>Select the <span class="uicontrol">Modify Project</span> button.
+The Modify Faceted Project dialog box opens.</li>
<li>Select the <span class="uicontrol">Show Runtimes</span> button.</li>
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 59b6896..3b86b6f 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Defining the launching preferences" />
<meta name="abstract" content="Using the Preferences page, you can define the preferences that the servers use when starting or switching server modes. Switching server modes occurs when you use the Run on Server or Debug on Server commands." />
<meta name="description" content="Using the Preferences page, you can define the preferences that the servers use when starting or switching server modes. Switching server modes occurs when you use the Run on Server or Debug on Server commands." />
-<meta content="preferences, launching for servers, servers, launching, workbench, defining launching preferences for servers" name="DC.subject" />
-<meta content="preferences, launching for servers, servers, launching, workbench, defining launching preferences for servers" name="keywords" />
+<meta content="preferences, server launches, servers, launching preferences, workbench, server launching preferences" name="DC.subject" />
+<meta content="preferences, server launches, servers, launching preferences, workbench, server launching preferences" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="twlaunchpref_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -45,25 +45,25 @@
<li><span id="twlaunchpref_wst__step3"><a name="twlaunchpref_wst__step3"><!-- --></a>Specify one or more of the following settings:</span>
<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N100B4-option" align="left">Option</th>
-<th valign="bottom" id="N100B4-desc" align="left">Description</th></tr></thead>
+<thead><tr><th valign="bottom" id="N100B6-option" align="left">Option</th>
+<th valign="bottom" id="N100B6-desc" align="left">Description</th></tr></thead>
<tbody>
-<tr><td valign="top" headers="N100B4-option" id="N100BF"><strong>Automatically publish when starting servers</strong></td>
+<tr><td valign="top" headers="N100B6-option" id="N100C1"><strong>Automatically publish when starting servers</strong></td>
-<td valign="top" headers="N100B4-desc N100BF">Specifies that all the files should automatically be published before
+<td valign="top" headers="N100B6-desc N100C1">Specifies that all the files should automatically be published before
starting the server.</td>
</tr>
-<tr><td valign="top" headers="N100B4-option" id="N100D0"><strong>Automatically restart servers when necessary</strong></td>
+<tr><td valign="top" headers="N100B6-option" id="N100D2"><strong>Automatically restart servers when necessary</strong></td>
-<td valign="top" headers="N100B4-desc N100D0">Specifies that the server tools can automatically restart the server
+<td valign="top" headers="N100B6-desc N100D2">Specifies that the server tools can automatically restart the server
when it detects that the server must be restarted to handle resource changes
in the workspace.</td>
</tr>
-<tr><td valign="top" headers="N100B4-option" id="N100E1"><strong>Save dirty editors before starting server</strong></td>
+<tr><td valign="top" headers="N100B6-option" id="N100E3"><strong>Save dirty editors before starting server</strong></td>
-<td valign="top" headers="N100B4-desc N100E1">Specify the preference for saving the changes in any open server editors
+<td valign="top" headers="N100B6-desc N100E3">Specify the preference for saving the changes in any open server editors
before starting the server by selecting one of the following options:<ul>
<li>Always - specifies the workbench will automatically save any changes in
an open server editor before starting the server</li>
@@ -78,9 +78,9 @@
</td>
</tr>
-<tr><td valign="top" headers="N100B4-option" id="choption1"><strong>When switching to a different server mode</strong></td>
+<tr><td valign="top" headers="N100B6-option" id="choption1"><strong>When switching to a different server mode</strong></td>
-<td valign="top" headers="N100B4-desc choption1"><span id="twlaunchpref_wst__chdesc1_ph1"><a name="twlaunchpref_wst__chdesc1_ph1"><!-- --></a>When switching the server to run in a different
+<td valign="top" headers="N100B6-desc choption1"><span id="twlaunchpref_wst__chdesc1_ph1"><a name="twlaunchpref_wst__chdesc1_ph1"><!-- --></a>When switching the server to run in a different
mode, for example using the <span class="menucascade"><span class="uicontrol">Run As</span> > <span class="uicontrol">Run
on Server</span></span></span> <span id="twlaunchpref_wst__chdesc1_ph2"><a name="twlaunchpref_wst__chdesc1_ph2"><!-- --></a>or <span class="menucascade">
<span class="uicontrol">Debug As</span> > <span class="uicontrol">Debug on Server</span></span>,
@@ -97,9 +97,9 @@
</td>
</tr>
-<tr><td valign="top" headers="N100B4-option" id="choption2"><strong>When switching the server out of debug mode</strong></td>
+<tr><td valign="top" headers="N100B6-option" id="choption2"><strong>When switching the server out of debug mode</strong></td>
-<td valign="top" headers="N100B4-desc choption2"><span id="twlaunchpref_wst__chdesc2_ph1"><a name="twlaunchpref_wst__chdesc2_ph1"><!-- --></a>When you finish running the server in debug mode
+<td valign="top" headers="N100B6-desc choption2"><span id="twlaunchpref_wst__chdesc2_ph1"><a name="twlaunchpref_wst__chdesc2_ph1"><!-- --></a>When you finish running the server in debug mode
and switch out, for example using the <span class="menucascade"><span class="uicontrol">Run As</span>
> <span class="uicontrol">Run on Server</span></span></span><span id="twlaunchpref_wst__chdesc2_ph2"><a name="twlaunchpref_wst__chdesc2_ph2"><!-- --></a> command,
specify the next action of the server by selecting one of the following options:</span><a name="twlaunchpref_wst__chdesc2_ul1"><!-- --></a><ul id="twlaunchpref_wst__chdesc2_ul1">
@@ -119,9 +119,9 @@
</td>
</tr>
-<tr><td valign="top" headers="N100B4-option" id="N101A5"><strong>When switching the server into debug mode, re-enable
+<tr><td valign="top" headers="N100B6-option" id="N101A7"><strong>When switching the server into debug mode, re-enable
breakpoints</strong></td>
-<td valign="top" headers="N100B4-desc N101A5">When you change
+<td valign="top" headers="N100B6-desc N101A7">When you change
the server mode into debug mode, for example using the <span class="menucascade"><span class="uicontrol">Debug
As</span> > <span class="uicontrol">Debug on Server</span></span> command,
specify how to handle the breakpoints currently set in your application by
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 a795c8d..247b9c2 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -29,22 +29,8 @@
<div><p>You can use the server tools views to manage servers.
The following tasks may be included as part of the development path:</p>
</div>
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/twaddprj.html">Adding projects to a server</a></strong><br />
-Once you have created a server, you need to create a relationship between the projects that contain the files you want to test and your server.</li>
-<li class="ulchildlink"><strong><a href="../topics/twremprj.html">Removing a project from a server</a></strong><br />
-To remove a project from a server:</li>
-<li class="ulchildlink"><strong><a href="../topics/twsrtins.html">Starting a server</a></strong><br />
-When you are ready to test your projects, you must start a server. In some situations, listed below, the server tools start a server for you automatically. For more information on which test server will start, refer to the list of related topics at the end of this topic.</li>
-<li class="ulchildlink"><strong><a href="../topics/twstpins.html">Stopping a server</a></strong><br />
-You can stop the server from the Servers view.</li>
-<li class="ulchildlink"><strong><a href="../topics/twprefin.html">Setting a default server</a></strong><br />
-A default server is the server that you want to use when a project has more than one server defined.</li>
-<li class="ulchildlink"><strong><a href="../topics/tmetasrv.html">Displaying or hiding the metadata of the server</a></strong><br />
-On the workbench, you have the option to display or hide the metadata of the server.</li>
-</ul>
-</div>
+
+<div />
</body>
</html>
\ No newline at end of file
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 3d02039..f5e0bd3 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Setting a default server" />
<meta name="abstract" content="A default server is the server that you want to use when a project has more than one server defined." />
<meta name="description" content="A default server is the server that you want to use when a project has more than one server defined." />
-<meta content="servers, setting default on a project, projects, setting a default server" name="DC.subject" />
-<meta content="servers, setting default on a project, projects, setting a default server" name="keywords" />
+<meta content="projects, setting default servers, servers, setting project defaults" name="DC.subject" />
+<meta content="projects, setting default servers, servers, setting project defaults" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="twprefin_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
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 e2fbae2..4c357e2 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
@@ -30,29 +30,23 @@
view, right-click the server and select <uicontrol>Open</uicontrol>. The Server
editor opens. In the <i>Overview</i> page of the server editor, under the <uicontrol>Automatic
Publishing</uicontrol> settings, you are going to find the following settings:<ul>
-<li><b>Use default publishing settings</b>: Specifies to use the publishing
-settings as defined in the Preferences page (<menucascade><uicontrol>Window</uicontrol>
-<uicontrol>Preferences</uicontrol><uicontrol>Server</uicontrol></menucascade>).
-Refer to the <i>Defining the server preferences</i> topic for details on the
-publishing options in this preference page.</li>
<li><uicontrol>Never publish automatically</uicontrol>: Specifies the workbench
should never publish files to the server.</li>
-<li><uicontrol>Override default settings</uicontrol>: Specifies that a change
-to the files running on the server should automatically be published to the
-server in the next <i>seconds</i> interval, where <i>seconds</i> is the number
-of seconds you have specified in the <uicontrol>Publishing interval</uicontrol> control.
-The default value for the publishing interval on a local server is 5 seconds
-and for a remote server is 60 seconds. If you set the publishing interval
-to 0 seconds, a change to the files running on the server should automatically
-request a publish command to occur.</li>
-</ul></p><p id="twpub_auto3">In the workbench, the default setting is the <b>Override
-default settings</b> option is enabled with a value set to the publishing
-interval.</p><b id="twpub_manualtitle">Manually publishing to a server</b><p
-id="twpub_manual1">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:</p><p><ul>
+<li><uicontrol>Use automatic publishing settings</uicontrol>: Specifies that
+a change to the files running on the server should automatically be published
+to the server in the next <i>seconds</i> interval, where <i>seconds</i> is
+the number of seconds you have specified in the <uicontrol>Publishing interval</uicontrol> control.
+<?Pub Caret?>If you set the publishing interval to 0 seconds, a change to
+the files running on the server should automatically request a publish command
+to occur.</li>
+</ul></p><p id="twpub_auto3">In the workbench, the default setting is the <b>Use
+automatic publishing settings</b> option is enabled with a value set to the
+publishing interval.</p><b id="twpub_manualtitle">Manually publishing to a
+server</b><p id="twpub_manual1">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:</p><p><ul>
<li><ph id="twpub_steps_ph1">Select the server and then click the <uicontrol>Publish
to the server</uicontrol></ph> <image alt="This is an image of the Publish toolbar icon."
href="../images/launch_publish.gif"><alt>This is an image of the Publish toolbar
@@ -64,4 +58,4 @@
in these projects are transferred to the location that is defined by the server.</p></result>
</taskbody>
</task>
-<?Pub *0000004582?>
+<?Pub *0000004067?>
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 71c85af..e00baa2 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Publishing your application" />
<meta name="abstract" content="Publishing involves copying files (projects, resource files, and server configurations) to the correct location for the server to find and use them. In the test environments, these files may already be in the correct location. In some cases, temporary copies of the server configurations may be created. You can either publish your application automatically or manually." />
<meta name="description" content="Publishing involves copying files (projects, resource files, and server configurations) to the correct location for the server to find and use them. In the test environments, these files may already be in the correct location. In some cases, temporary copies of the server configurations may be created. You can either publish your application automatically or manually." />
-<meta content="servers, publishing applications, applications, publishing to servers, copying files to server" name="DC.subject" />
-<meta content="servers, publishing applications, applications, publishing to servers, copying files to server" name="keywords" />
+<meta content="applications, publishing to servers, servers, publishing applications" name="DC.subject" />
+<meta content="applications, publishing to servers, servers, publishing applications" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="twpub_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -47,34 +47,28 @@
view, right-click the server and select <span class="uicontrol">Open</span>. The Server
editor opens. In the <em>Overview</em> page of the server editor, under the <span class="uicontrol">Automatic
Publishing</span> settings, you are going to find the following settings:<ul>
-<li><strong>Use default publishing settings</strong>: Specifies to use the publishing
-settings as defined in the Preferences page (<span class="menucascade"><span class="uicontrol">Window</span>
- > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Server</span></span>).
-Refer to the <em>Defining the server preferences</em> topic for details on the
-publishing options in this preference page.</li>
-
<li><span class="uicontrol">Never publish automatically</span>: Specifies the workbench
should never publish files to the server.</li>
-<li><span class="uicontrol">Override default settings</span>: Specifies that a change
-to the files running on the server should automatically be published to the
-server in the next <em>seconds</em> interval, where <em>seconds</em> is the number
-of seconds you have specified in the <span class="uicontrol">Publishing interval</span> control.
-The default value for the publishing interval on a local server is 5 seconds
-and for a remote server is 60 seconds. If you set the publishing interval
-to 0 seconds, a change to the files running on the server should automatically
-request a publish command to occur.</li>
+<li><span class="uicontrol">Use automatic publishing settings</span>: Specifies that
+a change to the files running on the server should automatically be published
+to the server in the next <em>seconds</em> interval, where <em>seconds</em> is
+the number of seconds you have specified in the <span class="uicontrol">Publishing interval</span> control.
+If you set the publishing interval to 0 seconds, a change to
+the files running on the server should automatically request a publish command
+to occur.</li>
</ul>
</div>
-<p id="twpub_wst__twpub_auto3"><a name="twpub_wst__twpub_auto3"><!-- --></a>In the workbench, the default setting is the <strong>Override
-default settings</strong> option is enabled with a value set to the publishing
-interval.</p>
-<strong id="twpub_wst__twpub_manualtitle"><a name="twpub_wst__twpub_manualtitle"><!-- --></a>Manually publishing to a server</strong><p id="twpub_wst__twpub_manual1"><a name="twpub_wst__twpub_manual1"><!-- --></a>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:</p>
+<p id="twpub_wst__twpub_auto3"><a name="twpub_wst__twpub_auto3"><!-- --></a>In the workbench, the default setting is the <strong>Use
+automatic publishing settings</strong> option is enabled with a value set to the
+publishing interval.</p>
+<strong id="twpub_wst__twpub_manualtitle"><a name="twpub_wst__twpub_manualtitle"><!-- --></a>Manually publishing to a
+server</strong><p id="twpub_wst__twpub_manual1"><a name="twpub_wst__twpub_manual1"><!-- --></a>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:</p>
<div class="p"><ul>
<li><span id="twpub_wst__twpub_steps_ph1"><a name="twpub_wst__twpub_steps_ph1"><!-- --></a>Select the server and then click the <span class="uicontrol">Publish
to the server</span></span> <img src="../images/launch_publish.gif" alt="This is an image of the Publish toolbar icon." /> <span id="twpub_wst__twpub_steps_ph2"><a name="twpub_wst__twpub_steps_ph2"><!-- --></a>icon located on the toolbar.</span></li>
@@ -92,6 +86,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
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 c1d72c7..8808cc8 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
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 9616ddf..64d8fcc 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Starting a server in debug mode" />
<meta name="abstract" content="If you want to debug your projects while a server runs, you can start a server in debug mode." />
<meta name="description" content="If you want to debug your projects while a server runs, you can start a server in debug mode." />
-<meta content="servers, starting in debug mode, applications, running on a server in debug mode, projects" name="DC.subject" />
-<meta content="servers, starting in debug mode, applications, running on a server in debug mode, projects" name="keywords" />
+<meta content="applications, running on servers in debug mode, projects, servers, starting in debug mode" name="DC.subject" />
+<meta content="applications, running on servers in debug mode, projects, servers, starting in debug mode" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="twsrtdbg_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
@@ -65,6 +65,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
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 54d5629..4d0e65d 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Starting a server" />
<meta name="abstract" content="When you are ready to test your projects, you must start a server. In some situations, listed below, the server tools start a server for you automatically. For more information on which test server will start, refer to the list of related topics at the end of this topic." />
<meta name="description" content="When you are ready to test your projects, you must start a server. In some situations, listed below, the server tools start a server for you automatically. For more information on which test server will start, refer to the list of related topics at the end of this topic." />
-<meta content="servers, starting, projects, starting server for testing, applications" name="DC.subject" />
-<meta content="servers, starting, projects, starting server for testing, applications" name="keywords" />
+<meta content="applications, starting servers for testing, projects, servers, starting for testing" name="DC.subject" />
+<meta content="applications, starting servers for testing, projects, servers, starting for testing" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="twsrtins_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.dita b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.dita
index e09f93a..e3a73db 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.dita
+++ b/docs/org.eclipse.wst.server.ui.doc.user/topics/twsrvprf.dita
@@ -1,68 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
+<?Pub Sty _display FontColor="red"?>
+<?Pub Inc?>
<task id="twsrvprf_wst" xml:lang="en-us">
-<title id="title">Defining the server preferences</title>
-<shortdesc id="shortdesc">Using the Preferences page, you can define attributes
-used for testing projects by the servers. To define these preferences, complete
-the following:</shortdesc>
+<title id="title">Defining the server preference<!--Defining the server preferences--></title>
+<shortdesc id="shortdesc">Using the Preferences page, you can define attribute
+used for testing projects by the servers.</shortdesc>
<prolog><metadata>
<keywords id="index"><indexterm>preferences<indexterm>servers<indexterm>testing</indexterm></indexterm></indexterm>
-<indexterm>servers<indexterm>preferences</indexterm></indexterm>
-<indexterm>views<indexterm>server preferences</indexterm></indexterm>
-</keywords>
+<indexterm>servers<indexterm>preferences</indexterm></indexterm><indexterm>views<indexterm>server
+preferences</indexterm></indexterm></keywords>
</metadata></prolog>
<taskbody>
+<context>To define this preference<?Pub Caret?>, complete the following steps:<!--To define these preferences, complete the following steps:--></context>
<steps id="steps">
<step><cmd>In the toolbar, select <menucascade><uicontrol>Window</uicontrol>
<uicontrol>Preferences</uicontrol></menucascade>.</cmd></step>
<step><cmd>In the Preferences page, select <uicontrol>Server</uicontrol>.</cmd>
</step>
-<step><cmd>Specify one or more of the following settings by selecting the
-appropriate check box:</cmd>
-<choicetable>
-<chrow><choption>Show Servers view when server state changes</choption><chdesc>The
-Servers view is displayed on the workbench when there are any activities in
-the Servers view. For more details about the server states refer to the <xref
-href="rwrcview.dita">Servers View</xref> topic.</chdesc></chrow>
-<chrow><choption>Synchronize servers on workbench startup<draft-comment>context
-id = spge0028</draft-comment></choption><chdesc><draft-comment>Review description</draft-comment>This
-option specifies that each time you start the workbench, it will try to update
-the status of the server defined in the Servers view with the actual state
-of the server, such as Started or Stopped.</chdesc></chrow>
-<chrow><choption>Automatically publish to local server</choption><chdesc>Specifies
-that all the files should automatically be published to the local server at
-every <i>seconds</i> intervals, where <i>seconds</i> is the number of seconds
-you have specified in the <uicontrol>Publishing interval (in seconds)</uicontrol> control.
-The minimum value for the publishing interval is ten seconds.</chdesc></chrow>
-<chrow><choption>Automatically publish to remote server</choption><chdesc>Specifies
-that all the files should automatically be published to the remote server
-at every <i>seconds</i> intervals, where <i>seconds</i> is the number of seconds
-you have specified in the <uicontrol>Publishing interval (in seconds)</uicontrol> control.
-The minimum value for the publishing interval is ten seconds.</chdesc></chrow>
-<chrow><choption>Prompt before making irreversible changes within an editor</choption>
-<chdesc>Specifies that the server tools will prompt you before you make a
-change in a editor that cannot be undone.</chdesc></chrow>
-</choicetable>
-</step>
-<step><cmd>Under the <uicontrol>Server timeout delay</uicontrol> drop-down
-list, select one of the following relative length of time you can wait before
-ending a server operation:</cmd>
-<choices>
-<choice>Longer</choice>
-<choice>Long</choice>
-<choice>Normal</choice>
-<choice>Short</choice>
-<choice>Shorter</choice>
-</choices>
-<info>The default setting is <uicontrol>Normal</uicontrol>.</info><info><note
-type="tip">If you have a fast processing machine, you can try using the <uicontrol>Shorter</uicontrol> timeout
-delay option. If you have a slow processing machine, you can try using the <uicontrol>Longer</uicontrol> timeout
-delay option.</note></info></step>
+<step><cmd>Specify the following setting by selecting the check box:<!--Specify one or more of the following settings by selecting the appropriate check box:--></cmd>
+<info><dl><dlentry>
+<dt>Show Servers view when server state changes</dt>
+<dd>The Servers view is displayed on the workbench when there are any activities
+in the Servers view. For more details about the server states refer to the <xref
+href="rwrcview.dita">Servers View</xref> topic.</dd>
+</dlentry></dl></info></step>
<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to
save your changes.</cmd></step>
</steps>
</taskbody>
</task>
-<?Pub *0000003817?>
+<?Pub *0000001831?>
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 dd396d9..0732c1b 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,33 +2,34 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Defining the server preferences" />
-<meta name="abstract" content="Using the Preferences page, you can define attributes used for testing projects by the servers. To define these preferences, complete the following:" />
-<meta name="description" content="Using the Preferences page, you can define attributes used for testing projects by the servers. To define these preferences, complete the following:" />
-<meta content="servers, defining preferences, setting publishing preferences, setting timeout delays, preferences, views, Servers" name="DC.subject" />
-<meta content="servers, defining preferences, setting publishing preferences, setting timeout delays, preferences, views, Servers" name="keywords" />
+<meta name="DC.Title" content="Defining the server preference" />
+<meta name="abstract" content="Using the Preferences page, you can define attribute used for testing projects by the servers." />
+<meta name="description" content="Using the Preferences page, you can define attribute used for testing projects by the servers." />
+<meta content="preferences, servers, testing, views, server preferences" name="DC.subject" />
+<meta content="preferences, servers, testing, views, server preferences" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="twsrvprf_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Defining the server preferences</title>
+<title>Defining the server preference</title>
</head>
<body id="twsrvprf_wst"><a name="twsrvprf_wst"><!-- --></a>
-<h1 class="topictitle1">Defining the server preferences</h1>
+<h1 class="topictitle1">Defining the server preference</h1>
-<div><p>Using the Preferences page, you can define attributes
-used for testing projects by the servers. To define these preferences, complete
-the following:</p>
+<div><p>Using the Preferences page, you can define attribute
+used for testing projects by the servers.</p>
+
+<div class="section">To define this preference, complete the following steps:</div>
<a name="twsrvprf_wst__steps"><!-- --></a><ol id="twsrvprf_wst__steps">
<li class="stepexpand"><span>In the toolbar, select <span class="menucascade"><span class="uicontrol">Window</span>
@@ -37,71 +38,14 @@
<li class="stepexpand"><span>In the Preferences page, select <span class="uicontrol">Server</span>.</span>
</li>
-<li class="stepexpand"><span>Specify one or more of the following settings by selecting the
-appropriate check box:</span>
+<li class="stepexpand"><span>Specify the following setting by selecting the check box:</span>
+ <dl>
+<dt class="dlterm">Show Servers view when server state changes</dt>
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N1009B-option" align="left">Option</th>
-<th valign="bottom" id="N1009B-desc" align="left">Description</th></tr></thead>
-<tbody>
-<tr><td valign="top" headers="N1009B-option" id="N100A5"><strong>Show Servers view when server state changes</strong></td>
-<td valign="top" headers="N1009B-desc N100A5">The
-Servers view is displayed on the workbench when there are any activities in
-the Servers view. For more details about the server states refer to the <a href="rwrcview.html">Servers View</a> topic.</td>
-</tr>
+<dd>The Servers view is displayed on the workbench when there are any activities
+in the Servers view. For more details about the server states refer to the <a href="rwrcview.html">Servers View</a> topic.</dd>
-<tr><td valign="top" headers="N1009B-option" id="N100BB"><strong>Synchronize servers on workbench startup</strong></td>
-<td valign="top" headers="N1009B-desc N100BB">This
-option specifies that each time you start the workbench, it will try to update
-the status of the server defined in the Servers view with the actual state
-of the server, such as Started or Stopped.</td>
-</tr>
-
-<tr><td valign="top" headers="N1009B-option" id="N100D4"><strong>Automatically publish to local server</strong></td>
-<td valign="top" headers="N1009B-desc N100D4">Specifies
-that all the files should automatically be published to the local server at
-every <em>seconds</em> intervals, where <em>seconds</em> is the number of seconds
-you have specified in the <span class="uicontrol">Publishing interval (in seconds)</span> control.
-The minimum value for the publishing interval is ten seconds.</td>
-</tr>
-
-<tr><td valign="top" headers="N1009B-option" id="N100F5"><strong>Automatically publish to remote server</strong></td>
-<td valign="top" headers="N1009B-desc N100F5">Specifies
-that all the files should automatically be published to the remote server
-at every <em>seconds</em> intervals, where <em>seconds</em> is the number of seconds
-you have specified in the <span class="uicontrol">Publishing interval (in seconds)</span> control.
-The minimum value for the publishing interval is ten seconds.</td>
-</tr>
-
-<tr><td valign="top" headers="N1009B-option" id="N10116"><strong>Prompt before making irreversible changes within an editor</strong></td>
-
-<td valign="top" headers="N1009B-desc N10116">Specifies that the server tools will prompt you before you make a
-change in a editor that cannot be undone.</td>
-</tr>
-
-</tbody></table>
-
-</li>
-
-<li class="stepexpand"><span>Under the <span class="uicontrol">Server timeout delay</span> drop-down
-list, select one of the following relative length of time you can wait before
-ending a server operation:</span>
-<ul>
-<li>Longer</li>
-
-<li>Long</li>
-
-<li>Normal</li>
-
-<li>Short</li>
-
-<li>Shorter</li>
-
-</ul>
-
- The default setting is <span class="uicontrol">Normal</span>. <div class="tip"><span class="tiptitle">Tip:</span> If you have a fast processing machine, you can try using the <span class="uicontrol">Shorter</span> timeout
-delay option. If you have a slow processing machine, you can try using the <span class="uicontrol">Longer</span> timeout
-delay option.</div>
+</dl>
</li>
<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
@@ -111,6 +55,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
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 22de0a0..fe20703 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 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -11,8 +11,8 @@
<meta name="DC.Title" content="Stopping a server" />
<meta name="abstract" content="You can stop the server from the Servers view." />
<meta name="description" content="You can stop the server from the Servers view." />
-<meta content="servers, stopping, process (stopping), terminating" name="DC.subject" />
-<meta content="servers, stopping, process (stopping), terminating" name="keywords" />
+<meta content="servers, stopping" name="DC.subject" />
+<meta content="servers, stopping" name="keywords" />
<meta content="XHTML" name="DC.Format" />
<meta content="twstpins_wst" name="DC.Identifier" />
<meta content="en-us" name="DC.Language" />
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 e94f4dd..aedf41c 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,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+<!--Arbortext, Inc., 1988-2006, v.4002-->
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
"task.dtd">
<task id="twtcpprf_wst" xml:lang="en-us">
@@ -8,9 +8,8 @@
Monitor attributes. To define these preferences, complete the following:</shortdesc>
<prolog><metadata>
<keywords id="index"><indexterm>preferences<indexterm>TCP/IP Monitor</indexterm></indexterm>
-<indexterm>TCP/IP<indexterm>preferences</indexterm></indexterm>
-<indexterm>views<indexterm>TCP/IP Monitor preferences</indexterm></indexterm>
-</keywords>
+<indexterm>TCP/IP<indexterm>preferences</indexterm></indexterm><indexterm>views<indexterm>TCP/IP
+Monitor<indexterm>preferences</indexterm></indexterm></indexterm></keywords>
</metadata></prolog>
<taskbody>
<context></context>
@@ -43,9 +42,9 @@
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. </chdesc></chrow>
-<chrow><choption>Connection Timeout</choption><chdesc>Specify the length of
-time, in milliseconds, that you can wait before ending the TCP/IP connection
-to a server.</chdesc></chrow>
+<chrow><choption>Timeout (in milliseconds)<?Pub Caret?></choption><chdesc>Specify
+the length of time, in milliseconds, that you can wait before ending the TCP/IP
+connection to a server.</chdesc></chrow>
</choicetable>
</step>
<step><cmd>Use the <uicontrol>Start</uicontrol> and <uicontrol>Stop</uicontrol> buttons
@@ -61,4 +60,4 @@
</steps>
</taskbody>
</task>
-<?Pub *0000003580?>
+<?Pub *0000003581?>
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 a403845..43164df 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,8 +2,8 @@
<html lang="en-us" xml:lang="en-us">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2006" />
+<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
+<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
<meta content="public" name="security" />
<meta content="index,follow" name="Robots" />
<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
@@ -82,10 +82,10 @@
any requests that it forwards. </td>
</tr>
-<tr><td valign="top" headers="N100E3-option" id="N10129"><strong>Connection Timeout</strong></td>
-<td valign="top" headers="N100E3-desc N10129">Specify the length of
-time, in milliseconds, that you can wait before ending the TCP/IP connection
-to a server.</td>
+<tr><td valign="top" headers="N100E3-option" id="N10129"><strong>Timeout (in milliseconds)</strong></td>
+<td valign="top" headers="N100E3-desc N10129">Specify
+the length of time, in milliseconds, that you can wait before ending the TCP/IP
+connection to a server.</td>
</tr>
</tbody></table>
@@ -108,6 +108,7 @@
</div>
+<div />
</body>
</html>
\ No newline at end of file
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 4996933..fe6d7ab 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
@@ -3,20 +3,18 @@
<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
"map.dtd">
<map title="Testing and publishing applications">
-<topicref href="../org.eclipse.wst.server.ui.doc.user/topics/cwover.dita"
-linking="normal" locktitle="yes" navtitle="Application testing and publishing"
+<topicref href="topics/cwover.dita" linking="normal" locktitle="yes" navtitle="Application testing and publishing"
scope="peer">
-<topicref href="../org.eclipse.wst.server.ui.doc.user/topics/rwrcview.dita"
-locktitle="yes" navtitle="Servers view" scope="peer"></topicref>
-<topicref href="../org.eclipse.wst.server.ui.doc.user/topics/cwres.dita" locktitle="yes"
-navtitle="Resources used by the Server Tools" scope="peer"></topicref>
-<topicref href="../org.eclipse.wst.server.ui.doc.user/topics/cwflow.dita"
-locktitle="yes" navtitle="Which server will start" scope="peer"></topicref>
+<topicref href="topics/rwrcview.dita" locktitle="yes" navtitle="Servers view">
+</topicref>
+<topicref href="topics/cwres.dita" locktitle="yes" navtitle="Resources used by the Server Tools">
+</topicref>
+<topicref href="topics/cwflow.dita" locktitle="yes" navtitle="Which server will start">
+</topicref>
<navref mapref="wtp_test.ditamap"/>
<navref mapref="wtp_debug.ditamap"/>
<navref mapref="wtp_publish.ditamap"/>
<navref mapref="wtp_create.ditamap"/>
<navref mapref="wtp_manage.ditamap"/>
-<navref mapref="wtp_pref.ditamap"/></topicref><?Pub Caret1?>
+<navref mapref="wtp_pref.ditamap"/></topicref>
</map>
-<?Pub *0000001087?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
index 53beb3d..18abc14 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml
@@ -2,48 +2,16 @@
<?NLS TYPE="org.eclipse.help.toc"?>
-<toc label="Testing and publishing applications" topic="../org.eclipse.wst.server.ui.doc.user/topics/cwover.html">
-<topic label="Application testing and publishing" href="../org.eclipse.wst.server.ui.doc.user/topics/cwover.html">
-<topic label="Servers view" href="../org.eclipse.wst.server.ui.doc.user/topics/rwrcview.html"/>
-<topic label="Resources used by the Server Tools" href="../org.eclipse.wst.server.ui.doc.user/topics/cwres.html"/>
-<topic label="Which server will start" href="../org.eclipse.wst.server.ui.doc.user/topics/cwflow.html"/>
-<topic label="Testing applications on a server" href="topics/tj2ee.html">
-<topic label="Testing artifacts on a server" href="topics/testing.html"/>
-</topic>
-<topic label="Debugging applications on a server" href="topics/tdebug.html">
-<topic label="...servlets" href="topics/tservlet.html"/>
-<topic label="...JSP file" href="topics/tdbgjsp.html"/>
-</topic>
-<topic label="Publishing applications to a server" href="topics/tpublish.html">
-<topic label="Publishing your application" href="topics/twpub.html"/>
-</topic>
-<topic label="Creating, editing, and deleting servers" href="topics/tcreate.html">
-<topic label="Creating a server " href="topics/twcrtins.html">
-<link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_create.xml"/>
-</topic>
-<topic label="Editing a server" href="topics/twedtins.html"/>
-<topic label="Deleting a server" href="topics/twdelins.html"/>
-</topic>
-<topic label="Managing servers" href="topics/twmanage.html">
-<topic label="Adding projects to a server " href="topics/twaddprj.html"/>
-<topic label="Removing a project from a server" href="topics/twremprj.html"/>
-<topic label="Starting a server" href="topics/twsrtins.html">
-<topic label="Starting a server in debug mode" href="topics/twsrtdbg.html"/>
-</topic>
-<topic label="Stopping a server" href="topics/twstpins.html"/>
-<topic label="Setting a default server" href="topics/twprefin.html"/>
-<topic label="Displaying or hiding the metadata of the server" href="topics/tmetasrv.html"/>
-</topic>
-<topic label="Defining server preferences" href="topics/tpref.html">
-<topic label="Defining the server preferences" href="topics/twsrvprf.html"/>
-<topic label="Defining the audio preferences" href="topics/tprefaud.html"/>
-<topic label="Defining the launching preferences" href="topics/twlaunchpref.html"/>
-<topic label="Defining the installed server runtime environments preferences" href="topics/twinstprf.html">
-<link toc="../org.eclipse.jst.server.ui.doc.user/tomcat_pref.xml"/>
-</topic>
-<topic label="Defining the TCP/IP Monitor preferences" href="topics/twtcpprf.html">
-<topic label="TCP/IP Monitor view" href="topics/rwtcpvw.html"/>
-</topic>
-</topic>
+<toc label="Testing and publishing applications" topic="topics/cwover.html">
+<topic label="Application testing and publishing" href="topics/cwover.html">
+<topic label="Servers view" href="topics/rwrcview.html"/>
+<topic label="Resources used by the Server Tools" href="topics/cwres.html"/>
+<topic label="Which server will start" href="topics/cwflow.html"/>
+<link toc="wtp_test.xml"/>
+<link toc="wtp_debug.xml"/>
+<link toc="wtp_publish.xml"/>
+<link toc="wtp_create.xml"/>
+<link toc="wtp_manage.xml"/>
+<link toc="wtp_pref.xml"/>
</topic>
</toc>
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 35f5251..ac16824 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
@@ -12,12 +12,11 @@
</relheader>
<relrow>
<relcell>
-<topicref href="topics/cwflow.dita" locktitle="yes" navtitle="Which test server will start">
+<topicref href="topics/cwflow.dita" navtitle="Which test server will start">
</topicref>
</relcell>
<relcell>
-<topicref href="topics/twsrtins.dita" locktitle="yes" navtitle="Starting a server">
-</topicref>
+<topicref href="topics/twsrtins.dita" navtitle="Starting a server"></topicref>
</relcell>
<relcell></relcell>
<relcell></relcell>
@@ -25,25 +24,24 @@
<relrow>
<relcell></relcell>
<relcell>
-<topicref href="topics/twtcpprf.dita" locktitle="yes" navtitle="Defining the TCP/IP Monitor preference">
+<topicref href="topics/twtcpprf.dita" navtitle="Defining the TCP/IP Monitor preference">
</topicref>
</relcell>
<relcell>
-<topicref href="topics/rwtcpvw.dita" locktitle="yes" navtitle="TCP/IP Monitor view">
-</topicref>
+<topicref href="topics/rwtcpvw.dita" navtitle="TCP/IP Monitor view"></topicref>
</relcell>
<relcell></relcell>
</relrow>
<relrow>
<relcell>
-<topicref href="topics/cwres.dita" locktitle="yes" navtitle="Resources used by the Server Tools">
+<topicref href="topics/cwres.dita" navtitle="Resources used by the Server Tools">
</topicref>
</relcell>
<relcell>
-<topicref href="topics/tmetasrv.dita" linking="targetonly" locktitle="yes"
-navtitle="Displaying or hiding the metadata of the server"></topicref>
-<topicref href="topics/twinstprf.dita" linking="targetonly" locktitle="yes"
-navtitle="Defining the installed server runtime environments"></topicref>
+<topicref href="topics/tmetasrv.dita" linking="targetonly" navtitle="Displaying or hiding the metadata of the server">
+</topicref>
+<topicref href="topics/twinstprf.dita" linking="targetonly" navtitle="Defining the installed server runtime environments">
+</topicref>
</relcell>
<relcell></relcell>
<relcell></relcell>
@@ -51,14 +49,25 @@
<relrow>
<relcell></relcell>
<relcell collection-type="family">
-<topicref href="topics/twsrvprf.dita" locktitle="yes" navtitle="Defining the server preferences">
+<topicref href="topics/twsrvprf.dita" navtitle="Defining the server preferences">
</topicref>
-<topicref href="topics/twpub.dita" locktitle="yes" navtitle="Publishing your application">
+<topicref href="topics/twpub.dita" navtitle="Publishing your application">
</topicref>
</relcell>
<relcell></relcell>
<relcell></relcell>
</relrow>
+<relrow>
+<relcell></relcell>
+<relcell>
+<topicref href="topics/twtcpprf.dita" navtitle="Defining the TCP/IP monitor preferences">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="topics/rwtcpvw.dita" navtitle="TCP/IP monitor view"></topicref><?Pub Caret1?>
+</relcell>
+<relcell></relcell>
+</relrow>
</reltable>
</map>
-<?Pub *0000001852?>
+<?Pub *0000002005?>
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml b/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml
new file mode 100644
index 0000000..0f46c75
--- /dev/null
+++ b/docs/org.eclipse.wst.server.ui.doc.user/wtp_reltable.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc/>
