1.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/dm/Bundle.properties Sun Mar 05 06:20:14 2006 +0000
1.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/dm/Bundle.properties Sun Mar 05 10:06:28 2006 +0000
1.3 @@ -14,14 +14,14 @@
1.4 #
1.5 # WS70SunDeploymentManager
1.6 #
1.7 -Invalid_MODULE=Only WAR modules are supported for Sun Java System WebServer70
1.8 +Invalid_MODULE=Only WAR modules are supported for Sun Java System Web Server 7.0
1.9 Invalid_CONFIG_VERSION=unsupported config version
1.10 ERR_GETTARGETS=Error in getting targets from getTargets, returning the first target {0}
1.11 ERR_NULL_SWA=Error during deployment, SunWebApp is null
1.12 MSG_CONTEXTROOT=Deploying Web Application, the Context Root is {0}
1.13 -UNSUPPORTED_REDPLOY=Redeploy not supported on Sun Java System WebServer70
1.14 +UNSUPPORTED_REDPLOY=Redeploy not supported on Sun Java System Web Server 7.0
1.15 #
1.16 # WS70SunDeploymentFactory
1.17 #
1.18 -LBL_WS70SunDeploymentFactory=Sun Java System WebServer 7.0
1.19 -LBL_WS70SunDeploymentFactoryVersion=Sun Java System WebServer Plugin v1
1.20 \ No newline at end of file
1.21 +LBL_WS70SunDeploymentFactory=Sun Java System Web Server 7.0
1.22 +LBL_WS70SunDeploymentFactoryVersion=Sun Java System Web Server 7.0 Plugin v1
1.23 \ No newline at end of file
2.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/j2ee/Bundle.properties Sun Mar 05 06:20:14 2006 +0000
2.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/j2ee/Bundle.properties Sun Mar 05 10:06:28 2006 +0000
2.3 @@ -14,13 +14,13 @@
2.4 #
2.5 # WS70J2eePlatformFactory
2.6 #
2.7 -LBL_WS70J2eePlatformDisplayName=Sun Java System WebServer 7
2.8 +LBL_WS70J2eePlatformDisplayName=Sun Java System Web Server 7.0
2.9
2.10 #
2.11 # WS70StartServer
2.12 #
2.13 -MSG_STARTING_ADMIN_SERVER=Starting Admin Server of WebServer 70
2.14 -MSG_STOPPING_ADMIN_SERVER=Stopping Admin Server of WebServer 70
2.15 -MSG_ADMIN_SERVER_STARTED=Admin Server of WebServer 70 Started
2.16 -MSG_ADMIN_SERVER_STOPPED=Admin Server of WebServer 70 Stopped
2.17 +MSG_STARTING_ADMIN_SERVER=Starting Admin Server of Web Server 7.0
2.18 +MSG_STOPPING_ADMIN_SERVER=Stopping Admin Server of Web Server 7.0
2.19 +MSG_ADMIN_SERVER_STARTED=Admin Server of Web Server 7.0 Started
2.20 +MSG_ADMIN_SERVER_STOPPED=Admin Server of Web Server 7.0 Stopped
2.21
3.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/nodes/Bundle.properties Sun Mar 05 06:20:14 2006 +0000
3.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/nodes/Bundle.properties Sun Mar 05 10:06:28 2006 +0000
3.3 @@ -11,7 +11,7 @@
3.4 # Microsystems, Inc. All Rights Reserved.
3.5 #
3.6
3.7 -LBL_WS70_MANAGER_NODE_NAME=Sun Java System WebServer7.0
3.8 +LBL_WS70_MANAGER_NODE_NAME=Sun Java System Web Server 7.0
3.9 #
3.10 # WS70WebModulesRootNode
3.11 #
4.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/resources/Bundle.properties Sun Mar 05 06:20:14 2006 +0000
4.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/resources/Bundle.properties Sun Mar 05 10:06:28 2006 +0000
4.3 @@ -17,9 +17,9 @@
4.4 #
4.5 OpenIDE-Module-Display-Category=J2EE
4.6
4.7 -OpenIDE-Module-Name=Sun Java System WebServer 7.0
4.8 +OpenIDE-Module-Name=Sun Java System Web Server 7.0
4.9
4.10 -OpenIDE-Module-Short-Description=JSR88 Sun Java System WebServer 7.0 Module
4.11 -OpenIDE-Module-Long-Description=This module allows development and execution of web applications with the Sun Java System WebServer 7.0
4.12 +OpenIDE-Module-Short-Description=JSR88 Sun Java System Web Server 7.0 Module
4.13 +OpenIDE-Module-Long-Description=This module allows development and execution of web applications with the Sun Java System Web Server 7.0
4.14
4.15
5.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/ui/Bundle.properties Sun Mar 05 06:20:14 2006 +0000
5.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/ui/Bundle.properties Sun Mar 05 10:06:28 2006 +0000
5.3 @@ -15,13 +15,14 @@
5.4 # WS70AddServerChoiceVisualPanel
5.5 #
5.6
5.7 -LBL_AddServerVisualPanelTitle=<html>Specify the Location of Sun Java System WebServer70 Installation.<br>This is needed even if the Deployment Target is remote server
5.8 -LBL_AddServerVisualPanel_Directory=Instalation Directory
5.9 -LBL_AddServerVisualPanel_Browse=Browse
5.10 -LBL_RegisterLocalServer=Register a Local Webserver
5.11 -LBL_RegisterRemoteServer=Register a Remote Webserver
5.12 +LBL_AddServerWizardTitle=Server Location and Configuration
5.13 +LBL_AddServerVisualPanelTitle=<html>Specify the Location of Sun Java System Web Server Installation.<br>This information is also required if your deployment target is a remote server.
5.14 +LBL_AddServerVisualPanel_Directory=Installation Directory\:
5.15 +LBL_AddServerVisualPanel_Browse=Browse...
5.16 +LBL_RegisterLocalServer=Register a Local Web Server
5.17 +LBL_RegisterRemoteServer=Register a Remote Web Server
5.18
5.19 -LBL_AddServerVisualPanelAdmin=Please give the Details of the Administration server of your Deployment Target
5.20 +LBL_AddServerVisualPanelAdmin=Server Configuration
5.21
5.22 LBL_AddServerVisualPanelUserName=Username\:
5.23 LBL_AddServerVisualPanelPassword=Password\:
5.24 @@ -29,28 +30,28 @@
5.25 LBL_AddServerVisualPanelPort=Admin Port\:
5.26
5.27
5.28 -A11Y_NAME_AddServerVisualPanelTitle=Specify the Location of Sun Java System WebServer70 Installation.This is needed even if the Deployment Target is remote server
5.29 -A11Y_NAME_AddServerVisualPanel_Directory=Instalation Directory
5.30 -A11Y_NAME_AddServerVisualPanel_Browse=Browse
5.31 +A11Y_NAME_AddServerVisualPanelTitle=Specify the Location of Sun Java System Web Server Installation.This information is also required if your deployment target is a remote server.
5.32 +A11Y_NAME_AddServerVisualPanel_Directory=Installation Directory\:
5.33 +A11Y_NAME_AddServerVisualPanel_Browse=Browse...
5.34
5.35 -A11Y_NAME_RegisterLocalServer=Register a Local Webserver
5.36 -A11Y_NAME_RegisterRemoteServer=Register a Remote Webserver
5.37 +A11Y_NAME_RegisterLocalServer=Register a Local Web Server
5.38 +A11Y_NAME_RegisterRemoteServer=Register a Remote Web Server
5.39
5.40 -A11Y_NAME_AddServerVisualPanelAdmin=Please give the Details of the Administration server of your Deployment Target
5.41 +A11Y_NAME_AddServerVisualPanelAdmin=Server Configuration
5.42
5.43 A11Y_NAME_AddServerVisualPanelUserName=Username\:
5.44 A11Y_NAME_AddServerVisualPanelPassword=Password\:
5.45 A11Y_NAME_AddServerVisualPanelHost=Admin Host\:
5.46 A11Y_NAME_AddServerVisualPanelPort=Admin Port\:
5.47
5.48 -A11Y_DESC_AddServerVisualPanelTitle=Specify the Location of Sun Java System WebServer70 Installation.This is needed even if the Deployment Target is remote server
5.49 -A11Y_DESC_AddServerVisualPanel_Directory=Instalation Directory
5.50 -A11Y_DESC_AddServerVisualPanel_Browse=Browse
5.51 +A11Y_DESC_AddServerVisualPanelTitle=Specify the Location of Sun Java System Web Server Installation.This information is also required if your deployment target is a remote server.
5.52 +A11Y_DESC_AddServerVisualPanel_Directory=Installation Directory\:
5.53 +A11Y_DESC_AddServerVisualPanel_Browse=Browse...
5.54
5.55 -A11Y_DESC_RegisterLocalServer=Register a Local Webserver
5.56 -A11Y_DESC_RegisterRemoteServer=Register a Remote Webserver
5.57 +A11Y_DESC_RegisterLocalServer=Register a Local Web Server
5.58 +A11Y_DESC_RegisterRemoteServer=Register a Remote Web Server
5.59
5.60 -A11Y_DESC_AddServerVisualPanelAdmin=Please give the Details of the Administration server of your Deployment Target
5.61 +A11Y_DESC_AddServerVisualPanelAdmin=Server Configuration
5.62
5.63 A11Y_DESC_AddServerVisualPanelUserName=Username\:
5.64 A11Y_DESC_AddServerVisualPanelPassword=Password\:
5.65 @@ -67,10 +68,10 @@
5.66 A11Y_Password_Mnem=P
5.67
5.68
5.69 -MSG_INVALID_SERVER_DIRECTORY=Please choose a Valid Sun Java System WebServer 7 installation.
5.70 +MSG_INVALID_SERVER_DIRECTORY=Please choose a Valid Sun Java System Web Server 7.0 installation.
5.71 MSG_ENTER_HOSTNAME=Please enter Administration Host Name
5.72 MSG_ENTER_VALID_PORT=Please enter valid Administration Port Number
5.73 -MSG_ENTER_USERNAME=Please enter User Name for the Sun Java System WebServer 7 Administrator
5.74 +MSG_ENTER_USERNAME=Please enter User Name for the Sun Java System Web Server 7.0 Administrator
5.75
5.76 MSG_Server_Instance_Added=Server instance "{0}" was added successfully.
5.77
6.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/ui/WS70AddServerChoiceVisualPanel.java Sun Mar 05 06:20:14 2006 +0000
6.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/ui/WS70AddServerChoiceVisualPanel.java Sun Mar 05 10:06:28 2006 +0000
6.3 @@ -173,7 +173,9 @@
6.4 listeners.add(l);
6.5 }
6.6 }
6.7 -
6.8 + public String getName(){
6.9 + return NbBundle.getMessage(WS70AddServerChoiceVisualPanel.class, "LBL_AddServerWizardTitle");
6.10 + }
6.11 public void removeChangeListener(ChangeListener l) {
6.12 synchronized (listeners) {
6.13 listeners.remove(l);
7.1 --- a/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/ui/WS70ServerUIWizardIterator.java Sun Mar 05 06:20:14 2006 +0000
7.2 +++ b/j2ee.sun.ws7/src/org/netbeans/modules/j2ee/sun/ws7/ui/WS70ServerUIWizardIterator.java Sun Mar 05 10:06:28 2006 +0000
7.3 @@ -26,6 +26,8 @@
7.4 import java.util.Properties;
7.5 import java.util.Set;
7.6 import javax.swing.event.ChangeListener;
7.7 +import javax.swing.JComponent;
7.8 +import java.awt.Component;
7.9 import java.util.NoSuchElementException;
7.10 import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
7.11
7.12 @@ -84,6 +86,23 @@
7.13 if(panel==null){
7.14 panel = new WS70AddServerChoicePanel();
7.15 }
7.16 + Component c = panel.getComponent();
7.17 + String[] steps = new String[1];
7.18 + steps[0]=c.getName();
7.19 + if (c instanceof JComponent) { // assume Swing components
7.20 + JComponent jc = (JComponent) c;
7.21 + // Sets steps names for a panel
7.22 + jc.putClientProperty("WizardPanel_contentData", steps); //NOI18N
7.23 + // Turn on subtitle creation on each step
7.24 + jc.putClientProperty("WizardPanel_autoWizardStyle", //NOI18N
7.25 + Boolean.TRUE);
7.26 + // Show steps on the left side with the image on the background
7.27 + jc.putClientProperty("WizardPanel_contentDisplayed", //NOI18N
7.28 + Boolean.TRUE);
7.29 + // Turn on numbering of all steps
7.30 + jc.putClientProperty("WizardPanel_contentNumbered", //NOI18N
7.31 + Boolean.TRUE);
7.32 + }
7.33 return panel;
7.34 }
7.35