You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2007/04/19 18:24:45 UTC

svn commit: r530474 [6/8] - in /incubator/qpid/trunk/qpid: ./ java/broker/bin/ java/broker/distribution/src/main/assembly/ java/broker/etc/ java/broker/lib/ java/broker/src/main/java/org/apache/qpid/server/ java/broker/src/main/java/org/apache/qpid/ser...

Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java Thu Apr 19 09:24:30 2007
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -24,10 +24,13 @@
 import java.util.concurrent.ConcurrentMap;
 
 import org.apache.log4j.Logger;
+
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.common.IoFilterAdapter;
 import org.apache.mina.common.IoSession;
 
+import org.apache.qpid.pool.Event.CloseEvent;
+
 public class PoolingFilter extends IoFilterAdapter implements Job.JobCompletionHandler
 {
     private static final Logger _logger = Logger.getLogger(PoolingFilter.class);
@@ -47,12 +50,12 @@
     void fireAsynchEvent(IoSession session, Event event)
     {
         Job job = getJobForSession(session);
- //       job.acquire(); //prevents this job being removed from _jobs
+        // job.acquire(); //prevents this job being removed from _jobs
         job.add(event);
 
-        //Additional checks on pool to check that it hasn't shutdown.
+        // Additional checks on pool to check that it hasn't shutdown.
         // The alternative is to catch the RejectedExecutionException that will result from executing on a shutdown pool
-        if (job.activate() && _poolReference.getPool() != null && !_poolReference.getPool().isShutdown())
+        if (job.activate() && (_poolReference.getPool() != null) && !_poolReference.getPool().isShutdown())
         {
             _poolReference.getPool().execute(job);
         }
@@ -68,16 +71,6 @@
     private Job getJobForSession(IoSession session)
     {
         return (Job) session.getAttribute(_name);
-
-/*        if(job == null)
-        {
-            System.err.println("Error in " + _name);
-            Thread.dumpStack();
-        }
-
-
-        job = _jobs.get(session);
-        return job == null ? createJobForSession(session) : job;*/
     }
 
     private Job createJobForSession(IoSession session)
@@ -87,35 +80,36 @@
 
     private Job addJobForSession(IoSession session, Job job)
     {
-        //atomic so ensures all threads agree on the same job
+        // atomic so ensures all threads agree on the same job
         Job existing = _jobs.putIfAbsent(session, job);
-        return existing == null ? job : existing;
+
+        return (existing == null) ? job : existing;
     }
 
-    //Job.JobCompletionHandler
+    // Job.JobCompletionHandler
     public void completed(IoSession session, Job job)
     {
-//        if (job.isComplete())
-//        {
-//            job.release();
-//            if (!job.isReferenced())
-//            {
-//                _jobs.remove(session);
-//            }
-//        }
-//        else
-        if(!job.isComplete())
+        // if (job.isComplete())
+        // {
+        // job.release();
+        // if (!job.isReferenced())
+        // {
+        // _jobs.remove(session);
+        // }
+        // }
+        // else
+        if (!job.isComplete())
         {
             // ritchiem : 2006-12-13 Do we need to perform the additional checks here?
-            //                       Can the pool be shutdown at this point?
-            if (job.activate() && _poolReference.getPool() != null && !_poolReference.getPool().isShutdown())
+            // Can the pool be shutdown at this point?
+            if (job.activate() && (_poolReference.getPool() != null) && !_poolReference.getPool().isShutdown())
             {
                 _poolReference.getPool().execute(job);
             }
         }
     }
 
-    //IoFilter methods that are processed by threads on the pool
+    // IoFilter methods that are processed by threads on the pool
 
     public void sessionOpened(final NextFilter nextFilter, final IoSession session) throws Exception
     {
@@ -127,37 +121,33 @@
         nextFilter.sessionClosed(session);
     }
 
-    public void sessionIdle(final NextFilter nextFilter, final IoSession session,
-                            final IdleStatus status) throws Exception
+    public void sessionIdle(final NextFilter nextFilter, final IoSession session, final IdleStatus status) throws Exception
     {
         nextFilter.sessionIdle(session, status);
     }
 
-    public void exceptionCaught(final NextFilter nextFilter, final IoSession session,
-                                final Throwable cause) throws Exception
+    public void exceptionCaught(final NextFilter nextFilter, final IoSession session, final Throwable cause) throws Exception
     {
-            nextFilter.exceptionCaught(session,cause);
+        nextFilter.exceptionCaught(session, cause);
     }
 
-    public void messageReceived(final NextFilter nextFilter, final IoSession session,
-                                final Object message) throws Exception
+    public void messageReceived(final NextFilter nextFilter, final IoSession session, final Object message) throws Exception
     {
-        nextFilter.messageReceived(session,message);
+        nextFilter.messageReceived(session, message);
     }
 
-    public void messageSent(final NextFilter nextFilter, final IoSession session,
-                            final Object message) throws Exception
+    public void messageSent(final NextFilter nextFilter, final IoSession session, final Object message) throws Exception
     {
         nextFilter.messageSent(session, message);
     }
 
-    public void filterWrite(final NextFilter nextFilter, final IoSession session,
-                            final WriteRequest writeRequest) throws Exception
+    public void filterWrite(final NextFilter nextFilter, final IoSession session, final WriteRequest writeRequest)
+        throws Exception
     {
         nextFilter.filterWrite(session, writeRequest);
     }
 
-    //IoFilter methods that are processed on current thread (NOT on pooled thread)
+    // IoFilter methods that are processed on current thread (NOT on pooled thread)
 
     public void filterClose(NextFilter nextFilter, IoSession session) throws Exception
     {
@@ -199,13 +189,17 @@
             super(refCountingPool, name);
         }
 
-        public void messageReceived(final NextFilter nextFilter, final IoSession session,
-                                final Object message) throws Exception
+        public void messageReceived(final NextFilter nextFilter, final IoSession session, final Object message)
+            throws Exception
         {
 
             fireAsynchEvent(session, new Event.ReceivedEvent(nextFilter, message));
         }
 
+        public void sessionClosed(final NextFilter nextFilter, final IoSession session) throws Exception
+        {
+            fireAsynchEvent(session, new CloseEvent(nextFilter));
+        }
 
     }
 
@@ -217,26 +211,27 @@
             super(refCountingPool, name);
         }
 
-
-        public void filterWrite(final NextFilter nextFilter, final IoSession session,
-                                final WriteRequest writeRequest) throws Exception
+        public void filterWrite(final NextFilter nextFilter, final IoSession session, final WriteRequest writeRequest)
+            throws Exception
         {
             fireAsynchEvent(session, new Event.WriteEvent(nextFilter, writeRequest));
         }
 
+        public void sessionClosed(final NextFilter nextFilter, final IoSession session) throws Exception
+        {
+            fireAsynchEvent(session, new CloseEvent(nextFilter));
+        }
+
     }
 
-    public static PoolingFilter createAynschReadPoolingFilter(ReferenceCountingExecutorService refCountingPool,String name)
+    public static PoolingFilter createAynschReadPoolingFilter(ReferenceCountingExecutorService refCountingPool, String name)
     {
-        return new AsynchReadPoolingFilter(refCountingPool,name);
+        return new AsynchReadPoolingFilter(refCountingPool, name);
     }
 
-
-    public static PoolingFilter createAynschWritePoolingFilter(ReferenceCountingExecutorService refCountingPool,String name)
+    public static PoolingFilter createAynschWritePoolingFilter(ReferenceCountingExecutorService refCountingPool, String name)
     {
-        return new AsynchWritePoolingFilter(refCountingPool,name);
+        return new AsynchWritePoolingFilter(refCountingPool, name);
     }
 
 }
