Author: ritchiem
Date: Wed Dec 17 03:34:33 2008
New Revision: 727346
URL: http://svn.apache.org/viewvc?rev=727346&view=rev
Log:
QPID-1471 : Simplist patch to correct argument type mismatch. An improved
solution can be addressed later
Added:
qpid/trunk/qpid/java/management/eclipse-plugin/workspace/
qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/
qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.log
qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.plugins/
qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.plugins/org.eclipse.ui.workbench/
qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java?rev=727346&r1=727345&r2=727346&view=diff
==============================================================================
---
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
(original)
+++
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
Wed Dec 17 03:34:33 2008
@@ -606,25 +606,19 @@
}
// customized for passwords
- String securityMechanism = "";
- ServerRegistry serverReg =
ApplicationRegistry.getServerRegistry(_mbean);
-
- if (serverReg instanceof JMXServerRegistry)
- {
- JMXServerRegistry jmxServerReg = (JMXServerRegistry)
ApplicationRegistry.getServerRegistry(_mbean);
- securityMechanism =
jmxServerReg.getSecurityMechanism();
- }
-
- if ((MECH_CRAMMD5.equals(securityMechanism)) &&
PASSWORD.equalsIgnoreCase(param.getName()))
+ if (PASSWORD.equalsIgnoreCase(param.getName()))
{
- try
- {
-
param.setValue(ViewUtility.getMD5HashedCharArray(param.getValue()));
- }
- catch (Exception ex)
+ if (param.getType().equals("[C"))
{
- MBeanUtility.handleException(_mbean, ex);
- return;
+ try
+ {
+
param.setValue(ViewUtility.getHash((String)param.getValue()));
+ }
+ catch (Exception ex)
+ {
+ MBeanUtility.handleException(_mbean, ex);
+ return;
+ }
}
}
// end of customization
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java?rev=727346&r1=727345&r2=727346&view=diff
==============================================================================
---
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
(original)
+++
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
Wed Dec 17 03:34:33 2008
@@ -536,29 +536,7 @@
{
oldControls[i].dispose();
}
- }
-
- public static char[] getMD5HashedCharArray(Object text) throws
NoSuchAlgorithmException, UnsupportedEncodingException
- {
- byte[] data = ((String)text).getBytes("utf-8");
-
- MessageDigest md = MessageDigest.getInstance("MD5");
-
- for (byte b : data)
- {
- md.update(b);
- }
-
- byte[] digest = md.digest();
-
- char[] byteArray = new char[digest.length];
- int index = 0;
- for (byte b : digest)
- {
- byteArray[index++] = (char)b;
- }
- return byteArray;
- }
+ }
public static char[] getHash(String text) throws NoSuchAlgorithmException,
UnsupportedEncodingException
{
Added: qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.log
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.log?rev=727346&view=auto
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.log
(added)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.log Wed
Dec 17 03:34:33 2008
@@ -0,0 +1,28 @@
+!SESSION Wed Dec 17 10:39:13 GMT 2008
------------------------------------------
+!ENTRY org.eclipse.core.launcher 4 0 2008-12-17 10:39:13.784
+!MESSAGE -showsplash
+!STACK
+java.lang.NullPointerException
+ at java.lang.ProcessBuilder.start(ProcessBuilder.java:441)
+ at java.lang.Runtime.exec(Runtime.java:593)
+ at java.lang.Runtime.exec(Runtime.java:466)
+ at org.eclipse.core.launcher.Main.runCommand(Main.java:1569)
+ at org.eclipse.core.launcher.Main.handleSplash(Main.java:1545)
+ at org.eclipse.core.launcher.Main.basicRun(Main.java:278)
+ at org.eclipse.core.launcher.Main.run(Main.java:977)
+ at org.eclipse.core.launcher.Main.main(Main.java:952)
+
+!SESSION Wed Dec 17 10:53:51 GMT 2008
------------------------------------------
+!ENTRY org.eclipse.core.launcher 4 0 2008-12-17 10:53:51.375
+!MESSAGE -showsplash
+!STACK
+java.lang.NullPointerException
+ at java.lang.ProcessBuilder.start(ProcessBuilder.java:441)
+ at java.lang.Runtime.exec(Runtime.java:593)
+ at java.lang.Runtime.exec(Runtime.java:466)
+ at org.eclipse.core.launcher.Main.runCommand(Main.java:1569)
+ at org.eclipse.core.launcher.Main.handleSplash(Main.java:1545)
+ at org.eclipse.core.launcher.Main.basicRun(Main.java:278)
+ at org.eclipse.core.launcher.Main.run(Main.java:977)
+ at org.eclipse.core.launcher.Main.main(Main.java:952)
+
Added:
qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml?rev=727346&view=auto
==============================================================================
---
qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
(added)
+++
qpid/trunk/qpid/java/management/eclipse-plugin/workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
Wed Dec 17 03:34:33 2008
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+</section>
