diff options
12 files changed, 129 insertions, 4 deletions
diff --git a/doc/Gluster_GMC_1.0_User_Guide.docx b/doc/Gluster_GMC_1.0_User_Guide.docx Binary files differnew file mode 100644 index 00000000..2cb4e87d --- /dev/null +++ b/doc/Gluster_GMC_1.0_User_Guide.docx diff --git a/doc/Gluster_Management_Console_Release_Notes_1.0.0.pdf b/doc/Gluster_Management_Console_Release_Notes_1.0.0.pdf Binary files differnew file mode 100644 index 00000000..7da05d3c --- /dev/null +++ b/doc/Gluster_Management_Console_Release_Notes_1.0.0.pdf diff --git a/doc/Gluster_Management_Console_User_Guide_1.0.0.pdf b/doc/Gluster_Management_Console_User_Guide_1.0.0.pdf Binary files differnew file mode 100644 index 00000000..223509de --- /dev/null +++ b/doc/Gluster_Management_Console_User_Guide_1.0.0.pdf diff --git a/doc/Gluster_Management_Gateway_API_Guide_1.0.0.docx b/doc/Gluster_Management_Gateway_API_Guide_1.0.0.docx Binary files differnew file mode 100644 index 00000000..7c996d0b --- /dev/null +++ b/doc/Gluster_Management_Gateway_API_Guide_1.0.0.docx diff --git a/doc/Gluster_Management_Gateway_API_Guide_1.0.0.pdf b/doc/Gluster_Management_Gateway_API_Guide_1.0.0.pdf Binary files differnew file mode 100644 index 00000000..ee8a7422 --- /dev/null +++ b/doc/Gluster_Management_Gateway_API_Guide_1.0.0.pdf diff --git a/doc/Gluster_Management_Gateway_Release_Notes_1.0.0.docx b/doc/Gluster_Management_Gateway_Release_Notes_1.0.0.docx Binary files differnew file mode 100644 index 00000000..a2ee8420 --- /dev/null +++ b/doc/Gluster_Management_Gateway_Release_Notes_1.0.0.docx diff --git a/doc/files_help_proj.txt b/doc/files_help_proj.txt new file mode 100644 index 00000000..56fa8f5f --- /dev/null +++ b/doc/files_help_proj.txt @@ -0,0 +1,54 @@ +Concepts:
+about_gmc.html
+about_gmg.html
+commom_terms.html
+gluster_fs.html
+
+
+Getting Started:
+access_gmc_jws.html
+alerts.html
+check_req_client.html
+check_req_gmg.html
+cifs_service.html
+explore_gmc.html
+gmc_terminal_window.html
+gmc_toolbar.html
+install_gmg.html
+mamage_bricks.html
+manage_cluster.html
+manage_logs.html
+manage_servers.html
+manage_volumes.html
+monitor_resources.html
+resetting_pwd.html
+security_keys.html
+setting_alerts_prefs.html
+setting_charts_prefs.html
+setting_gluster_perfs.html
+setting_preferences.html
+setting_terminal_prefs.html
+tasks.html
+
+tasks:
+add_brick.html
+add_servers.html
+create_cluster.html
+create_volume.html
+delete_volume.html
+display_log.html
+download_log.html
+initialize_disk.html
+migrate_brick.html
+rebalance_vol.html
+register_cluster.html
+remove_brick.html
+remove_server.hmtl
+select_cluster.html
+start_vol.html
+starting_gmc.html
+stop_vol.html
+tune_vol_opt.html
+
+help_home.html
+toc.html
\ No newline at end of file diff --git a/src/com.gluster.storage.management.client/.project b/src/com.gluster.storage.management.client/.project index 647c8a91..61a0ec41 100644 --- a/src/com.gluster.storage.management.client/.project +++ b/src/com.gluster.storage.management.client/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> </natures> </projectDescription> diff --git a/src/com.gluster.storage.management.console/.project b/src/com.gluster.storage.management.console/.project index 8a79d266..179cac7b 100644 --- a/src/com.gluster.storage.management.console/.project +++ b/src/com.gluster.storage.management.console/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> </natures> </projectDescription> diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ConsoleConstants.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ConsoleConstants.java index 47293228..6c7449f2 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ConsoleConstants.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ConsoleConstants.java @@ -24,4 +24,6 @@ package com.gluster.storage.management.console; public class ConsoleConstants { public static final String CONSOLE_TITLE = "Gluster Management Console"; public static final String TERMINAL_VIEW_ID = "org.eclipse.tm.terminal.view.TerminalView"; + public static final String PROPERTY_AUTO_LOGIN_PASSWORD = "auto.login.password"; + public static final String PROPERTY_AUTO_CLUSTER_NAME = "auto.cluster.name"; } diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java index ac510f5e..cbbcbd46 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java @@ -30,6 +30,8 @@ import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.ShellAdapter; +import org.eclipse.swt.events.ShellEvent; import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; import org.eclipse.swt.layout.GridData; @@ -43,6 +45,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import com.gluster.storage.management.console.Activator; +import com.gluster.storage.management.console.ConsoleConstants; import com.gluster.storage.management.console.preferences.PreferenceConstants; import com.gluster.storage.management.console.utils.GUIHelper; @@ -50,6 +53,10 @@ import com.gluster.storage.management.console.utils.GUIHelper; * Cluster selection dialog, which prompts for the cluster name to be managed */ public class ClusterSelectionDialog extends Dialog { + private static final String MESSAGE_SELECT_CLUSTER = "Select the Cluster you want to manage in this session."; + private static final String MESSAGE_CREATE_CLUSTER = "Create an empty Cluster and start adding servers to it."; + private static final String MESSAGE_REGISTER_CLUSTER = "Register an existing Cluster with the Management Gateway and start managing it using the Management Console."; + protected enum CLUSTER_MODE { SELECT, CREATE, REGISTER }; private Combo clusterNameCombo = null; @@ -162,8 +169,31 @@ public class ClusterSelectionDialog extends Dialog { createRadioButtons(); createSubComposites(); + setupAutoSelectionIfRequired(); + return composite; } + + private void setupAutoSelectionIfRequired() { + if (clusters.size() == 0) { + return; + } + + final String clusterName = System.getProperty(ConsoleConstants.PROPERTY_AUTO_CLUSTER_NAME, null); + if (clusterName == null) { + return; + } + + getShell().addShellListener(new ShellAdapter() { + @Override + public void shellActivated(ShellEvent e) { + super.shellActivated(e); + clusterNameCombo.setText(clusterName); + okPressed(); + } + }); + } + private void createSubComposites() { Composite subComposite = new Composite(composite, SWT.NONE); @@ -250,15 +280,15 @@ public class ClusterSelectionDialog extends Dialog { clusterSelectionComposite = new Composite(subComposite, SWT.NONE); GridLayout layout = new GridLayout(2, false); clusterSelectionComposite.setLayout(layout); + createClusterNameLabel(clusterSelectionComposite); createClusterNameCombo(clusterSelectionComposite); - - createPreferenceCheckboxes(clusterSelectionComposite); + createPreferenceCheckbox(clusterSelectionComposite); stackLayout.topControl = clusterSelectionComposite; } - private void createPreferenceCheckboxes(Composite composite) { + private void createPreferenceCheckbox(Composite composite) { GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, false); layoutData.verticalIndent = 5; layoutData.horizontalSpan = 2; @@ -277,15 +307,18 @@ public class ClusterSelectionDialog extends Dialog { if (clusters.size() > 0) { selectButton = new Button(composite, SWT.RADIO); selectButton.setText("&Select"); + selectButton.setToolTipText(MESSAGE_SELECT_CLUSTER); } } { createButton = new Button(composite, SWT.RADIO); createButton.setText("&Create"); + createButton.setToolTipText(MESSAGE_CREATE_CLUSTER); } { registerButton = new Button(composite, SWT.RADIO); registerButton.setText("&Register"); + registerButton.setToolTipText(MESSAGE_REGISTER_CLUSTER); } } diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java index 4622dc84..6120f5e3 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java @@ -34,6 +34,8 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ShellAdapter; +import org.eclipse.swt.events.ShellEvent; import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; import org.eclipse.swt.layout.GridData; @@ -49,9 +51,10 @@ import org.eclipse.swt.widgets.Text; import com.gluster.storage.management.client.ClustersClient; import com.gluster.storage.management.client.UsersClient; import com.gluster.storage.management.console.Activator; +import com.gluster.storage.management.console.ConsoleConstants; import com.gluster.storage.management.console.GlusterDataModelManager; import com.gluster.storage.management.console.IImageKeys; -import static com.gluster.storage.management.console.dialogs.ClusterSelectionDialog.CLUSTER_MODE; +import com.gluster.storage.management.console.dialogs.ClusterSelectionDialog.CLUSTER_MODE; import com.gluster.storage.management.console.preferences.PreferenceConstants; import com.gluster.storage.management.console.utils.GUIHelper; import com.gluster.storage.management.console.validators.StringRequiredValidator; @@ -171,6 +174,7 @@ public class LoginDialog extends Dialog { createPasswordLabel(composite); createPasswordText(composite); + setupAutoLoginIfRequired(); return composite; } @@ -203,6 +207,26 @@ public class LoginDialog extends Dialog { setupDataBinding(); } + private void setupAutoLoginIfRequired() { + final String password = System.getProperty(ConsoleConstants.PROPERTY_AUTO_LOGIN_PASSWORD, null); + if (password == null) { + return; + } + getShell().addShellListener(new ShellAdapter() { + @Override + public void shellActivated(ShellEvent e) { + super.shellActivated(e); + + if (passwordText.getText().isEmpty()) { + // Check whether the password has been passed as system parameter. This can be used for avoiding + // human intervention on login dialog while running SWTBot automated tests. + passwordText.setText(password); + okPressed(); + } + } + }); + } + /** * Sets up data binding between the text fields and the connection details object. Also attaches a "string required" * validator to the "password" text field. This validator is configured to do the following on validation failure<br> |