-
-

Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java Thu Apr 19 09:24:30 2007
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -24,9 +24,10 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 
+import org.apache.log4j.Logger;
+
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.log4j.Logger;
 
 public class AMQBindingURL implements BindingURL
 {
@@ -39,10 +40,9 @@
     AMQShortString _queueName;
     private HashMap<String, String> _options;
 
-
     public AMQBindingURL(String url) throws URLSyntaxException
     {
-        //format:
+        // format:
         // <exch_class>://<exch_name>/[<destination>]/[<queue>]?<option>='<value>'[,<option>='<value>']*
         _logger.debug("Parsing URL: " + url);
         _url = url;
@@ -61,10 +61,10 @@
 
             if (exchangeClass == null)
             {
-                _url = ExchangeDefaults.DIRECT_EXCHANGE_CLASS + "://" +
-                        "" + "//" + _url;
-                //URLHelper.parseError(-1, "Exchange Class not specified.", _url);
+                _url = ExchangeDefaults.DIRECT_EXCHANGE_CLASS + "://" + "" + "//" + _url;
+                // URLHelper.parseError(-1, "Exchange Class not specified.", _url);
                 parseBindingURL();
+
                 return;
             }
             else
@@ -76,7 +76,7 @@
 
             if (exchangeName == null)
             {
-                if(getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))
+                if (getExchangeClass().equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))
                 {
                     setExchangeName("");
                 }
@@ -92,11 +92,10 @@
 
             String queueName;
 
-            if (connection.getPath() == null ||
-                    connection.getPath().equals(""))
+            if ((connection.getPath() == null) || connection.getPath().equals(""))
             {
                 throw URLHelper.parseError(_url.indexOf(_exchangeName.toString()) + _exchangeName.length(),
-                        "Destination or Queue requried", _url);
+                    "Destination or Queue requried", _url);
             }
             else
             {
@@ -104,7 +103,7 @@
                 if (slash == -1)
                 {
                     throw URLHelper.parseError(_url.indexOf(_exchangeName.toString()) + _exchangeName.length(),
-                            "Destination requried", _url);
+                        "Destination requried", _url);
                 }
                 else
                 {
@@ -127,9 +126,8 @@
 
             setQueueName(queueName);
 
-            //Fragment is #string (not used)
-            //System.out.println(connection.getFragment());
-            _logger.debug("URL Parsed: " + this);            
+            // Fragment is #string (not used)
+            _logger.debug("URL Parsed: " + this);
 
         }
         catch (URISyntaxException uris)
@@ -162,7 +160,7 @@
 
     private void processOptions()
     {
-        //this is where we would parse any options that needed more than just storage.
+        // this is where we would parse any options that needed more than just storage.
     }
 
     public String getURL()
@@ -219,11 +217,13 @@
             {
                 if (containsOption(BindingURL.OPTION_CLIENTID) && containsOption(BindingURL.OPTION_SUBSCRIPTION))
                 {
-                    _queueName = new AMQShortString(getOption(BindingURL.OPTION_CLIENTID + ":" + BindingURL.OPTION_SUBSCRIPTION));
+                    _queueName =
+                        new AMQShortString(getOption(BindingURL.OPTION_CLIENTID + ":" + BindingURL.OPTION_SUBSCRIPTION));
                 }
                 else
                 {
-                    throw URLHelper.parseError(-1, "Durable subscription must have values for " + BindingURL.OPTION_CLIENTID + " and " + BindingURL.OPTION_SUBSCRIPTION + ".", _url);
+                    throw URLHelper.parseError(-1, "Durable subscription must have values for " + BindingURL.OPTION_CLIENTID
+                        + " and " + BindingURL.OPTION_SUBSCRIPTION + ".", _url);
 
                 }
             }
@@ -237,7 +237,6 @@
             _queueName = name;
         }
 
-
     }
 
     public String getOption(String key)
@@ -275,7 +274,6 @@
         setOption(OPTION_ROUTING_KEY, key.toString());
     }
 
-
     public String toString()
     {
         StringBuffer sb = new StringBuffer();
@@ -289,18 +287,7 @@
         sb.append(_queueName);
 
         sb.append(URLHelper.printOptions(_options));
-        return sb.toString();
-    }
-
-    public static void main(String args[]) throws URLSyntaxException
-    {
-        String url = "exchangeClass://exchangeName/Destination/Queue?option='value',option2='value2'";
-
-        AMQBindingURL dest = new AMQBindingURL(url);
-
-        System.out.println(url);
-        System.out.println(dest);
 
+        return sb.toString();
     }
-
 }

Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/URLHelper.java Thu Apr 19 09:24:30 2007
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -30,10 +30,10 @@
 
     public static void parseOptions(HashMap<String, String> optionMap, String options) throws URLSyntaxException
     {
-        //options looks like this
-        //brokerlist='tcp://host:port?option='value',option='value';vm://:3/virtualpath?option='value'',failover='method?option='value',option='value''
+        // options looks like this
+        // brokerlist='tcp://host:port?option='value',option='value';vm://:3/virtualpath?option='value'',failover='method?option='value',option='value''
 
-        if (options == null || options.indexOf('=') == -1)
+        if ((options == null) || (options.indexOf('=') == -1))
         {
             return;
         }
@@ -49,8 +49,8 @@
         // to store index of final "'"
         int valueIndex = optionIndex;
 
-        //Walk remainder of url.
-        while (nestedQuotes > 0 || valueIndex < length)
+        // Walk remainder of url.
+        while ((nestedQuotes > 0) || (valueIndex < length))
         {
             valueIndex++;
 
@@ -61,27 +61,24 @@
 
             if (options.charAt(valueIndex) == '\'')
             {
-                if (valueIndex + 1 < options.length())
+                if ((valueIndex + 1) < options.length())
                 {
-                    if (options.charAt(valueIndex + 1) == DEFAULT_OPTION_SEPERATOR ||
-                            options.charAt(valueIndex + 1) == ALTERNATIVE_OPTION_SEPARATOR ||
-                            options.charAt(valueIndex + 1) == BROKER_SEPARATOR ||
-                            options.charAt(valueIndex + 1) == '\'')
+                    if ((options.charAt(valueIndex + 1) == DEFAULT_OPTION_SEPERATOR)
+                            || (options.charAt(valueIndex + 1) == ALTERNATIVE_OPTION_SEPARATOR)
+                            || (options.charAt(valueIndex + 1) == BROKER_SEPARATOR)
+                            || (options.charAt(valueIndex + 1) == '\''))
                     {
                         nestedQuotes--;
-//                        System.out.println(
-//                                options + "\n" + "-" + nestedQuotes + ":" + getPositionString(valueIndex - 2, 1));
+
                         if (nestedQuotes == 0)
                         {
-                            //We've found the value of an option
+                            // We've found the value of an option
                             break;
                         }
                     }
                     else
                     {
                         nestedQuotes++;
-//                        System.out.println(
-//                                options + "\n" + "+" + nestedQuotes + ":" + getPositionString(valueIndex - 2, 1));
                     }
                 }
                 else
@@ -98,11 +95,11 @@
             }
         }
 
-        if (nestedQuotes != 0 || valueIndex < (optionIndex + 2))
+        if ((nestedQuotes != 0) || (valueIndex < (optionIndex + 2)))
         {
             int sepIndex = 0;
 
-            //Try and identify illegal separator character
+            // Try and identify illegal separator character
             if (nestedQuotes > 1)
             {
                 for (int i = 0; i < nestedQuotes; i++)
@@ -112,14 +109,14 @@
                 }
             }
 
-            if (sepIndex >= options.length() || sepIndex == 0)
+            if ((sepIndex >= options.length()) || (sepIndex == 0))
             {
                 throw parseError(valueIndex, "Unterminated option", options);
             }
             else
             {
-                throw parseError(sepIndex, "Unterminated option. Possible illegal option separator:'" +
-                        options.charAt(sepIndex) + "'", options);
+                throw parseError(sepIndex, "Unterminated option. Possible illegal option separator:'"
+                    + options.charAt(sepIndex) + "'", options);
             }
         }
 
