qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhupend...@apache.org
Subject svn commit: r526709 - in /incubator/qpid/branches/M2/java: distribution/src/main/assembly/ management/eclipse-plugin/META-INF/ management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ management/eclipse-plugin/src/main/resources/sasl/...
Date Mon, 09 Apr 2007 11:02:09 GMT
Author: bhupendrab
Date: Mon Apr  9 04:02:08 2007
New Revision: 526709

URL: http://svn.apache.org/viewvc?view=rev&rev=526709
Log:
QPID-444  : updated the management console dependency configuration for sasl support

Added:
    incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/sasl/
    incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF
Modified:
    incubator/qpid/branches/M2/java/distribution/src/main/assembly/management-eclipse-plugin.xml
    incubator/qpid/branches/M2/java/management/eclipse-plugin/META-INF/MANIFEST.MF
    incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
    incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini

Modified: incubator/qpid/branches/M2/java/distribution/src/main/assembly/management-eclipse-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/distribution/src/main/assembly/management-eclipse-plugin.xml?view=diff&rev=526709&r1=526708&r2=526709
==============================================================================
--- incubator/qpid/branches/M2/java/distribution/src/main/assembly/management-eclipse-plugin.xml
(original)
+++ incubator/qpid/branches/M2/java/distribution/src/main/assembly/management-eclipse-plugin.xml
Mon Apr  9 04:02:08 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/branches/M2/java/management/eclipse-plugin/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/management/eclipse-plugin/META-INF/MANIFEST.MF?view=diff&rev=526709&r1=526708&r2=526709
==============================================================================
--- incubator/qpid/branches/M2/java/management/eclipse-plugin/META-INF/MANIFEST.MF (original)
+++ incubator/qpid/branches/M2/java/management/eclipse-plugin/META-INF/MANIFEST.MF Mon Apr
 9 04:02:08 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/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java?view=diff&rev=526709&r1=526708&r2=526709
==============================================================================
--- incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
(original)
+++ incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
Mon Apr  9 04:02:08 2007
@@ -99,7 +99,7 @@
                 
                 // Now create the instance of JMXMPConnector
                 Security.addProvider(new SaslProvider());
-                jmxUrl = new JMXServiceURL("jmxmp", null, server.getPort());
+                jmxUrl = new JMXServiceURL("jmxmp", server.getHost(), server.getPort());
                 
                 env = new HashMap<String, Object>();
                 env.put("jmx.remote.profiles", "SASL/PLAIN");
@@ -114,12 +114,12 @@
                 Object theObject = cons.newInstance(args);
                 _jmxc = (JMXConnector)theObject;
                 _jmxc.connect();
-                System.out.println("Starting JMXConnector with SASL");
+                System.out.println("Starting JMXConnector with SASL. Server=" + server.getName());
             }
             catch (Exception ex)
             {
                 // When JMXMPConnector is not available
-                System.out.println("Starting JMXConnector");                
+                System.out.println("Starting JMXConnector. Server=" + server.getName());
               
                 jmxUrl = new JMXServiceURL(server.getUrl());
                 _jmxc = JMXConnectorFactory.connect(jmxUrl, null);
             }

Added: incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF?view=auto&rev=526709
==============================================================================
--- incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF
(added)
+++ incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF
Mon Apr  9 04:02:08 2007
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jmxmp Plug-in
+Bundle-SymbolicName: jmxremote.optional
+Bundle-Version: 1.0.1
+Bundle-ClassPath: .
+Bundle-Vendor:
+Bundle-Localization: plugin
+Export-Package: com.sun.jmx.remote.generic,
+ com.sun.jmx.remote.opt.internal,
+ com.sun.jmx.remote.opt.security,
+ com.sun.jmx.remote.opt.util,
+ com.sun.jmx.remote.profile.sasl,
+ com.sun.jmx.remote.profile.tls,
+ com.sun.jmx.remote.protocol.jmxmp,
+ com.sun.jmx.remote.socket,
+ javax.management.remote.generic,
+ javax.management.remote.jmxmp,
+ javax.management.remote.message

Modified: incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini?view=diff&rev=526709&r1=526708&r2=526709
==============================================================================
--- incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini
(original)
+++ incubator/qpid/branches/M2/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini
Mon Apr  9 04:02:08 2007
@@ -22,5 +22,5 @@
 osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui
 eclipse.product=org.apache.qpid.management.ui.product
 eclipse.application=org.apache.qpid.management.ui.application
-osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.core.runtime@start,com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.forms,org.eclipse.ui.workbench
+osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.core.runtime@start,com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.forms,jmxremote.optional,org.eclipse.ui.workbench
 osgi.bundles.defaultStartLevel=4



Mime
View raw message