summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShireesh Anjal <shireesh@gluster.com>2011-08-03 18:54:19 +0530
committerShireesh Anjal <shireesh@gluster.com>2011-08-03 18:59:15 +0530
commit04c07646fa7d429eaca68c3b5166952fd92abf12 (patch)
tree1064c3dbef652684412ce8dbccc2f2beba43b54e /src
parent9ae3f45cf689e60d7494543509531fd1349bfbfd (diff)
Fixed Bug 3173 - Wrong password does not report problem properly.
Diffstat (limited to 'src')
-rw-r--r--src/com.gluster.storage.management.gateway/WebContent/index.html6
-rw-r--r--src/com.gluster.storage.management.gui.feature.webstart/rootfiles/gluster-management-console.jnlp7
-rw-r--r--src/com.gluster.storage.management.gui.feature.webstart/rootfiles/index.html8
-rw-r--r--src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartViewerComposite.java6
4 files changed, 8 insertions, 19 deletions
diff --git a/src/com.gluster.storage.management.gateway/WebContent/index.html b/src/com.gluster.storage.management.gateway/WebContent/index.html
index 620c949b..85b03dbf 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/index.html
+++ b/src/com.gluster.storage.management.gateway/WebContent/index.html
@@ -103,9 +103,9 @@
Could not identify your CPU architecture. Please click on the appropriate link below to invoke Gluster Management Console!
</DIV>
<DIV ID="always_on" style="display: none">
- Linux - <a href="linux.gtk.x86/gluster-management-console.jnlp">32 bit</a> <a href="linux.gtk.x86_64/gluster-management-console.jnlp">64 bit</a><br>
- Mac OS X - <a href="macosx.cocoa.x86/gluster-management-console.jnlp">32 bit</a> <a href="macosx.cocoa.x86_64/gluster-management-console.jnlp">64 bit</a><br>
- Windows - <a href="win32.win32.x86/gluster-management-console.jnlp">32 bit</a> <a href="win32.win32.x86_64/gluster-management-console.jnlp">64 bit</a><br>
+ Linux - <a href="linux.gtk.x86/gluster-management-console.jnlp">32 bit</a>&nbsp;&nbsp;<a href="linux.gtk.x86_64/gluster-management-console.jnlp">64 bit</a><br>
+ Mac OS X - <a href="macosx.cocoa.x86/gluster-management-console.jnlp">32 bit</a>&nbsp;&nbsp;<a href="macosx.cocoa.x86_64/gluster-management-console.jnlp">64 bit</a><br>
+ Windows - <a href="win32.win32.x86/gluster-management-console.jnlp">32 bit</a>&nbsp;&nbsp;<a href="win32.win32.x86_64/gluster-management-console.jnlp">64 bit</a><br>
</DIV>
</body>
diff --git a/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/gluster-management-console.jnlp b/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/gluster-management-console.jnlp
index 597adf4c..afe3bd2e 100644
--- a/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/gluster-management-console.jnlp
+++ b/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/gluster-management-console.jnlp
@@ -33,11 +33,12 @@
<property
name="gluster.server.url"
value="$$codebase"/>
+ <property
+ name="javaws.cfg.jauthenticator"
+ value="true"/>
</resources>
<resources os="Linux">
<property name="osgi.ws" value="gtk"/>
</resources>
- <application-desc main-class="org.eclipse.equinox.launcher.WebStartMain">
- <argument>-nosplash</argument>
- </application-desc>
+ <application-desc main-class="org.eclipse.equinox.launcher.WebStartMain" />
</jnlp> \ No newline at end of file
diff --git a/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/index.html b/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/index.html
deleted file mode 100644
index 70f47279..00000000
--- a/src/com.gluster.storage.management.gui.feature.webstart/rootfiles/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>Gluster Storage Platform</title>
-</head>
-<body>
-<a href="http://192.168.1.123:8080/glustersp-webstart/linux.gtk.x86_64/gluster-management-console.jnlp">Gluster Storage Platform</a>
-</body>
-</html>
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartViewerComposite.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartViewerComposite.java
index e4d00f75..d89923f2 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartViewerComposite.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/ChartViewerComposite.java
@@ -252,7 +252,7 @@ public final class ChartViewerComposite extends Composite implements PaintListen
yAxisPrimary.getMajorGrid().setTickStyle(TickStyle.LEFT_LITERAL);
yAxisPrimary.getMajorGrid().setLineAttributes(LineAttributesImpl.create(ColorDefinitionImpl.GREY(), LineStyle.SOLID_LITERAL, 1));
yAxisPrimary.getLabel().setVisible(true);
- yAxisPrimary.getLabel().getCaption().setFont(createChartFont());
+ yAxisPrimary.getLabel().getCaption().getFont().setSize(8);
yAxisPrimary.setFormatSpecifier(new NumberFormatSpecifierImpl() {
@Override
public String getSuffix() {
@@ -283,10 +283,6 @@ public final class ChartViewerComposite extends Composite implements PaintListen
return xAxisPrimary;
}
- public static FontDefinition createChartFont() {
- return FontDefinitionImpl.create("Serif", 8, false, false, false, false, false, 0d, TextAlignmentImpl.create());
- }
-
/**
* @param categories
* Categories of the pie chart