@@ -130,11 +127,10 @@
 
         if (valueIndex < (options.length() - 1))
         {
-            //Recurse to get remaining options
+            // Recurse to get remaining options
             parseOptions(optionMap, options.substring(valueIndex + 2));
         }
     }
-
 
     public static URLSyntaxException parseError(int index, String error, String url)
     {

Modified: incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml (original)
+++ incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/bin.xml Thu Apr 19 09:24:30 2007
@@ -83,6 +83,24 @@
       <fileMode>420</fileMode>
     </file>
     <file>
+      <source>../broker/etc/jmxremote.access</source>
+      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+      <destName>jmxremote.access</destName>
+      <fileMode>420</fileMode>
+    </file>
+    <file>
+      <source>../broker/etc/transient_config.xml</source>
+      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+      <destName>transient_config.xml</destName>
+      <fileMode>420</fileMode>
+    </file>
+    <file>
+      <source>../broker/etc/persistent_config.xml</source>
+      <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
+      <destName>persistent_config.xml</destName>
+      <fileMode>420</fileMode>
+    </file>
+    <file>
       <source>../broker/etc/log4j.xml</source>
       <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
       <destName>log4j.xml</destName>
@@ -111,6 +129,18 @@
       <outputDirectory>qpid-${qpid.version}/etc</outputDirectory>
       <destName>virtualhosts.xml</destName>
       <fileMode>420</fileMode>
+    </file>
+    <file>
+      <source>../broker/bin/qpid.stop</source>
+      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+      <destName>qpid.stop</destName>
+      <fileMode>493</fileMode>
+    </file>
+    <file>
+      <source>../broker/bin/qpid.stopall</source>
+      <outputDirectory>qpid-${qpid.version}/bin</outputDirectory>
+      <destName>qpid.stopall</destName>
+      <fileMode>493</fileMode>
     </file>
     <file>
       <source>../common/bin/qpid-run</source>

Modified: incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml (original)
+++ incubator/qpid/trunk/qpid/java/distribution/src/main/assembly/management-eclipse-plugin.xml Thu Apr 19 09:24:30 2007
@@ -88,6 +88,13 @@
       </includes>
       <fileMode>777</fileMode>
     </fileSet>
+    <fileSet>
+      <directory>../management/eclipse-plugin/src/main/resources/sasl</directory>
+      <outputDirectory>qpidmc/eclipse/plugins/jmxremote.optional_1.0.1/META-INF</outputDirectory>
+      <includes>
+        <include>MANIFEST.MF</include>
+      </includes>
+    </fileSet>
   </fileSets>
 
   <dependencySets>

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF Thu Apr 19 09:24:30 2007
@@ -7,6 +7,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.ui.forms
+ org.eclipse.ui.forms,
+ jmxremote.optional
 Eclipse-LazyStart: true
 Bundle-Vendor: Apache Software Foundation

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.bat
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.bat?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.bat (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.bat Thu Apr 19 09:24:30 2007
@@ -52,4 +52,4 @@
 rem Slurp the command line arguments. This loop allows for an unlimited number
 rem of agruments (up to the command line limit, anyway).
 
-"%JAVA_HOME%\bin\java" -Xms40m -Xmx256m -Declipse.consoleLog=true  -jar %QPIDMC_HOME%\eclipse\startup.jar org.eclipse.core.launcher.Main -launcher %QPIDMC_HOME%\eclipse\eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:%QPIDMC_HOME%\configuration" -os win32 -ws win32 -arch x86
+"%JAVA_HOME%\bin\java" -Xms40m -Xmx256m -Declipse.consoleLog=false -Dsecurity=PLAIN -jar %QPIDMC_HOME%\eclipse\startup.jar org.eclipse.core.launcher.Main -launcher %QPIDMC_HOME%\eclipse\eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:%QPIDMC_HOME%\configuration" -os win32 -ws win32 -arch x86

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh Thu Apr 19 09:24:30 2007
@@ -61,4 +61,4 @@
     os="linux"
 fi
 
-"$JAVA_HOME/bin/java" -Xms40m -Xmx256m -Declipse.consoleLog=false -jar $QPIDMC_HOME/eclipse/startup.jar org.eclipse.core.launcher.Main -launcher $QPIDMC_HOME/eclipse/eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:$QPIDMC_HOME/configuration" -os $os -ws $ws -arch $arch
+"$JAVA_HOME/bin/java" -Xms40m -Xmx256m -Declipse.consoleLog=false -Dsecurity=PLAIN -jar $QPIDMC_HOME/eclipse/startup.jar org.eclipse.core.launcher.Main -launcher $QPIDMC_HOME/eclipse/eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:$QPIDMC_HOME/configuration" -os $os -ws $ws -arch $arch

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java Thu Apr 19 09:24:30 2007
@@ -41,7 +41,9 @@
 {
     private static ImageRegistry imageRegistry = new ImageRegistry();
     private static FontRegistry fontRegistry = new FontRegistry();
-
+    public static final boolean debug = Boolean.getBoolean("debug");
+    public static final String securityMechanism = System.getProperty("security", null);    
+    
     static
     {
         imageRegistry.put(Constants.CONSOLE_IMAGE, 
@@ -129,5 +131,10 @@
         List<ManagedServer> list = new CopyOnWriteArrayList<ManagedServer>(_closedServerList);
         _closedServerList.clear();
         return list;
+    }
+    
+    public static String getSecurityMechanism()
+    {
+        return securityMechanism;
     }
 }

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationWorkbenchWindowAdvisor.java Thu Apr 19 09:24:30 2007
@@ -49,7 +49,7 @@
         IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
         int x = Display.getDefault().getBounds().width;
         int y = Display.getDefault().getBounds().height;
-        configurer.setInitialSize(new Point(4*x/5, 3*y/4));
+        configurer.setInitialSize(new Point(9*x/10, 8*y/10));
         configurer.setShowCoolBar(true);
         configurer.setShowStatusLine(false);
         

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Constants.java Thu Apr 19 09:24:30 2007
@@ -1,3 +1,4 @@
+/* Copyright Rupert Smith, 2005 to 2006, all rights reserved. */
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -7,9 +8,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -29,98 +30,110 @@
  */
 public class Constants
 {
-    public final static String APPLICATION_NAME = "Qpid Management Console";
-    
-    public final static String ACTION_REMOVE_MBEANNODE = "Remove from list";
-    public final static String VALUE = "value";
-    public final static String TYPE  = "type";
-    public final static String NODE_TYPE_SERVER    = "server";
-    public final static String NODE_TYPE_DOMAIN    = "domain";
-    public final static String NODE_TYPE_MBEANTYPE = "mbeantype";
+    public static final String APPLICATION_NAME = "Qpid Management Console";
+
+    public static final String ACTION_REMOVE_MBEANNODE = "Remove from list";
+    public static final String VALUE = "value";
+    public static final String TYPE = "type";
+    public static final String NODE_TYPE_SERVER = "server";
+    public static final String NODE_TYPE_DOMAIN = "domain";
+    public static final String NODE_TYPE_MBEANTYPE = "mbeantype";
     // currently used only for virtual host instances, but will work as general also
-    public final static String NODE_TYPE_TYPEINSTANCE = "mbeantype_instance";
-    public final static String MBEAN      = "mbean";
-    public final static String ATTRIBUTE = "Attribute";
-    public final static String ATTRIBUTES = "Attributes";
-    public final static String NOTIFICATION = "Notifications";
-    public final static String RESULT = "Result";
-    public final static String VIRTUAL_HOST = "VirtualHost";
-    public final static String DEFAULT_VH = "Default";
-    public final static String DEFAULT_USERNAME = "guest";
-    public final static String DEFAULT_PASSWORD = "guest";
-    
-    public final static String USERNAME = "Username";
-    public final static String PASSWORD = "Password";
-    
+    public static final String NODE_TYPE_TYPEINSTANCE = "mbeantype_instance";
+    public static final String MBEAN = "mbean";
+    public static final String ATTRIBUTE = "Attribute";
+    public static final String ATTRIBUTES = "Attributes";
+    public static final String NOTIFICATIONS = "Notifications";
+    public static final String RESULT = "Result";
+    public static final String VIRTUAL_HOST = "VirtualHost";
+    public static final String DEFAULT_VH = "Default";
+    public static final String DEFAULT_USERNAME = "guest";
+    public static final String DEFAULT_PASSWORD = "guest";
+
+    public static final String USERNAME = "Username";
+    public static final String PASSWORD = "Password";
+
     // Attributes and operations are used to customize the GUI for Qpid. If these are changes in the
     // Qpid server, then these should be updated accordingly
-    public final static String ATTRIBUTE_QUEUE_OWNER = "owner";
-    public final static String ATTRIBUTE_QUEUE_DEPTH = "QueueDepth";
-    public final static String ATTRIBUTE_QUEUE_CONSUMERCOUNT = "ActiveConsumerCount";    
-    public final static String OPERATION_CREATE_QUEUE = "createNewQueue";
-    public final static String OPERATION_CREATE_BINDING = "createNewBinding";
-    public final static String OPERATION_MOVE_MESSAGES = "moveMessages";
-    
-    public final static String ALL = "All";
-    
-    public final static String NAVIGATION_ROOT = "Qpid Connections";
-    public final static String DESCRIPTION = " Description";
-    
-    public final static String QUEUE  = "Queue";
-    public final static String CONNECTION ="Connection";
-    public final static String EXCHANGE = "Exchange";
-    public final static String EXCHANGE_TYPE = "ExchangeType";
-    public final static String[] EXCHANGE_TYPE_VALUES = {"direct", "topic", "headers"};
-    public final static String[] BOOLEAN_TYPE_VALUES = {"false", "true"};
-    public final static String[] ATTRIBUTE_TABLE_TITLES = {"Attribute Name", "Value"};  
-    public static final String[] CONNECTION_PROTOCOLS ={"RMI"};
+    public static final String ATTRIBUTE_QUEUE_OWNER = "owner";
+    public static final String ATTRIBUTE_QUEUE_DEPTH = "QueueDepth";
+    public static final String ATTRIBUTE_QUEUE_CONSUMERCOUNT = "ActiveConsumerCount";
+    public static final String OPERATION_CREATE_QUEUE = "createNewQueue";
+    public static final String OPERATION_CREATE_BINDING = "createNewBinding";
+    public static final String OPERATION_MOVE_MESSAGES = "moveMessages";
+
+    public static final String OPERATION_CREATEUSER = "createUser";
+    public static final String OPERATION_VIEWUSERS = "viewUsers";
+    public static final String OPERATION_PARAM_USERNAME = "username";
+
+    public static final String OPERATION_SUCCESSFUL = "Operation successful";
+    public static final String OPERATION_UNSUCCESSFUL = "Operation unsuccessful";
+
+    public static final String ALL = "All";
+
+    public static final String NAVIGATION_ROOT = "Qpid Connections";
+    public static final String DESCRIPTION = " Description";
+
+    public static final String ADMIN_MBEAN_TYPE = "UserManagement";
+    public static final String QUEUE = "Queue";
+    public static final String CONNECTION = "Connection";
+    public static final String EXCHANGE = "Exchange";
+    public static final String EXCHANGE_TYPE = "ExchangeType";
+    public static final String[] EXCHANGE_TYPE_VALUES = { "direct", "fanout", "headers", "topic" };
+    public static final String[] BOOLEAN_TYPE_VALUES = { "false", "true" };
+    public static final String[] ATTRIBUTE_TABLE_TITLES = { "Attribute Name", "Value" };
+    public static final String[] CONNECTION_PROTOCOLS = { "RMI" };
     public static final String DEFAULT_PROTOCOL = CONNECTION_PROTOCOLS[0];
-    
-    public final static String ACTION_ADDSERVER = "New Connection";
-    public final static String ACTION_RECONNECT = "Reconnect";
-    public final static String ACTION_LOGIN = "Login";
-    
-    public final static String QUEUE_SORT_BY_NAME = "Queue Name";
-    public final static String QUEUE_SORT_BY_DEPTH = "Queue Depth";
-    public final static String QUEUE_SORT_BY_CONSUMERCOUNT = "Consumer Count";
-    public final static String QUEUE_SHOW_TEMP_QUEUES= "show temporary queues";
-    
-    public final static String SUBSCRIBE_BUTTON   = "Subscribe";
-    public final static String UNSUBSCRIBE_BUTTON = "Unsubscribe";
-    
-    public final static String CONSOLE_IMAGE = "ConsoelImage";
-    public final static String CLOSED_FOLDER_IMAGE = "ClosedFolderImage";
-    public final static String OPEN_FOLDER_IMAGE = "OpenFolderImage";
-    public final static String MBEAN_IMAGE = "MBeanImage";
-    public final static String NOTIFICATION_IMAGE = "NotificationImage";
-    
-    public final static String FONT_BUTTON = "ButtonFont";
-    public final static String FONT_BOLD = "BoldFont";
-    public final static String FONT_ITALIC = "ItalicFont";
-    public final static String FONT_TABLE_CELL = "TableCellFont";
-    public final static String FONT_NORMAL = "Normal";
-    
-    public final static String BUTTON_DETAILS = "Details";
-    public final static String BUTTON_EDIT_ATTRIBUTE = "Edit Attribute";
-    public final static String BUTTON_REFRESH = "Refresh";
-    public final static String BUTTON_GRAPH = "Graph";
-    public final static int TIMER_INTERVAL = 5000;
-    public final static String BUTTON_EXECUTE = "Execute";
-    public final static String BUTTON_CLEAR = "Clear";
-    public final static String BUTTON_CONNECT = "Connect";
-    public final static String BUTTON_CANCEL = "Cancel";
-    public final static String BUTTON_UPDATE = "Update";
-    
-    
-    public final static int OPERATION_IMPACT_INFO    = 0;
-    public final static int OPERATION_IMPACT_ACTION  = 1;
-    public final static int OPERATION_IMPACT_ACTIONINFO  = 2;
-    public final static int OPERATION_IMPACT_UNKNOWN = 3;
-    
-    public final static String ERROR_SERVER_CONNECTION = "Server could not be connected";
-    public final static String INFO_PROTOCOL = "Please select the protocol";
-    public final static String INFO_HOST_ADDRESS = "Please enter the host address";
-    public final static String INFO_HOST_PORT = "Please enter the port number";
-    public final static String INFO_USERNAME = "Please enter the " + USERNAME;
-    public final static String INFO_PASSWORD = "Please enter the " + PASSWORD;
+
+    public static final String ACTION_ADDSERVER = "New Connection";
+    public static final String ACTION_RECONNECT = "Reconnect";
+    public static final String ACTION_LOGIN = "Login";
+
+    public static final String QUEUE_SORT_BY_NAME = "Queue Name";
+    public static final String QUEUE_SORT_BY_DEPTH = "Queue Depth";
+    public static final String QUEUE_SORT_BY_CONSUMERCOUNT = "Consumer Count";
+    public static final String QUEUE_SHOW_TEMP_QUEUES = "show temporary queues";
+
+    public static final String SUBSCRIBE_BUTTON = "Subscribe";
+    public static final String UNSUBSCRIBE_BUTTON = "Unsubscribe";
+
+    public static final String CONSOLE_IMAGE = "ConsoelImage";
+    public static final String CLOSED_FOLDER_IMAGE = "ClosedFolderImage";
+    public static final String OPEN_FOLDER_IMAGE = "OpenFolderImage";
+    public static final String MBEAN_IMAGE = "MBeanImage";
+    public static final String NOTIFICATION_IMAGE = "NotificationImage";
+
+    public static final String FONT_BUTTON = "ButtonFont";
+    public static final String FONT_BOLD = "BoldFont";
+    public static final String FONT_ITALIC = "ItalicFont";
+    public static final String FONT_TABLE_CELL = "TableCellFont";
+    public static final String FONT_NORMAL = "Normal";
+
+    public static final String BUTTON_DETAILS = "Details";
+    public static final String BUTTON_EDIT_ATTRIBUTE = "Edit Attribute";
+    public static final String BUTTON_REFRESH = "Refresh";
+    public static final String BUTTON_GRAPH = "Graph";
+    public static final int TIMER_INTERVAL = 5000;
+    public static final String BUTTON_EXECUTE = "Execute";
+    public static final String BUTTON_CLEAR = "Clear";
+    public static final String BUTTON_CONNECT = "Connect";
+    public static final String BUTTON_CANCEL = "Cancel";
+    public static final String BUTTON_UPDATE = "Update";
+
+    public static final int OPERATION_IMPACT_INFO = 0;
+    public static final int OPERATION_IMPACT_ACTION = 1;
+    public static final int OPERATION_IMPACT_ACTIONINFO = 2;
+    public static final int OPERATION_IMPACT_UNKNOWN = 3;
+
+    public static final String ERROR_SERVER_CONNECTION = "Server could not be connected";
+    public static final String INFO_PROTOCOL = "Please select the protocol";
+    public static final String INFO_HOST_ADDRESS = "Please enter the host address";
+    public static final String INFO_HOST_PORT = "Please enter the port number";
+    public static final String INFO_USERNAME = "Please enter the " + USERNAME;
+    public static final String INFO_PASSWORD = "Please enter the " + PASSWORD;
+
+    public static final String MECH_CRAMMD5 = "CRAM-MD5";
+    public static final String MECH_PLAIN = "PLAIN";
+    public static final String SASL_CRAMMD5 = "SASL/CRAM-MD5";
+    public static final String SASL_PLAIN = "SASL/PLAIN";
 }

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ManagedBean.java Thu Apr 19 09:24:30 2007
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.management.ui;
 
+import static org.apache.qpid.management.ui.Constants.*;
 import java.util.HashMap;
 
 /**
@@ -50,7 +51,7 @@
         this._properties = properties;
         setName(getProperty("name"));
         setType(getProperty("type"));
-        _virtualHostName = getProperty(Constants.VIRTUAL_HOST);
+        _virtualHostName = getProperty(VIRTUAL_HOST);
     }
     public String getDomain()
     {
@@ -89,7 +90,7 @@
     public String getVirtualHostName()
     {
         // To make it work with the broker with no virtual host implementation
-        return _virtualHostName == null ? Constants.DEFAULT_VH : _virtualHostName;
+        return _virtualHostName == null ? DEFAULT_VH : _virtualHostName;
     }
     
     /**
@@ -106,21 +107,26 @@
     
     public boolean isQueue()
     {
-        return _type.endsWith(Constants.QUEUE);
+        return _type.endsWith(QUEUE);
     }
     
     public boolean isConnection()
     {
-        return _type.endsWith(Constants.CONNECTION);
+        return _type.endsWith(CONNECTION);
     }
     
     public boolean isExchange()
     {
-        return _type.endsWith(Constants.EXCHANGE);
+        return _type.endsWith(EXCHANGE);
     }
     
     public boolean isTempQueue()
     {
         return (isQueue() && getName().startsWith("tmp_"));
+    }
+    
+    public boolean isAdmin()
+    {
+        return _type.endsWith(ADMIN_MBEAN_TYPE);
     }
 }

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/Perspective.java Thu Apr 19 09:24:30 2007
@@ -37,8 +37,8 @@
 		layout.setEditorAreaVisible(false);
         
 		// standalone view meaning it can't be docked or stacked with other views, and it doesn't have a title bar.        
-		layout.addStandaloneView(NavigationView.ID, true, IPageLayout.LEFT, 0.25f, editorArea);
-        layout.addStandaloneView(MBeanView.ID, true, IPageLayout.RIGHT, 0.75f, editorArea);
+		layout.addStandaloneView(NavigationView.ID, true, IPageLayout.LEFT, 0.30f, editorArea);
+        layout.addStandaloneView(MBeanView.ID, true, IPageLayout.RIGHT, 0.70f, editorArea);
 		
 		layout.getViewLayout(NavigationView.ID).setCloseable(false);
         layout.getViewLayout(MBeanView.ID).setCloseable(false);       

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ServerRegistry.java Thu Apr 19 09:24:30 2007
@@ -128,6 +128,10 @@
         return _virtualHosts;
     }
     
+    public abstract void setUserList(List<String> list);
+    
+    public abstract List<String> getUsernames();
+    
     public abstract void addManagedObject(ManagedBean key);
     
     public abstract List<ManagedBean> getMBeans();
@@ -154,7 +158,7 @@
     
     public abstract boolean hasSubscribedForNotifications(ManagedBean mbean, String name, String type);
     
-    public abstract void clearNotifications(ManagedBean mbean);
+    public abstract void clearNotifications(ManagedBean mbean, List<NotificationObject> list);
     
     public ClientListener getNotificationListener()
     {

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java Thu Apr 19 09:24:30 2007
@@ -194,9 +194,6 @@
             }
         }
         
-        //If you create it, you dispose it.
-        shell.dispose();
-        
         // enable the main shell
         _window.getShell().setEnabled(true);
         _window.getShell().open();
@@ -263,7 +260,7 @@
         user.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
         
         final Text textUser = new Text(composite, SWT.BORDER);
-        textUser.setText(DEFAULT_USERNAME);
+        textUser.setText("");
         textUser.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
         
         Label password = new Label(composite, SWT.NONE);
@@ -271,7 +268,7 @@
         password.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
         
         final Text textPwd = new Text(composite, SWT.BORDER | SWT.SINGLE | SWT.PASSWORD);
-        textPwd.setText(DEFAULT_PASSWORD);
+        textPwd.setText("");
         //textPwd.setEchoChar('*');
         textPwd.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
         
@@ -327,11 +324,7 @@
                 
                 _domain = comboDomain.getText();
                 _addServer = true;
-
-                if (!connectButton.getShell().isDisposed())
-                {
-                    connectButton.getShell().dispose();
-                }                                      
+                shell.dispose();                                     
             }
         });
         

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java Thu Apr 19 09:24:30 2007
@@ -168,9 +168,6 @@
             }
         }
         
-        //If you create it, you dispose it.
-        shell.dispose();
-        
         // enable the main shell
         _window.getShell().setEnabled(true);
         _window.getShell().open();
@@ -194,7 +191,7 @@
         user.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
         
         final Text textUser = new Text(composite, SWT.BORDER);
-        textUser.setText(DEFAULT_USERNAME);
+        textUser.setText("");
         textUser.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
         // Put cursor on this field
         textUser.setFocus();
@@ -204,7 +201,7 @@
         password.setLayoutData(new GridData(SWT.TRAIL, SWT.TOP, false, false));
         
         final Text textPwd = new Text(composite, SWT.BORDER | SWT.SINGLE | SWT.PASSWORD);
-        textPwd.setText(DEFAULT_PASSWORD);
+        textPwd.setText("");
         textPwd.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
         
         Composite buttonsComposite  = new Composite(composite, SWT.NONE);
@@ -240,11 +237,7 @@
                 }
                 
                 _connect = true;
-
-                if (!connectButton.getShell().isDisposed())
-                {
-                    connectButton.getShell().dispose();
-                }
+                shell.dispose();
             }
         });
 

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java Thu Apr 19 09:24:30 2007
@@ -45,10 +45,7 @@
     {
         ObjectName objName = null;
         String     type = notification.getType();
-        if (MBeanUtility.isDebug())
-        {
-            System.out.println(type + ":" + objName);
-        }
+        MBeanUtility.printOutput(type + ":" + objName);
         
         if (MBeanServerNotification.REGISTRATION_NOTIFICATION.equals(type))
         {

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java Thu Apr 19 09:24:30 2007
@@ -20,6 +20,10 @@
  */
 package org.apache.qpid.management.ui.jmx;
 
+import static org.apache.qpid.management.ui.Constants.*;
+
+import java.lang.reflect.Constructor;
+import java.security.Security;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -35,8 +39,9 @@
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
+import javax.security.sasl.SaslClientFactory;
 
-import org.apache.qpid.management.ui.Constants;
+import org.apache.qpid.management.ui.ApplicationRegistry;
 import org.apache.qpid.management.ui.ManagedBean;
 import org.apache.qpid.management.ui.ManagedServer;
 import org.apache.qpid.management.ui.ServerRegistry;
@@ -44,6 +49,10 @@
 import org.apache.qpid.management.ui.model.NotificationInfoModel;
 import org.apache.qpid.management.ui.model.NotificationObject;
 import org.apache.qpid.management.ui.model.OperationDataModel;
+import org.apache.qpid.management.ui.sasl.JCAProvider;
+import org.apache.qpid.management.ui.sasl.SaslProvider;
+import org.apache.qpid.management.ui.sasl.UserPasswordCallbackHandler;
+import org.apache.qpid.management.ui.sasl.UsernameHashedPasswordCallbackHandler;
 
 
 public class JMXServerRegistry extends ServerRegistry
@@ -52,11 +61,12 @@
     private JMXConnector _jmxc = null;
     private MBeanServerConnection _mbsc = null;
     
+    private List<String> _usersList;
     // When an mbean gets removed from mbean server, then the notification listener
     // will add that mbean in this list.
     private List<ManagedBean> _mbeansToBeRemoved = new ArrayList<ManagedBean>();
     
-    // Map containing all managed beans and ampped with unique mbean name
+    // Map containing all managed beans and mapped with unique mbean name
     private HashMap<String, ManagedBean>   _mbeansMap    = new HashMap<String, ManagedBean>();
     // Map containing MBeanInfo for all mbeans and mapped with unique mbean name 
     private HashMap<String, MBeanInfo>     _mbeanInfoMap = new HashMap<String, MBeanInfo>();
@@ -83,11 +93,69 @@
     {
         super(server);
         JMXServiceURL jmxUrl = new JMXServiceURL(server.getUrl());
-        Map<String, Object> env = new HashMap<String, Object>();
-        String[] creds = {server.getUser(), server.getPassword()};
-        env.put(JMXConnector.CREDENTIALS, creds);
-
-        _jmxc = JMXConnectorFactory.connect(jmxUrl, env);
+        Map<String, Object> env = null;
+        String securityMechanism = ApplicationRegistry.getSecurityMechanism();
+       
+        if (securityMechanism != null)
+        {                                
+            try
+            {
+                // Check if the JMXMP connector is available
+                Class klass = Class.forName("javax.management.remote.jmxmp.JMXMPConnector");
+                
+                jmxUrl = new JMXServiceURL("jmxmp", server.getHost(), server.getPort());
+                env = new HashMap<String, Object>();
+                
+                if (MECH_CRAMMD5.equals(securityMechanism))
+                {
+                    // For SASL/CRAM-MD5
+                    Map<String, Class<? extends SaslClientFactory>> map = new HashMap<String, Class<? extends SaslClientFactory>>();
+                    Class<?> clazz = Class.forName("org.apache.qpid.management.ui.sasl.CRAMMD5HashedSaslClientFactory");
+                    map.put("CRAM-MD5-HASHED", (Class<? extends SaslClientFactory>) clazz);
+                    
+                    Security.addProvider(new JCAProvider(map));
+                    env.put("jmx.remote.profiles", SASL_CRAMMD5); 
+                    env.put("jmx.remote.sasl.callback.handler",
+                            new UsernameHashedPasswordCallbackHandler(server.getUser(), server.getPassword()));
+                }
+                else if (MECH_PLAIN.equals(securityMechanism))
+                {
+                    // For SASL/PLAIN
+                    Security.addProvider(new SaslProvider());
+                    env.put("jmx.remote.profiles", SASL_PLAIN);
+                    env.put("jmx.remote.sasl.callback.handler",
+                            new UserPasswordCallbackHandler(server.getUser(), server.getPassword())); 
+                }
+                else
+                {
+                    MBeanUtility.printOutput("Security mechanism " + securityMechanism + " is not supported.");
+                }
+                
+                // Now create the instance of JMXMPConnector                                               
+                Class[] paramTypes = {JMXServiceURL.class, Map.class};                           
+                Constructor cons = klass.getConstructor(paramTypes);
+                
+                Object[] args = {jmxUrl, env};           
+                Object theObject = cons.newInstance(args);
+                
+                _jmxc = (JMXConnector)theObject;
+                _jmxc.connect();
+                MBeanUtility.printOutput("Starting JMXConnector with SASL. Server=" + server.getName());
+            }
+            catch (Exception ex)
+            {
+                // When JMXMPConnector is not available
+                MBeanUtility.printOutput("Starting JMXConnector. Server=" + server.getName());                
+                jmxUrl = new JMXServiceURL(server.getUrl());
+                _jmxc = JMXConnectorFactory.connect(jmxUrl, null);
+            }
+        }
+        else
+        {
+            jmxUrl = new JMXServiceURL(server.getUrl());
+            _jmxc = JMXConnectorFactory.connect(jmxUrl, null);
+        }
+        
         _mbsc = _jmxc.getMBeanServerConnection();
         
         _clientListener = new ClientListener(server);
@@ -155,10 +223,7 @@
 
     public void removeManagedObject(ManagedBean mbean)
     {
-        if (MBeanUtility.isDebug())
-        {
-            System.out.println("Removing MBean:" + mbean.getUniqueName());
-        }
+        MBeanUtility.printOutput("Removing MBean:" + mbean.getUniqueName());
         
         if (mbean.isQueue())
         {
@@ -218,17 +283,78 @@
         list.add(obj);
     }
     
+    /**
+     * Returns all the notification objects for a given mbean. If mbean is null, it returns
+     * notification objects for all the mbeans.
+     */
     public List<NotificationObject> getNotifications(ManagedBean mbean)
     {
-        return _notificationsMap.get(mbean.getUniqueName());
+        if (mbean == null)
+        {
+            List<NotificationObject> totalList = new ArrayList<NotificationObject>();
+            for (List<NotificationObject> list : _notificationsMap.values())
+            {
+                totalList.addAll(list);
+            }
+            return totalList;
+        }
+        else
+        {
+            return _notificationsMap.get(mbean.getUniqueName());
+        }
     }
     
-    public void clearNotifications(ManagedBean mbean)
+    public void clearNotifications(ManagedBean mbean, List<NotificationObject> list)
     {
-        if (_notificationsMap.containsKey(mbean.getUniqueName()))
-            _notificationsMap.get(mbean.getUniqueName()).clear();
+        if (mbean == null)
+        {
+            if (list == null || list.isEmpty())
+            {
+                // All notifications of all mbeans to be cleared
+                _notificationsMap.clear();
+            }
+            else
+            {
+                // Clear the selected notifications
+                for (NotificationObject obj : list)
+                {
+                    mbean = _mbeansMap.get(obj.getSource().toString());
+                    List<NotificationObject> nList = _notificationsMap.get(mbean.getUniqueName());
+                    if (nList != null && !nList.isEmpty())
+                    {
+                        nList.remove(obj);
+                    }
+                }
+            }
+        }
+        else 
+        {
+            if (list == null || list.isEmpty())
+            {
+                // All notifications of this mbean to be cleared
+                List<NotificationObject> nList = _notificationsMap.get(mbean.getUniqueName());
+                if (nList != null && !nList.isEmpty())
+                {
+                    nList.clear();
+                }
+            }
+            else
+            {
+                // Clear the selected notifications
+                for (NotificationObject obj : list)
+                {
+                    List<NotificationObject> nList = _notificationsMap.get(mbean.getUniqueName());
+                    if (nList != null && !nList.isEmpty())
+                    {
+                        nList.remove(obj);
+                    }
+                }
+            }
+        }
     }
     
+    
+    
     /**
      * Adds notification name and type to the map. The map contains all the notification names,
      * subscribed for an mbean.
@@ -254,7 +380,7 @@
             map.put(name, list);
         }
         // Now add the notification type to the list
-        if (Constants.ALL.equals(type))
+        if (ALL.equals(type))
         {
             List<NotificationInfoModel> infoList = _notificationInfoMap.get(mbean.getUniqueName());
             for (NotificationInfoModel model : infoList)
@@ -313,7 +439,7 @@
             HashMap<String, List<String>> map = _subscribedNotificationMap.get(mbean.getUniqueName());
             if (map.containsKey(name))
             {
-                if (Constants.ALL.equals(type))
+                if (ALL.equals(type))
                 {
                     map.remove(name);
                 }
@@ -440,6 +566,16 @@
             connections[i++] = mbean.getName();
         }
         return connections;
+    }
+    
+    public void setUserList(List<String> list)
+    {
+        _usersList = list;
+    }
+    
+    public List<String> getUsernames()
+    {
+        return _usersList;
     }
 
     public ClientNotificationListener getNotificationListener()

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java Thu Apr 19 09:24:30 2007
@@ -60,13 +60,6 @@
  */
 public class MBeanUtility
 {
-    private static boolean _debug;
-    static
-    {
-        String debug = System.getProperty("debug");
-        _debug = "true".equalsIgnoreCase(debug) ? true : false;
-    }
-    
     public static final BigInteger MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE);
     public static final BigInteger MAX_INT = BigInteger.valueOf(Integer.MAX_VALUE);
     /**
@@ -149,27 +142,27 @@
      * @param mbean managed bean
      * @param ex   Exception
      */
-    public static void handleException(ManagedBean mbean, Exception ex)
+    public static void handleException(ManagedBean mbean, Throwable ex)
     {
         if (mbean == null)
         {
             ViewUtility.popupErrorMessage("Error", "Managed Object is null \n" + ex.toString());
-            ex.printStackTrace();
+            printStackTrace(ex);
         }
         else if (ex instanceof IOException)
         {
             ViewUtility.popupErrorMessage(mbean.getInstanceName(), "IO Error occured \n" + ex.toString());
-            ex.printStackTrace();
+            printStackTrace(ex);
         }
         else if (ex instanceof ReflectionException)
         {
             ViewUtility.popupErrorMessage(mbean.getInstanceName(), "Server has thrown error \n" + ex.toString());
-            ex.printStackTrace();
+            printStackTrace(ex);
         }
         else if (ex instanceof InstanceNotFoundException)
         {
             ViewUtility.popupErrorMessage(mbean.getInstanceName(), "Managed Object Not Found \n" + ex.toString());
-            ex.printStackTrace();
+            printStackTrace(ex);
         }
         else if (ex instanceof MBeanException)
         {
@@ -188,8 +181,20 @@
         }
         else 
         {
-            ViewUtility.popupErrorMessage(mbean.getInstanceName(), ex.getMessage());
-            ex.printStackTrace();
+            if (ex.getCause() != null)
+            {
+                handleException(mbean, ex.getCause());
+            }
+            else
+            {
+                String msg = ex.getMessage();
+                if (msg == null)
+                {
+                    msg = ex.toString();
+                }
+                ViewUtility.popupErrorMessage(mbean.getInstanceName(), msg);
+                printStackTrace(ex);
+            }
         }
         
     }
@@ -449,12 +454,19 @@
         return Arrays.asList(domains);
     }
     
-    /**
-     * return true if System property is set to true -Ddebug=true
-     * @return
-     */
-    public static boolean isDebug()
+    public static void printOutput(String statement)
     {
-        return _debug;
+        if (ApplicationRegistry.debug)
+        {
+            System.out.println(statement);
+        }
+    }
+    
+    private static void printStackTrace(Throwable ex)
+    {
+        if (ApplicationRegistry.debug)
+        {
+            ex.printStackTrace();
+        }
     }
 }

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java Thu Apr 19 09:24:30 2007
@@ -24,10 +24,12 @@
 import java.util.Date;
 import java.util.TimeZone;
 
+import javax.management.ObjectName;
+
 public class NotificationObject
 {
 
-    private long     _sequenceNo;
+    private long    _sequenceNo;
     private Date    _timeStamp;
     private String  _message;
     private Object  _source;       
@@ -52,6 +54,17 @@
     {
         this._source = _source;
     }
+    
+    public String getSourceName()
+    {
+        if (_source instanceof ObjectName)
+        {
+            return ((ObjectName)_source).getKeyProperty("name");
+        }
+        
+        return null;
+    }
+    
     public String getMessage()
     {
         return _message;

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/OperationData.java Thu Apr 19 09:24:30 2007
@@ -80,5 +80,13 @@
         this._returnType = returnType;
     }
     
+    public boolean isReturnTypeBoolean()
+    {
+        return (_returnType.equals("boolean") || _returnType.equals("java.lang.Boolean"));
+    }
     
+    public boolean isReturnTypeVoid()
+    {
+        return (_returnType.equals("void") || _returnType.equals("java.lang.Void"));
+    }
 }

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java Thu Apr 19 09:24:30 2007
@@ -596,7 +596,7 @@
     }    
 
     // Refresh from the server registry
-    private void refresh()
+    public void refresh()
     {
         JMXServerRegistry serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(_mbean);
         ManagedAttributeModel attributesList = serverRegistry.getAttributeModel(_mbean);

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java Thu Apr 19 09:24:30 2007
@@ -62,6 +62,7 @@
     
     private FormToolkit  _toolkit = null;
     private Form _form = null;
+    private String _formText = APPLICATION_NAME;
     private static ManagedServer _server = null;
     private TreeObject _selectedNode = null;
     private ManagedBean _mbean = null;
@@ -73,6 +74,8 @@
 
     // TabFolder to list all the mbeans for a given mbeantype(eg Connection, Queue, Exchange)
     private TabFolder typeTabFolder = null;
+    
+    private TabFolder notificationTabFolder = null;
     /*
      * Listener for the selection events in the navigation view
      */ 
@@ -91,16 +94,41 @@
             // an mbeantype. For mbeantype selection(eg Connection, Queue, Exchange) _mbean will remain null.
             _mbean = null;
             setInvisible();
-            _form.setText(APPLICATION_NAME);
             
-            // If a selected node(mbean) gets unregistered from mbena server, mbenaview should should 
+            // If a selected node(mbean) gets unregistered from mbean server, mbeanview should 
             // make the tabfolber for that mbean invisible
             if (_selectedNode == null)            
                 return;
             
             setServer();
             refreshMBeanView();
+            setFormTitle();            
+        }
+    }
+    
+    private void setFormTitle()
+    {
+        if (_mbean != null)
+        {
+            _formText = _mbean.getType();
+            if ((_mbean.getVirtualHostName() != null) && (!DEFAULT_VH.equals(_mbean.getVirtualHostName())) )
+            {
+                _formText = _formText.replaceFirst(VIRTUAL_HOST, _mbean.getVirtualHostName());
+                if (_mbean.getName() != null && _mbean.getName().length() != 0)
+                {
+                    _formText = _formText + ": " + _mbean.getName();
+                }
+            }
+        }
+        else if ((_selectedNode.getVirtualHost() != null) && (!DEFAULT_VH.equals(_selectedNode.getVirtualHost())))
+        {
+            _formText = _selectedNode.getVirtualHost();
         }
+        else
+        {
+            _formText = APPLICATION_NAME;
+        }
+        _form.setText(_formText);
     }
     
     public void refreshMBeanView()
@@ -121,10 +149,16 @@
             {
                 refreshTypeTabFolder(_selectedNode.getName());
             } 
-            else
+            else if (NOTIFICATIONS.equals(_selectedNode.getType()))
+            {
+                refreshNotificationPage();
+            }
+            else if (MBEAN.equals(_selectedNode.getType()))
             {
+                _mbean = (ManagedBean)_selectedNode.getManagedObject(); 
                 showSelectedMBean();
             }
+            
             _form.layout(true);
             _form.getBody().layout(true, true);
         }
