Bug Id : 189422
authorNagakishore Sidde <kishore320@netbeans.org>
Wed, 18 Aug 2010 11:59:57 +0530
changeset 163661fe81ac651e6
parent 16365 1d5dc874aa2f
child 16373 34fda859aa4d
Bug Id : 189422
Description : Rebranding the webserver plugin to reflect the Oracle brand name
Added By : Nagakishore Sidde <kishore320@netbeans.org>
Reviewd By : Isvaran Krishnamurthy <ikrishna@netbeans.org>
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin-idx.xml
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin-toc.xml
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin.hs
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_configfiles.html
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_hierarchyofserverinstancenodes.html
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_registering_server.html
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_custom.html
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_extjndi.html
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_javamail.html
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_jdbc.html
j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_register.html
j2ee.sun.ws7/manifest.mf
j2ee.sun.ws7/nbproject/project.properties
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/dm/Bundle.properties
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/j2ee/Bundle.properties
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/nodes/Bundle.properties
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/resources/Bundle.properties
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/actions/Bundle.properties
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/beans/Bundle.properties
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/CustomWizardInfo.html
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/ExternalJNDIWizardInfo.html
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/JDBCWizardInfo.html
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/MailWizardInfo.html
j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/ui/Bundle.properties
j2ee.sun.ws7/test/qa-functional/data/nb.properties
j2ee.sun.ws7/test/qa-functional/src/org/netbeans/modules/j2ee/sun/ws7/ServerPluginTests.java
j2ee.sun.ws7/test/qa-functional/src/org/netbeans/modules/j2ee/sun/ws7/util/PropBean.java
     1.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin-idx.xml	Fri Aug 06 11:54:16 2010 -0400
     1.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin-idx.xml	Wed Aug 18 11:59:57 2010 +0530
     1.3 @@ -8,7 +8,7 @@
     1.4                         "http://java.sun.com/products/javahelp/index_2_0.dtd">
     1.5  
     1.6  <index version="2.0">
     1.7 -	<indexitem text="Sun Java System Web Server" target="wsplugin_webserver7_plugin_help" />
     1.8 -	<indexitem text="registering Sun Java System Web Server" target="wsplugin_webserver7_plugin_help" />
     1.9 -	<indexitem text="registering resources with the Sun Java System Web Server" target="wsplugin_res_register" />
    1.10 +	<indexitem text="Oracle iPlanet Web Server" target="wsplugin_webserver7_plugin_help" />
    1.11 +	<indexitem text="registering Oracle iPlanet Web Server" target="wsplugin_webserver7_plugin_help" />
    1.12 +	<indexitem text="registering resources with the Oracle iPlanet Web Server" target="wsplugin_res_register" />
    1.13  </index>
     2.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin-toc.xml	Fri Aug 06 11:54:16 2010 -0400
     2.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin-toc.xml	Wed Aug 18 11:59:57 2010 +0530
     2.3 @@ -10,15 +10,15 @@
     2.4  <toc version="2.0">
     2.5  	<tocitem text="Servers and Databases">
     2.6  		<tocitem text="Servers">
     2.7 -			<tocitem text="Sun Java System Web Server">
     2.8 -				<tocitem text="Registering a Sun Java System Web Server" target="wsplugin_webserver7_plugin_help"/>
     2.9 -				<tocitem text="Hierarchy of Sun Java System Web Server Instance Nodes" target="wsplugin_hierarchyofserverinstancenodes"/>
    2.10 -				<tocitem text="Configuration Files for Web Applications Targeted for Sun Java System Web Server" target="wsplugin_configfiles"/>
    2.11 -				<tocitem text="Setting Up a Custom Resource on the Sun Java System Web Server" target="wsplugin_res_custom"/>
    2.12 -				<tocitem text="Setting Up an External JNDI Resource on the Sun Java System Web Server" target="wsplugin_res_extjndi"/>
    2.13 -				<tocitem text="Setting Up a JavaMail Resource on the Sun Java System Web Server" target="wsplugin_res_javamail"/>
    2.14 -				<tocitem text="Setting Up a JDBC Resource on the Sun Java System Web Server" target="wsplugin_res_jdbc"/>
    2.15 -				<tocitem text="Registering a Resource with the Sun Java System Web Server" target="wsplugin_res_register" />
    2.16 +			<tocitem text="Oracle iPlanet Web Server">
    2.17 +				<tocitem text="Registering a Oracle iPlanet Web Server" target="wsplugin_webserver7_plugin_help"/>
    2.18 +				<tocitem text="Hierarchy of Oracle iPlanet Web Server Instance Nodes" target="wsplugin_hierarchyofserverinstancenodes"/>
    2.19 +				<tocitem text="Configuration Files for Web Applications Targeted for Oracle iPlanet Web Server" target="wsplugin_configfiles"/>
    2.20 +				<tocitem text="Setting Up a Custom Resource on the Oracle iPlanet Web Server" target="wsplugin_res_custom"/>
    2.21 +				<tocitem text="Setting Up an External JNDI Resource on the Oracle iPlanet Web Server" target="wsplugin_res_extjndi"/>
    2.22 +				<tocitem text="Setting Up a JavaMail Resource on the Oracle iPlanet Web Server" target="wsplugin_res_javamail"/>
    2.23 +				<tocitem text="Setting Up a JDBC Resource on the Oracle iPlanet Web Server" target="wsplugin_res_jdbc"/>
    2.24 +				<tocitem text="Registering a Resource with the Oracle iPlanet Web Server" target="wsplugin_res_register" />
    2.25  			</tocitem>
    2.26  		</tocitem>
    2.27  	</tocitem>
     3.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin.hs	Fri Aug 06 11:54:16 2010 -0400
     3.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin.hs	Wed Aug 18 11:59:57 2010 +0530
     3.3 @@ -8,7 +8,7 @@
     3.4  
     3.5  
     3.6  <helpset version="2.0">
     3.7 -	<title>Sun Java System Web Server Plugin Help</title>
     3.8 +	<title>Oracle iPlanet Web Server Plugin Help</title>
     3.9  	<maps>
    3.10  		<homeID>wsplugin_webserver7_plugin_help</homeID>
    3.11  		<mapref location="wsplugin-map.jhm"/>
     4.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_configfiles.html	Fri Aug 06 11:54:16 2010 -0400
     4.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_configfiles.html	Wed Aug 18 11:59:57 2010 +0530
     4.3 @@ -5,19 +5,19 @@
     4.4  -->
     4.5  <html>
     4.6  <head>
     4.7 -<title>Configuration Files for Web Applications Targeted for Sun Java System Web Server</title>
     4.8 +<title>Configuration Files for Web Applications Targeted for Oracle iPlanet Web Server</title>
     4.9  <link rel="StyleSheet" href="/org/netbeans/modules/usersguide/ide.css" type="text/css">
    4.10  </head>
    4.11  <body>
    4.12 -<h2>Configuration Files for Web Applications Targeted for Sun Java System Web Server</h2>
    4.13 +<h2>Configuration Files for Web Applications Targeted for Oracle iPlanet Web Server</h2>
    4.14  <p><small><a href="#seealso">See Also</a></small></p>
    4.15 -<p>Sun Java<small><sup>TM</sup></small> System Web Server 7.0 supports J2EE 1.4 standards for web applications.</p>
    4.16 -<p>In addition to the <tt>web.xml</tt> file, which is a J2EE 1.4 standard, another file, <tt>sun-web.xml</tt>, is needed for each web application that is deployed on Sun Java System Web Server 7.0. See <a href="nbdocs:/org/netbeans/modules/j2ee/platform/docs/web/configure/configure_webapp_dd.html" title="Configuring Web Application Deployment Descriptors">Configuring Web Application Deployment Descriptors</a> for more information about these files.</p>
    4.17 +<p>Oracle iPlanet Web Server 7.0 supports J2EE 1.4 standards for web applications.</p>
    4.18 +<p>In addition to the <tt>web.xml</tt> file, which is a J2EE 1.4 standard, another file, <tt>sun-web.xml</tt>, is needed for each web application that is deployed on Oracle iPlanet Web Server 7.0. See <a href="nbdocs:/org/netbeans/modules/j2ee/platform/docs/web/configure/configure_webapp_dd.html" title="Configuring Web Application Deployment Descriptors">Configuring Web Application Deployment Descriptors</a> for more information about these files.</p>
    4.19  <dl>
    4.20  <dt><a name="seealso">See Also</a></dt>
    4.21  <dd><a href="nbdocs:/org/netbeans/modules/j2ee/platform/docs/web/configure/configure_webapp_dd.html" title="Configuring Web Application Deployment Descriptors">Configuring Web Application Deployment Descriptors</a></dd>
    4.22 -<dd><a href="wsplugin_registering_server.html" title="Registering a Sun Java System Web Server">Registering a Sun Java System Web Server</a></dd>
    4.23 -<dd><a href="wsplugin_hierarchyofserverinstancenodes.html" title="Hierarchy of Sun Java System Web Server Instance Nodes">Hierarchy of Sun Java System Web Server Instance Nodes</a></dd>
    4.24 +<dd><a href="wsplugin_registering_server.html" title="Registering a Oracle iPlanet Web Server">Registering a Oracle iPlanet Web Server</a></dd>
    4.25 +<dd><a href="wsplugin_hierarchyofserverinstancenodes.html" title="Hierarchy of Oracle iPlanet Web Server Instance Nodes">Hierarchy of Oracle iPlanet Web Server Instance Nodes</a></dd>
    4.26  <dd><a href="nbdocs:/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html" title="Server Manager Dialog Box">Server Manager Dialog Box</a></dd>
    4.27  <!-- Update with link to 7.0 admin guide when available
    4.28  <dd><object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
     5.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_hierarchyofserverinstancenodes.html	Fri Aug 06 11:54:16 2010 -0400
     5.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_hierarchyofserverinstancenodes.html	Wed Aug 18 11:59:57 2010 +0530
     5.3 @@ -5,17 +5,17 @@
     5.4  -->
     5.5  <html>
     5.6  <head>
     5.7 -<title>Hierarchy of Sun Java System Web Server Instance Nodes</title>
     5.8 +<title>Hierarchy of Oracle iPlanet Web Server Instance Nodes</title>
     5.9  <link rel="StyleSheet" href="/org/netbeans/modules/usersguide/ide.css" type="text/css">
    5.10  </head>
    5.11  <body>
    5.12 -<h2>Hierarchy of Sun Java System Web Server Instance Nodes</h2>
    5.13 +<h2>Hierarchy of Oracle iPlanet Web Server Instance Nodes</h2>
    5.14  <p><small><a href="#seealso">See Also</a></small></p>
    5.15  <p>Each Admin Server instance can control multiple configurations and each configuration can have multiple virtual servers. Each Web Server instance belongs to a configuration. By default, there is one configuration with one virtual server and one instance associated with that configuration.</p>
    5.16  <h3>Selecting a Configuration</h3>
    5.17  <p>If your Web Server installation has multiple configurations, you will be prompted to select a configuration for deployment. After you select a configuration, that configuration will be used for all further actions you perform, such as application deployment, listing resources, and JVM properties.</p>
    5.18 -<h3>Actions for Sun Java System Web Server 7.0 Node</h3>
    5.19 -<p>In the Runtime window, the Sun Java System Web Server 7.0 node represents the admin instance of the Web Server. This section explains the actions you can invoke from the right-click pop-up menu that you access from the Sun Java System Web Server 7.0 node for <em>local</em> server instances. When you expand the Sun Java System Web Server 7.0 node, the configured server instance tree displays.</p>
    5.20 +<h3>Actions for Oracle iPlanet Web Server 7.0 Node</h3>
    5.21 +<p>In the Runtime window, the Oracle iPlanet Web Server 7.0 node represents the admin instance of the Web Server. This section explains the actions you can invoke from the right-click pop-up menu that you access from the Oracle iPlanet Web Server 7.0 node for <em>local</em> server instances. When you expand the Oracle iPlanet Web Server 7.0 node, the configured server instance tree displays.</p>
    5.22  <ul>
    5.23  <li><b>Start.</b> Starts the server and shows the status of the process in the Output window.</li>
    5.24  <li><b>Restart.</b> Stops and restarts the server and shows the status of the process in the Output window.</li>
    5.25 @@ -30,7 +30,7 @@
    5.26  <li>You cannot start or stop a remote server instance.</li>
    5.27  </ul>
    5.28  <h3>Actions for <i>server-instance</i> Nodes</h3>
    5.29 -<p>This section explains the actions you can invoke from the right-click pop-up menu that you access from the Sun Java System Web Server 7.0 subnodes for <em>local</em> server instances. Each <i>server-instance</i> node represents the server instance belonging to a Web Server configuration.</p>
    5.30 +<p>This section explains the actions you can invoke from the right-click pop-up menu that you access from the Oracle iPlanet Web Server 7.0 subnodes for <em>local</em> server instances. Each <i>server-instance</i> node represents the server instance belonging to a Web Server configuration.</p>
    5.31  <ul>
    5.32  <li><b>Start Instance/Stop Instance.</b> Lets you start and stop the local server instance. The results of the process are shown in the Output window.</li>
    5.33  <li><b>View Server Logs.</b> Displays server logs. You can only view the server log files for local server instances.</li>
    5.34 @@ -62,9 +62,9 @@
    5.35  </ul>
    5.36  <dl>
    5.37  <dt><a name="seealso">See Also</a></dt>
    5.38 -<dd><a href="wsplugin_res_register.html" title="Registering a Resource with the Sun Java System Web Server">Registering a Resource with the Sun Java System Web Server</a></dd>
    5.39 -<dd><a href="wsplugin_registering_server.html" title="Registering a Sun Java System Web Server">Registering a Sun Java System Web Server</a></dd>
    5.40 -<dd><a href="wsplugin_configfiles.html" title="Configuration Files for Web Applications Targeted for Sun Java System Web Server">Configuration Files for Web Applications Targeted for Sun Java System Web Server</a></dd>
    5.41 +<dd><a href="wsplugin_res_register.html" title="Registering a Resource with the Oracle iPlanet Web Server">Registering a Resource with the Oracle iPlanet Web Server</a></dd>
    5.42 +<dd><a href="wsplugin_registering_server.html" title="Registering a Oracle iPlanet Web Server">Registering a Oracle iPlanet Web Server</a></dd>
    5.43 +<dd><a href="wsplugin_configfiles.html" title="Configuration Files for Web Applications Targeted for Oracle iPlanet Web Server">Configuration Files for Web Applications Targeted for Oracle iPlanet Web Server</a></dd>
    5.44  <dd><a href="nbdocs:/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html" title="Server Manager Dialog Box">Server Manager Dialog Box</a></dd>
    5.45  <!-- Update with link to 7.0 admin guide when available
    5.46  <dd><object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
     6.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_registering_server.html	Fri Aug 06 11:54:16 2010 -0400
     6.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_registering_server.html	Wed Aug 18 11:59:57 2010 +0530
     6.3 @@ -5,15 +5,15 @@
     6.4  -->
     6.5  <html>
     6.6  <head>
     6.7 -<title>Registering a Sun Java System Web Server</title>
     6.8 +<title>Registering a Oracle iPlanet Web Server</title>
     6.9  <link rel="StyleSheet" href="/org/netbeans/modules/usersguide/ide.css" type="text/css">
    6.10  </head>
    6.11  <body>
    6.12 -<h2>Registering a Sun Java System Web Server</h2>
    6.13 +<h2>Registering a Oracle iPlanet Web Server</h2>
    6.14  <p><small><a href="#seealso">See Also</a></small></p>
    6.15 -<p>In this version of the IDE, the plugin for the Sun Java System Web Server is for Sun Java<small><sup>TM</sup></small> System Web Server 7.0. Before you can start developing and deploying applications to a server, you must register your server with the IDE.</p>
    6.16 -<p>You can have multiple instances of the Sun Java System Web Server registered with the IDE, but you must first specify the local folder that contains the local installation of the Sun Java System Web Server. You only need to specify the location of the local installation once.</p>
    6.17 -<p><b>To register an instance of a Sun Java System Web Server:</b></p>
    6.18 +<p>In this version of the IDE, the plugin for the Oracle iPlanet Web Server is for Oracle iPlanet Web Server 7.0. Before you can start developing and deploying applications to a server, you must register your server with the IDE.</p>
    6.19 +<p>You can have multiple instances of the Oracle iPlanet Web Server registered with the IDE, but you must first specify the local folder that contains the local installation of the Oracle iPlanet Web Server. You only need to specify the location of the local installation once.</p>
    6.20 +<p><b>To register an instance of a Oracle iPlanet Web Server:</b></p>
    6.21  <ol>
    6.22  <li>Choose Tools &gt; Server Manager, and in the Server Manager, click Add Server.
    6.23  <ul class="note">
    6.24 @@ -22,14 +22,14 @@
    6.25  The Add Server Instance wizard starts.</li>
    6.26  <li>In the Choose Server page, do the following:
    6.27  <ol type="a">
    6.28 -<li>From the Server drop-down list, select Sun Java System Web Server 7.0.</li>
    6.29 +<li>From the Server drop-down list, select Oracle iPlanet Web Server 7.0.</li>
    6.30  <li>In the Name field, type a name for the server instance. <br>
    6.31  This name is used to identify the server in the IDE.</li>
    6.32  <li>Click Next.<br>
    6.33  The Server Location and Configuration page opens.</li>
    6.34  </ol>
    6.35  </li>
    6.36 -<li>In the Installation Directory field, use the Browse button to navigate to and select the Sun Java System Web Server 7.0 installation directory.</li>
    6.37 +<li>In the Installation Directory field, use the Browse button to navigate to and select the Oracle iPlanet Web Server 7.0 installation directory.</li>
    6.38  <li>If you are registering a remote server, select the Remote Server checkbox and in the Admin Host field, type the host name for the server.</li>
    6.39  <li>In the Admin Port field, type the port number for the server.</li>
    6.40  <li>If the port is not an SSL (Secure Sockets Layer) port, clear the SSL Port checkbox.</li>
    6.41 @@ -40,9 +40,9 @@
    6.42  </ol>
    6.43  <dl>
    6.44  <dt><a name="seealso">See Also</a></dt>
    6.45 -<dd><a href="wsplugin_hierarchyofserverinstancenodes.html" title="Hierarchy of Sun Java System Web Server Instance Nodes">Hierarchy of Sun Java System Web Server Instance Nodes</a></dd>
    6.46 -<dd><a href="wsplugin_configfiles.html" title="Configuration Files for Web Applications Targeted for Sun Java System Web Server">Configuration Files for Web Applications Targeted for Sun Java System Web Server</a></dd>
    6.47 -<dd><a href="wsplugin_res_register.html" title="Registering a Resource with the Sun Java System Web Server">Registering a Resource with the Sun Java System Web Server</a></dd>
    6.48 +<dd><a href="wsplugin_hierarchyofserverinstancenodes.html" title="Hierarchy of Oracle iPlanet Web Server Instance Nodes">Hierarchy of Oracle iPlanet Web Server Instance Nodes</a></dd>
    6.49 +<dd><a href="wsplugin_configfiles.html" title="Configuration Files for Web Applications Targeted for Oracle iPlanet Web Server">Configuration Files for Web Applications Targeted for Oracle iPlanet Web Server</a></dd>
    6.50 +<dd><a href="wsplugin_res_register.html" title="Registering a Resource with the Oracle iPlanet Web Server">Registering a Resource with the Oracle iPlanet Web Server</a></dd>
    6.51  <dd><a href="nbdocs:/org/netbeans/modules/j2ee/platform/docs/server/csh_server_manager.html" title="Server Manager Dialog Box">Server Manager Dialog Box</a></dd>
    6.52  <!-- Update with link to 7.0 admin guide when available
    6.53  <dd><object classid="java:org.netbeans.modules.javahelp.BrowserDisplayer">
     7.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_custom.html	Fri Aug 06 11:54:16 2010 -0400
     7.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_custom.html	Wed Aug 18 11:59:57 2010 +0530
     7.3 @@ -5,14 +5,14 @@
     7.4  -->
     7.5  <html>
     7.6  <head>
     7.7 -<title>Setting Up a Custom Resource on the Sun Java System Web Server</title>
     7.8 +<title>Setting Up a Custom Resource on the Oracle iPlanet Web Server</title>
     7.9  <link rel="StyleSheet" href="/org/netbeans/modules/usersguide/ide.css" type="text/css">
    7.10  </head>
    7.11  <body>
    7.12 -<h2>Setting Up a Custom Resource on the Sun Java System Web Server</h2>
    7.13 +<h2>Setting Up a Custom Resource on the Oracle iPlanet Web Server</h2>
    7.14  <p><b>To create a custom resource:</b></p>
    7.15  <ol>
    7.16 -<li>Ensure the Sun Java System Web Server is running.</li>
    7.17 +<li>Ensure the Oracle iPlanet Web Server is running.</li>
    7.18  <li>In the Projects window, select your project's root node to make it the active node and choose File &gt; New File (Ctrl-N).</li>
    7.19  <li>In the Categories list, select Sun Web Server 7.0 Resources, in the File Types list, select Custom Resource, then click Next.</li>
    7.20  <li>In the General Attributes page, do the following:
    7.21 @@ -29,7 +29,7 @@
    7.22  </ol></li>
    7.23  <li>In the Additional Properties page, enter any properties for the resource.</li>
    7.24  <li>Click Finish.</li>
    7.25 -<li><a href="wsplugin_res_register.html" title="Registering a Resource with the Sun Java System Web Server">Register the resource with the Sun Java System Web Server</a>.</li>
    7.26 +<li><a href="wsplugin_res_register.html" title="Registering a Resource with the Oracle iPlanet Web Server">Register the resource with the Oracle iPlanet Web Server</a>.</li>
    7.27  </ol>
    7.28  <hr>
    7.29  <small>Copyright &copy; 2006 Sun Microsystems, Inc. All rights reserved.<br>
     8.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_extjndi.html	Fri Aug 06 11:54:16 2010 -0400
     8.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_extjndi.html	Wed Aug 18 11:59:57 2010 +0530
     8.3 @@ -5,14 +5,14 @@
     8.4  -->
     8.5  <html>
     8.6  <head>
     8.7 -<title>Setting Up an External JNDI Resource on the Sun Java System Web Server</title>
     8.8 +<title>Setting Up an External JNDI Resource on the Oracle iPlanet Web Server</title>
     8.9  <link rel="StyleSheet" href="/org/netbeans/modules/usersguide/ide.css" type="text/css">
    8.10  </head>
    8.11  <body>
    8.12 -<h2>Setting Up an External JNDI Resource on the Sun Java System Web Server</h2>
    8.13 +<h2>Setting Up an External JNDI Resource on the Oracle iPlanet Web Server</h2>
    8.14  <p><b>To create a custom resource:</b></p>
    8.15  <ol>
    8.16 -<li>Ensure the Sun Java System Web Server is running.</li>
    8.17 +<li>Ensure the Oracle iPlanet Web Server is running.</li>
    8.18  <li>In the Projects window, select your project's root node to make it the active node and choose File &gt; New File (Ctrl-N).</li>
    8.19  <li>In the Categories list, select Sun Web Server 7.0 Resources, in the File Types list, select External JNDI Resource, then click Next.</li>
    8.20  <li>In the General Attributes page, do the following:
    8.21 @@ -30,7 +30,7 @@
    8.22  </ol></li>
    8.23  <li>In the Additional Properties page, enter any properties for the resource.</li>
    8.24  <li>Click Finish.</li>
    8.25 -<li><a href="wsplugin_res_register.html" title="Registering a Resource with the Sun Java System Web Server">Register the resource with the Sun Java System Web Server</a>.</li>
    8.26 +<li><a href="wsplugin_res_register.html" title="Registering a Resource with the Oracle iPlanet Web Server">Register the resource with the Oracle iPlanet Web Server</a>.</li>
    8.27  </ol>
    8.28  <hr>
    8.29  <small>Copyright &copy; 2006 Sun Microsystems, Inc. All rights reserved.<br>
     9.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_javamail.html	Fri Aug 06 11:54:16 2010 -0400
     9.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_javamail.html	Wed Aug 18 11:59:57 2010 +0530
     9.3 @@ -5,17 +5,17 @@
     9.4  -->
     9.5  <html>
     9.6  <head>
     9.7 -<title>Setting Up a JavaMail Resource on the Sun Java System Web Server</title>
     9.8 +<title>Setting Up a JavaMail Resource on the Oracle iPlanet Web Server</title>
     9.9  <link rel="StyleSheet" href="/org/netbeans/modules/usersguide/ide.css" type="text/css">
    9.10  </head>
    9.11  <body>
    9.12 -<h2>Setting Up a JavaMail Resource on the Sun Java System Web Server</h2>
    9.13 +<h2>Setting Up a JavaMail Resource on the Oracle iPlanet Web Server</h2>
    9.14  <p><small><a href="#seealso">See Also</a></small></p>
    9.15  <p>The JavaMail API is a set of abstract APIs that model a mail system. The API provides a platform-independent and protocol-independent framework to build mail and messaging applications. The JavaMail API provides facilities for reading and sending email. Service providers implement particular protocols.</p>
    9.16  <p>The JavaMail API is implemented as a Java platform optional package and is also available as part of the J2EE platform.</p>
    9.17  <p><b>To create a JavaMail resource:</b></p>
    9.18  <ol>
    9.19 -<li>Ensure the Sun Java System Web Server is running.</li>
    9.20 +<li>Ensure the Oracle iPlanet Web Server is running.</li>
    9.21  <li>In the Projects window, select your project's root node to make it the active node and choose File &gt; New File (Ctrl-N).</li>
    9.22  <li>In the Categories list, select Sun Web Server 7.0 Resources, and in the File Types list, select JavaMail Resource, then click Next.</li>
    9.23  <li>In the General Attributes page, in the General area, do the following:
    9.24 @@ -30,9 +30,9 @@
    9.25  <li>Enable or disable the resource by choosing true or false.</li>
    9.26  <li>Enter a description.</li>
    9.27  </ol></li>
    9.28 -<li>In the Advanced area, change the field values only if the Sun Java System Web Server's mail provider has been reconfigured to use a nondefault store or transport protocol. </li>
    9.29 +<li>In the Advanced area, change the field values only if the Oracle iPlanet Web Server's mail provider has been reconfigured to use a nondefault store or transport protocol. </li>
    9.30  <li>Click Finish.</li>
    9.31 -<li><a href="wsplugin_res_register.html" title="Registering a Resource with the Sun Java System Web Server">Register the resource with the Sun Java System Web Server</a>.</li>
    9.32 +<li><a href="wsplugin_res_register.html" title="Registering a Resource with the Oracle iPlanet Web Server">Register the resource with the Oracle iPlanet Web Server</a>.</li>
    9.33  </ol>
    9.34  <dl>
    9.35  <dt><a name="seealso">See Also</a></dt>
    10.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_jdbc.html	Fri Aug 06 11:54:16 2010 -0400
    10.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_jdbc.html	Wed Aug 18 11:59:57 2010 +0530
    10.3 @@ -5,16 +5,16 @@
    10.4  -->
    10.5  <html>
    10.6  <head>
    10.7 -<title>Setting Up a JDBC Resource on the Sun Java System Web Server</title>
    10.8 +<title>Setting Up a JDBC Resource on the Oracle iPlanet Web Server</title>
    10.9  <link rel="StyleSheet" href="/org/netbeans/modules/usersguide/ide.css" type="text/css">
   10.10  </head>
   10.11  <body>
   10.12 -<h2>Setting Up a JDBC Resource on the Sun Java System Web Server</h2>
   10.13 +<h2>Setting Up a JDBC Resource on the Oracle iPlanet Web Server</h2>
   10.14  <p><small><a href="#seealso">See Also</a></small></p>
   10.15  <p>A JDBC resource (data source) provides applications with a means of connecting to a database. Typically, there is at least one JDBC resource for each database accessed by an application deployed in a domain. It is possible to have more than one JDBC resource for a database.</p>
   10.16  <p><b>To create a JDBC resource:</b></p>
   10.17  <ol>
   10.18 -<li>Ensure the Sun Java System Web Server is running.</li>
   10.19 +<li>Ensure the Oracle iPlanet Web Server is running.</li>
   10.20  <li>In the Projects window, select your project's root node to make it the active node and choose File &gt; New File (Ctrl-N).</li>
   10.21  <li>In the Categories list, select Sun Web Server 7.0 Resources, in the File Types list, select JDBC Resource, then click Next.</li>
   10.22  <li>In the General Attributes page, in the General area, do the following:
   10.23 @@ -33,7 +33,7 @@
   10.24  <li>Click Next.</li>
   10.25  <li>In the Additional Properties page, enter any properties for the resource.</li>
   10.26  <li>Click Finish.</li>
   10.27 -<li><a href="wsplugin_res_register.html" title="Registering a Resource with the Sun Java System Web Server">Register the resource with the Sun Java System Web Server</a>.</li>
   10.28 +<li><a href="wsplugin_res_register.html" title="Registering a Resource with the Oracle iPlanet Web Server">Register the resource with the Oracle iPlanet Web Server</a>.</li>
   10.29  </ol>
   10.30  <dl>
   10.31  <dt><a name="seealso">See Also</a></dt>
    11.1 --- a/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_register.html	Fri Aug 06 11:54:16 2010 -0400
    11.2 +++ b/j2ee.sun.ws7/javahelp/org/netbeans/modules/j2ee/sun/ws7/docs/wsplugin_res_register.html	Wed Aug 18 11:59:57 2010 +0530
    11.3 @@ -5,11 +5,11 @@
    11.4  -->
    11.5  <html>
    11.6  <head>
    11.7 -<title>Registering a Resource with the Sun Java System Web Server</title>
    11.8 +<title>Registering a Resource with the Oracle iPlanet Web Server</title>
    11.9  <link rel="StyleSheet" href="/org/netbeans/modules/usersguide/ide.css" type="text/css">
   11.10  </head>
   11.11  <body>
   11.12 -<h2>Registering a Resource with the Sun Java System Web Server</h2>
   11.13 +<h2>Registering a Resource with the Oracle iPlanet Web Server</h2>
   11.14  <p><small><a href="#seealso">See Also</a></small></p>
   11.15  <ul class="note">
   11.16  <li>Before you can register a resource with the server, you must set up the resource object.</li>
   11.17 @@ -38,11 +38,11 @@
   11.18  </ul>
   11.19  <dl>
   11.20  <dt><a name="seealso">See Also</a></dt>
   11.21 -<dd><a href="wsplugin_res_custom.html" title="Setting Up a Custom Resource on the Sun Java System Web Server">Setting Up a Custom Resource on the Sun Java System Web Server</a></dd>
   11.22 -<dd><a href="wsplugin_res_extjndi.html" title="Setting Up an External JNDI Resource on the Sun Java System Web Server">Setting Up an External JNDI Resource on the Sun Java System Web Server</a></dd>
   11.23 -<dd><a href="wsplugin_res_javamail.html" title="Setting Up a JavaMail Resource on the Sun Java System Web Server">Setting Up a JavaMail Resource on the Sun Java System Web Server</a></dd>
   11.24 -<dd><a href="wsplugin_res_jdbc.html" title="Setting Up a JDBC Resource on the Sun Java System Web Server">Setting Up a JDBC Resource on the Sun Java System Web Server</a></dd>
   11.25 -<dd><a href="wsplugin_registering_server.html" title="Registering a Sun Java System Web Server">Registering a Sun Java System Web Server</a></dd>
   11.26 +<dd><a href="wsplugin_res_custom.html" title="Setting Up a Custom Resource on the Oracle iPlanet Web Server">Setting Up a Custom Resource on the Oracle iPlanet Web Server</a></dd>
   11.27 +<dd><a href="wsplugin_res_extjndi.html" title="Setting Up an External JNDI Resource on the Oracle iPlanet Web Server">Setting Up an External JNDI Resource on the Oracle iPlanet Web Server</a></dd>
   11.28 +<dd><a href="wsplugin_res_javamail.html" title="Setting Up a JavaMail Resource on the Oracle iPlanet Web Server">Setting Up a JavaMail Resource on the Oracle iPlanet Web Server</a></dd>
   11.29 +<dd><a href="wsplugin_res_jdbc.html" title="Setting Up a JDBC Resource on the Oracle iPlanet Web Server">Setting Up a JDBC Resource on the Oracle iPlanet Web Server</a></dd>
   11.30 +<dd><a href="wsplugin_registering_server.html" title="Registering a Oracle iPlanet Web Server">Registering a Oracle iPlanet Web Server</a></dd>
   11.31  </dl>
   11.32  <hr>
   11.33  <small>Copyright &copy; 2006 Sun Microsystems, Inc. All rights reserved.<br>
    12.1 --- a/j2ee.sun.ws7/manifest.mf	Fri Aug 06 11:54:16 2010 -0400
    12.2 +++ b/j2ee.sun.ws7/manifest.mf	Wed Aug 18 11:59:57 2010 +0530
    12.3 @@ -1,5 +1,5 @@
    12.4  Manifest-Version: 1.0
    12.5 -OpenIDE-Module-Implementation-Version: 2
    12.6 +OpenIDE-Module-Implementation-Version: 3
    12.7  OpenIDE-Module: org.netbeans.modules.j2ee.sun.ws7/1
    12.8  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/sun/ws7/resources/Bundle.properties
    12.9  OpenIDE-Module-Layer: org/netbeans/modules/j2ee/sun/ws7/j2ee/layer.xml
    13.1 --- a/j2ee.sun.ws7/nbproject/project.properties	Fri Aug 06 11:54:16 2010 -0400
    13.2 +++ b/j2ee.sun.ws7/nbproject/project.properties	Wed Aug 18 11:59:57 2010 +0530
    13.3 @@ -38,5 +38,5 @@
    13.4  # made subject to such option by the copyright holder.
    13.5  
    13.6  javac.source=1.5
    13.7 -nbm.module.author=Sun Microsystems, Inc.
    13.8 +nbm.module.author=Oracle Corporation
    13.9  spec.version.base=1.6.0
    14.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/dm/Bundle.properties	Fri Aug 06 11:54:16 2010 -0400
    14.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/dm/Bundle.properties	Wed Aug 18 11:59:57 2010 +0530
    14.3 @@ -42,14 +42,13 @@
    14.4  #
    14.5  # WS70SunDeploymentManager
    14.6  #
    14.7 -Invalid_MODULE=Only WAR modules are supported for Sun Java System Web Server 7.0
    14.8 +Invalid_MODULE=Only WAR modules are supported for Oracle iPlanet Web Server 7.0
    14.9  Invalid_CONFIG_VERSION=unsupported config version
   14.10  ERR_GETTARGETS=Error in getting targets from getTargets, returning the first target {0}
   14.11  ERR_NULL_SWA=Error during deployment, SunWebApp is null
   14.12  MSG_CONTEXTROOT=Deploying Web Application, the Context Root is {0}
   14.13 -UNSUPPORTED_REDPLOY=Redeploy not supported on Sun Java System Web Server 7.0
   14.14 +UNSUPPORTED_REDPLOY=Redeploy not supported on Oracle iPlanet Web Server 7.0
   14.15  #
   14.16  # WS70SunDeploymentFactory
   14.17  #
   14.18 -LBL_WS70SunDeploymentFactory=Sun Java System Web Server 7.0
   14.19 -LBL_WS70SunDeploymentFactoryVersion=Sun Java System Web Server 7.0 Plugin v1
   14.20 \ No newline at end of file
   14.21 +LBL_WS70SunDeploymentFactory=Oracle iPlanet Web Server 7.0
    15.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/j2ee/Bundle.properties	Fri Aug 06 11:54:16 2010 -0400
    15.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/j2ee/Bundle.properties	Wed Aug 18 11:59:57 2010 +0530
    15.3 @@ -42,7 +42,7 @@
    15.4  #
    15.5  # WS70J2eePlatformFactory
    15.6  #
    15.7 -LBL_WS70J2eePlatformDisplayName=Sun Java System Web Server 7.0
    15.8 +LBL_WS70J2eePlatformDisplayName=Oracle iPlanet Web Server 7.0
    15.9  
   15.10  #
   15.11  # WS70StartServer
    16.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/nodes/Bundle.properties	Fri Aug 06 11:54:16 2010 -0400
    16.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/nodes/Bundle.properties	Wed Aug 18 11:59:57 2010 +0530
    16.3 @@ -39,7 +39,7 @@
    16.4  # made subject to such option by the copyright holder.
    16.5  #
    16.6  
    16.7 -LBL_WS70_MANAGER_NODE_NAME=Sun Java System Web Server 7.0
    16.8 +LBL_WS70_MANAGER_NODE_NAME=Oracle iPlanet Web Server 7.0
    16.9  #
   16.10  # WS70WebModulesRootNode
   16.11  #
    17.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/resources/Bundle.properties	Fri Aug 06 11:54:16 2010 -0400
    17.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/resources/Bundle.properties	Wed Aug 18 11:59:57 2010 +0530
    17.3 @@ -45,9 +45,9 @@
    17.4  #
    17.5  OpenIDE-Module-Display-Category=Java Web and EE
    17.6  
    17.7 -OpenIDE-Module-Name=Sun Java System Web Server 7.0
    17.8 +OpenIDE-Module-Name=Oracle iPlanet Web Server 7.0
    17.9  
   17.10 -OpenIDE-Module-Short-Description=JSR88 Sun Java System Web Server 7.0 Module
   17.11 -OpenIDE-Module-Long-Description=This module allows development and execution of web applications with the Sun Java System Web Server 7.0
   17.12 +OpenIDE-Module-Short-Description=JSR88 Oracle iPlanet Web Server 7.0 Module
   17.13 +OpenIDE-Module-Long-Description=This module allows development and execution of web applications with the Oracle iPlanet Web Server 7.0
   17.14  
   17.15  
    18.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/actions/Bundle.properties	Fri Aug 06 11:54:16 2010 -0400
    18.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/actions/Bundle.properties	Wed Aug 18 11:59:57 2010 +0530
    18.3 @@ -43,7 +43,7 @@
    18.4  LBL_RegisterAction=Register
    18.5  Reg_persistence-manager-factory-resource = Persistence Manager Factory Resource Registration
    18.6  Reg_mail-resource = Mail Session Resource Registration
    18.7 -Msg_invalid_server=Default Server is not set to Sun Java System WebServer 70. Cannot register resource. \n Please set default server to Sun Java System WebServer 70.
    18.8 +Msg_invalid_server=Default Server is not set to Oracle iPlanet Web Server 7.0. Cannot register resource. \n Please set default server to Oracle iPlanet Web Server 7.0.
    18.9  Title_invalid_server=Default Server Not Valid
   18.10  Err_InvalidXML= Resource file {0}.sun-ws7-resource is not a valid xml.\nPlease validate and fix errors.
   18.11  
    19.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/beans/Bundle.properties	Fri Aug 06 11:54:16 2010 -0400
    19.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/beans/Bundle.properties	Wed Aug 18 11:59:57 2010 +0530
    19.3 @@ -123,7 +123,7 @@
    19.4  
    19.5  #Err_NoTarget=Targeted Server Instance not found
    19.6  Msg_RegFailure=Failed while registering resource : {0}
    19.7 -Msg_invalid_server=Default Server is not set to Sun Java System Application Server. Cannot register resource. \n Please set default server to Sun Java System Application Server.
    19.8 +Msg_invalid_server=Default Server is not set to Oracle GlassFish Server. Cannot register resource. \n Please set default server to Oracle GlassFish Server.
    19.9  Title_invalid_server=Default Server Not Valid
   19.10  
   19.11  
   19.12 @@ -140,7 +140,7 @@
   19.13  
   19.14  ##WS70ResourceUtils
   19.15  LBL_UniqueResourceName=Supplied Resource file name {0} is not unique. Using : {1} instead.
   19.16 -LBL_UnSupportedDriver=Driver for database vendor {0} is not supported for Sun Java System WebServer70
   19.17 +LBL_UnSupportedDriver=Driver for database vendor {0} is not supported for Oracle iPlanet Web Server 7.0
   19.18  MSG_Registering_Resource=Registering new {0} resource
   19.19  MSG_Updating_Resource=Resource {0} is already regsitered, updating it.
   19.20  MSG_DeployConfig=Deploying config 
   19.21 @@ -149,4 +149,4 @@
   19.22  ERR_UNKNOWN_RESOURCE=Unknown type of resource
   19.23  
   19.24  ##Registering Resource
   19.25 -Err_ResourceUpdate=Unable to update deployed resource : {0}
   19.26 \ No newline at end of file
   19.27 +Err_ResourceUpdate=Unable to update deployed resource : {0}
    20.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/CustomWizardInfo.html	Fri Aug 06 11:54:16 2010 -0400
    20.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/CustomWizardInfo.html	Wed Aug 18 11:59:57 2010 +0530
    20.3 @@ -45,6 +45,6 @@
    20.4      <TITLE>Custom Resource</TITLE>
    20.5    </HEAD>
    20.6    <BODY>
    20.7 -  Wizard to create a new Custom Resource for Sun Java System Web Server 7.0.
    20.8 +  Wizard to create a new Custom Resource for Oracle iPlanet Web Server 7.0.
    20.9    </BODY>
   20.10  </HTML>
    21.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/ExternalJNDIWizardInfo.html	Fri Aug 06 11:54:16 2010 -0400
    21.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/ExternalJNDIWizardInfo.html	Wed Aug 18 11:59:57 2010 +0530
    21.3 @@ -44,6 +44,6 @@
    21.4      <TITLE>External JNDI Resource</TITLE>
    21.5    </HEAD>
    21.6    <BODY>
    21.7 -  Wizard to create a new External JNDI Resource for Sun Java System Web Server 7.0.
    21.8 +  Wizard to create a new External JNDI Resource for Oracle iPlanet Web Server 7.0.
    21.9    </BODY>
   21.10  </HTML>
    22.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/JDBCWizardInfo.html	Fri Aug 06 11:54:16 2010 -0400
    22.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/JDBCWizardInfo.html	Wed Aug 18 11:59:57 2010 +0530
    22.3 @@ -45,6 +45,6 @@
    22.4      <TITLE>JDBC Resource</TITLE>
    22.5    </HEAD>
    22.6    <BODY>
    22.7 -  Wizard to create a new JDBC Resource for Sun Java System Web Server 7.0.
    22.8 +  Wizard to create a new JDBC Resource for Oracle iPlanet Web Server 7.0.
    22.9    </BODY>
   22.10  </HTML>
    23.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/MailWizardInfo.html	Fri Aug 06 11:54:16 2010 -0400
    23.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/serverresources/wizards/MailWizardInfo.html	Wed Aug 18 11:59:57 2010 +0530
    23.3 @@ -45,6 +45,6 @@
    23.4      <TITLE>JavaMail Resource</TITLE>
    23.5    </HEAD>
    23.6    <BODY>
    23.7 -  Wizard to create a new JavaMail Resource for Sun Java System Web Server 7.0.
    23.8 +  Wizard to create a new JavaMail Resource for Oracle iPlanet Web Server 7.0.
    23.9    </BODY>
   23.10  </HTML>
    24.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/ui/Bundle.properties	Fri Aug 06 11:54:16 2010 -0400
    24.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/ui/Bundle.properties	Wed Aug 18 11:59:57 2010 +0530
    24.3 @@ -44,7 +44,7 @@
    24.4  #
    24.5  
    24.6  LBL_AddServerWizardTitle=Server Location and Configuration
    24.7 -LBL_AddServerVisualPanelTitle=<html>Specify the location of the Sun Java System Web Server installation.<br>This information is also required if your deployment target is a remote server.
    24.8 +LBL_AddServerVisualPanelTitle=<html>Specify the location of the Oracle iPlanet Web Server installation.<br>This information is also required if your deployment target is a remote server.
    24.9  LBL_AddServerVisualPanel_Directory=Installation Directory\:
   24.10  LBL_AddServerVisualPanel_Browse=Browse...
   24.11  LBL_RegisterLocalServer=Local Server
   24.12 @@ -60,7 +60,7 @@
   24.13  LBL_AddServerVisualPanelSSLPort=SSL port
   24.14  Tooltip_AddServerVisualPanelSSLPort=Check this box if the Admin server port is configured as an SSL port
   24.15  
   24.16 -A11Y_NAME_AddServerVisualPanelTitle=Specify the location of the Sun Java System Web Server installation.This information is also required if your deployment target is a remote server.
   24.17 +A11Y_NAME_AddServerVisualPanelTitle=Specify the location of the Oracle iPlanet Web Server installation.This information is also required if your deployment target is a remote server.
   24.18  A11Y_NAME_AddServerVisualPanel_Directory=Installation Directory\:
   24.19  A11Y_NAME_AddServerVisualPanel_Browse=Browse...
   24.20  
   24.21 @@ -75,7 +75,7 @@
   24.22  A11Y_NAME_AddServerVisualPanelPort=Admin Port\:
   24.23  A11Y_NAME_AddServerVisualPanelSSLPort=SSL port
   24.24  
   24.25 -A11Y_DESC_AddServerVisualPanelTitle=Specify the location of the Sun Java System Web Server installation.This information is also required if your deployment target is a remote server.
   24.26 +A11Y_DESC_AddServerVisualPanelTitle=Specify the location of the Oracle iPlanet Web Server installation.This information is also required if your deployment target is a remote server.
   24.27  A11Y_DESC_AddServerVisualPanel_Directory=Installation Directory\:
   24.28  A11Y_DESC_AddServerVisualPanel_Browse=Browse...
   24.29  
   24.30 @@ -100,10 +100,10 @@
   24.31  A11Y_Password_Mnem=P
   24.32  
   24.33  
   24.34 -MSG_INVALID_SERVER_DIRECTORY=Please choose a Valid Sun Java System Web Server 7.0 installation.
   24.35 +MSG_INVALID_SERVER_DIRECTORY=Please choose a Valid Oracle iPlanet Web Server 7.0 installation.
   24.36  MSG_ENTER_HOSTNAME=Please enter Administration Host Name
   24.37  MSG_ENTER_VALID_PORT=Please enter valid Administration Port Number
   24.38 -MSG_ENTER_USERNAME=Please enter User Name for the Sun Java System Web Server 7.0 Administrator
   24.39 +MSG_ENTER_USERNAME=Please enter User Name for the Oracle iPlanet Web Server 7.0 Administrator
   24.40  
   24.41  MSG_Server_Instance_Added=Server instance "{0}" was added successfully.
   24.42  
   24.43 @@ -130,7 +130,7 @@
   24.44  AD_Sources=Sources
   24.45  AD_Javadoc=Javadocs
   24.46  
   24.47 -ACS_Customizer=Sun Java System Web Server 7.0 Properties
   24.48 +ACS_Customizer=Oracle iPlanet Web Server 7.0 Properties
   24.49  
   24.50  #
   24.51  # WS70ConnectionTabVisualPanel
    25.1 --- a/j2ee.sun.ws7/test/qa-functional/data/nb.properties	Fri Aug 06 11:54:16 2010 -0400
    25.2 +++ b/j2ee.sun.ws7/test/qa-functional/data/nb.properties	Wed Aug 18 11:59:57 2010 +0530
    25.3 @@ -6,6 +6,5 @@
    25.4  admin.port=8800
    25.5  bogus.admin.port=65536
    25.6  bogus.admin.user=bogus
    25.7 -sjs.string=Sun Java System Web Server 7.0
    25.8 +sjs.string=Oracle iPlanet Web Server 7.0
    25.9  result.dir=c:/
   25.10 -log.file=c:\\log1.file
   25.11 \ No newline at end of file
    26.1 --- a/j2ee.sun.ws7/test/qa-functional/src/org/netbeans/modules/j2ee/sun/ws7/ServerPluginTests.java	Fri Aug 06 11:54:16 2010 -0400
    26.2 +++ b/j2ee.sun.ws7/test/qa-functional/src/org/netbeans/modules/j2ee/sun/ws7/ServerPluginTests.java	Wed Aug 18 11:59:57 2010 +0530
    26.3 @@ -198,7 +198,7 @@
    26.4  
    26.5          JDialogOperator jdo = new JDialogOperator("Add Server Instance");
    26.6          JListOperator jco = new JListOperator(jdo, 1);
    26.7 -        jco.selectItem("Sun Java System Web Server 7.0");
    26.8 +        jco.selectItem("Oracle iPlanet Web Server 7.0");
    26.9          logger.info("Choose " + pb.getSjsString());
   26.10          JTextFieldOperator jto = new JTextFieldOperator(jdo,pb.getSjsString());
   26.11  
   26.12 @@ -660,16 +660,16 @@
   26.13          Thread.sleep(sleepTimeMedium);
   26.14          errLabel = new JLabelOperator(jdo,10);
   26.15  
   26.16 -        if((errLabel.getText().equals("Please choose a Valid Sun Java System Web Server 7.0 installation."))) {
   26.17 +        if((errLabel.getText().equals("Please choose a Valid Oracle iPlanet Web Server 7.0 installation."))) {
   26.18              isFail = false;
   26.19 -            String msg = "Expected message was \"Please choose a Valid Sun Java System Web Server 7.0 installation.\" Actual was \"" + errLabel.getText()+ "\"";
   26.20 +            String msg = "Expected message was \"Please choose a Valid Oracle iPlanet Web Server 7.0 installation.\" Actual was \"" + errLabel.getText()+ "\"";
   26.21              logger.info(msg);
   26.22 -            assertEquals(msg, "Please choose a Valid Sun Java System Web Server 7.0 installation.",errLabel.getText());
   26.23 +            assertEquals(msg, "Please choose a Valid Oracle iPlanet Web Server 7.0 installation.",errLabel.getText());
   26.24          } else {
   26.25              isFail = true;
   26.26 -            String msg = "Expected message was \"Please choose a Valid Sun Java System Web Server 7.0 installation.\" Actual was \"" + errLabel.getText()+ "\"";
   26.27 +            String msg = "Expected message was \"Please choose a Valid Oracle iPlanet Web Server 7.0 installation.\" Actual was \"" + errLabel.getText()+ "\"";
   26.28              logger.severe(msg);
   26.29 -            assertEquals(msg, "Please choose a Valid Sun Java System Web Server 7.0 installation.",errLabel.getText());
   26.30 +            assertEquals(msg, "Please choose a Valid Oracle iPlanet Web Server 7.0 installation.",errLabel.getText());
   26.31  
   26.32          }
   26.33          isRemoveServer = false;
   26.34 @@ -753,16 +753,16 @@
   26.35          Thread.sleep(sleepTimeMedium);
   26.36          errLabel = new JLabelOperator(jdo,10);
   26.37  
   26.38 -        if((errLabel.getText().equals("Please choose a Valid Sun Java System Web Server 7.0 installation."))) {
   26.39 +        if((errLabel.getText().equals("Please choose a Valid Oracle iPlanet Web Server 7.0 installation."))) {
   26.40              isFail = false;
   26.41 -            String msg = "Expected message was \"Please choose a Valid Sun Java System Web Server 7.0 installation.\" Actual was \"" + errLabel.getText()+ "\"";
   26.42 +            String msg = "Expected message was \"Please choose a Valid Oracle iPlanet Web Server 7.0 installation.\" Actual was \"" + errLabel.getText()+ "\"";
   26.43              logger.info(msg);
   26.44 -            assertEquals(msg, "Please choose a Valid Sun Java System Web Server 7.0 installation.",errLabel.getText());
   26.45 +            assertEquals(msg, "Please choose a Valid Oracle iPlanet Web Server 7.0 installation.",errLabel.getText());
   26.46          } else {
   26.47              isFail = true;
   26.48 -            String msg = "Expected message was \"Please choose a Valid Sun Java System Web Server 7.0 installation.\" Actual was \"" + errLabel.getText()+ "\"";
   26.49 +            String msg = "Expected message was \"Please choose a Valid Oracle iPlanet Web Server 7.0 installation.\" Actual was \"" + errLabel.getText()+ "\"";
   26.50              logger.severe(msg);
   26.51 -            assertEquals(msg, "Please choose a Valid Sun Java System Web Server 7.0 installation.",errLabel.getText());
   26.52 +            assertEquals(msg, "Please choose a Valid Oracle iPlanet Web Server 7.0 installation.",errLabel.getText());
   26.53          }
   26.54          isRemoveServer = false;
   26.55  
    27.1 --- a/j2ee.sun.ws7/test/qa-functional/src/org/netbeans/modules/j2ee/sun/ws7/util/PropBean.java	Fri Aug 06 11:54:16 2010 -0400
    27.2 +++ b/j2ee.sun.ws7/test/qa-functional/src/org/netbeans/modules/j2ee/sun/ws7/util/PropBean.java	Wed Aug 18 11:59:57 2010 +0530
    27.3 @@ -40,7 +40,7 @@
    27.4          setAdminSSLPort(properties.getProperty("admin.ssl.port","28989"));
    27.5          setAdminPort(properties.getProperty("admin.port","28800"));
    27.6          setBogusAdminPort(properties.getProperty("bogus.admin.port","65536"));
    27.7 -        setSjsString(properties.getProperty("sjs.string","Sun Java System Web Server 7.0"));
    27.8 +        setSjsString(properties.getProperty("sjs.string","Oracle iPlanet Web Server 7.0"));
    27.9          setLocalHost(properties.getProperty("local.host","localhost"));
   27.10          setRemoteHost(properties.getProperty("remote.host","saint"));
   27.11          setBogusAdminUser(properties.getProperty("bogus.admin.user","bogus"));
   27.12 @@ -67,7 +67,7 @@
   27.13  //admin.port="28800"
   27.14  //bogus.admin.port="65536"
   27.15  //bogus.admin.user="bogus"
   27.16 -//sjs.string="Sun Java System Web Server 7.0"
   27.17 +//sjs.string="Oracle iPlanet Web Server 7.0"
   27.18  //result.dir="c:/"
   27.19  //log.file="c:\log.file"
   27.20