@@ -174,20 +208,7 @@
     }
     
     private void showSelectedMBean() throws Exception
-    {     
-        if (NOTIFICATION.equals(_selectedNode.getType()))
-        {
-            _mbean = (ManagedBean)_selectedNode.getParent().getManagedObject();                
-        }
-        else if (MBEAN.equals(_selectedNode.getType()))
-        {
-            _mbean = (ManagedBean)_selectedNode.getManagedObject();                
-        }
-        else
-        {
-            return;
-        }
-        
+    {           
         try
         {                
             MBeanUtility.getMBeanInfo(_mbean);     
@@ -213,14 +234,8 @@
             tabFolder = createMBeanTabFolder();
         }
         
-        String text = _mbean.getType();
-        if (_mbean.getName() != null && _mbean.getName().length() != 0)
-        {
-            text = text + ": " + _mbean.getName();
-        }
-        _form.setText(text);
         int tabIndex = 0;
-        if (NOTIFICATION.equals(_selectedNode.getType()))
+        if (NOTIFICATIONS.equals(_selectedNode.getType()))
         {
             tabIndex = tabFolder.getItemCount() -1;
         }
@@ -247,6 +262,8 @@
         // Add mbeantype TabFolder. This will list all the mbeans under a mbeantype (eg Queue, Exchange).
         // Using this list mbeans will be added in the navigation view
         createMBeanTypeTabFolder();
+        
+        createNotificationsTabFolder();
     }
     
     private TabFolder createMBeanTabFolder()
@@ -345,7 +362,7 @@
         NotificationsTabControl controller = new NotificationsTabControl(tabFolder);
         
         TabItem tab = new TabItem(tabFolder, SWT.NONE);
-        tab.setText(NOTIFICATION);
+        tab.setText(NOTIFICATIONS);
         tab.setData(CONTROLLER, controller);
         tab.setControl(controller.getControl());
     }
@@ -432,6 +449,32 @@
         });
     }
     
+    private void createNotificationsTabFolder()
+    {
+        notificationTabFolder = new TabFolder(_form.getBody(), SWT.NONE);
+        FormData layoutData = new FormData();
+        layoutData.left = new FormAttachment(0);
+        layoutData.top = new FormAttachment(0);
+        layoutData.right = new FormAttachment(100);
+        layoutData.bottom = new FormAttachment(100);
+        notificationTabFolder.setLayoutData(layoutData);
+        notificationTabFolder.setVisible(false);
+        
+        VHNotificationsTabControl controller = new VHNotificationsTabControl(notificationTabFolder);       
+        TabItem tab = new TabItem(notificationTabFolder, SWT.NONE);
+        tab.setText(NOTIFICATIONS);
+        tab.setData(CONTROLLER, controller);
+        tab.setControl(controller.getControl());
+    }
+    
+    private void refreshNotificationPage()
+    {        
+        TabItem tab = notificationTabFolder.getItem(0);
+        VHNotificationsTabControl controller = (VHNotificationsTabControl)tab.getData(CONTROLLER);
+        controller.refresh();
+        notificationTabFolder.setVisible(true);
+    }
+    
     /**
      * Refreshes the Selected mbeantype tab. The control lists all the available mbeans
      * for an mbeantype(eg Queue, Exchange etc)
@@ -491,6 +534,11 @@
         if (typeTabFolder != null)
         {
             typeTabFolder.setVisible(false);
+        }
+        
+        if (notificationTabFolder != null)
+        {
+            notificationTabFolder.setVisible(false);
         }
     }
     

Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java?view=diff&rev=530474&r1=530473&r2=530474
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java Thu Apr 19 09:24:30 2007
@@ -244,7 +244,8 @@
             List<TreeObject> list = _serversRootNode.getChildren();
             for (TreeObject node : list)
             {
-                if (url.equals(node.getUrl()))
+                ManagedServer nodeServer = (ManagedServer)node.getManagedObject();
+                if (url.equals(nodeServer.getUrl()))
                 {
                     // Server is already in the list of added servers, so now connect it.
                     // Set the server node as selected and then connect it.
@@ -266,7 +267,6 @@
 
         // Server connection is successful. Now add the server in the tree
         TreeObject serverNode = new TreeObject(serverAddress, NODE_TYPE_SERVER);
-        serverNode.setUrl(url);
         serverNode.setManagedObject(managedServer);
         _serversRootNode.addChild(serverNode);
 
@@ -504,6 +504,11 @@
         typeChild = new TreeObject(QUEUE, NODE_TYPE_MBEANTYPE);
         typeChild.setParent(parent);
         typeChild.setVirtualHost(parent.getVirtualHost());
+        
+        // Add common notification node for virtual host
+        TreeObject notificationNode = new TreeObject(NOTIFICATIONS, NOTIFICATIONS);
+        notificationNode.setParent(parent);
+        notificationNode.setVirtualHost(parent.getVirtualHost());
     }
 
     /**
@@ -585,7 +590,10 @@
 
                 // create a node for "type"
                 typeNode = createTypeNode(parentNode, type);
-                typeNode.setVirtualHost(mbean.getVirtualHostName());
+                if (!type.equals(VIRTUAL_HOST))
+                {
+                    typeNode.setVirtualHost(mbean.getVirtualHostName());
+                }
             }
 
             // now type node create becomes the parent node for next node in hierarchy
@@ -641,8 +649,8 @@
 
         // Add notification node
         // TODO: show this only if the mbean sends any notification
-        TreeObject notificationNode = new TreeObject(NOTIFICATION, NOTIFICATION);
-        notificationNode.setParent(mbeanNode);
+        //TreeObject notificationNode = new TreeObject(NOTIFICATION, NOTIFICATION);
+        //notificationNode.setParent(mbeanNode);
     }
 
     private TreeObject createTypeNode(TreeObject parent, String name)
@@ -1044,7 +1052,7 @@
         public Image getImage(Object element)
         {
             TreeObject node = (TreeObject) element;
-            if (node.getType().equals(NOTIFICATION))
+            if (node.getType().equals(NOTIFICATIONS))
             {
                 return ApplicationRegistry.getImage(NOTIFICATION_IMAGE);
             }
@@ -1107,8 +1115,11 @@
             {
                 return 1;
             }
-
-            return 2;
+            if (node.getType().equals(NOTIFICATIONS))
+            {
+                return 2;
+            }
+            return 3;
         }
     }