Author: rob.stryker(a)jboss.com Date: 2011-04-01 13:51:08 -0400 (Fri, 01 Apr 2011) New Revision: 30223 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.classpath trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.project trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.settings/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.settings/org.eclipse.jdt.core.prefs trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/Activator.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$1.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$2.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner$1.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXClassLoaderRepository.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$JMXPollerRunnable.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollerRunnable.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollingSecurityException.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction$1.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ContentProvider.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$LabelProvider.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXSafeRunner.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener$1.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil$CredentialException.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler$1.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/Activator.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXClassLoaderRepository.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXSafeRunner.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.java trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/Activator.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$1.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$2.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner$1.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXClassLoaderRepository.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$JMXPollerRunnable.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollerRunnable.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollingSecurityException.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction$1.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ContentProvider.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$LabelProvider.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXSafeRunner.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener$1.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil$CredentialException.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler$1.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.class trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/maven-archiver/ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/maven-archiver/pom.properties trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/org.jboss.ide.eclipse.as.jmx.integration-0.9.0-SNAPSHOT.jar trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/p2artifacts.xml trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/p2content.xml Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXClassLoaderRepository.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/ASWTPToolsPlugin.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF trunk/as/plugins/pom.xml Log: JBIDE-8670 - new jmx integration plugin Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -4,31 +4,31 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.archives.webtools;singleton:=true Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.wst.common.emfworkbench.integration, +Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", org.jboss.ide.eclipse.archives.core, org.jboss.ide.eclipse.archives.ui, - org.eclipse.wst.server.core;bundle-version="1.1.0", - org.eclipse.wst.server.ui;bundle-version="1.1.0", - org.eclipse.core.resources;bundle-version="3.4.0", - org.eclipse.jdt.core;bundle-version="3.4.0", - org.eclipse.jst.server.core;bundle-version="1.1.0", - org.eclipse.jem.util, - org.eclipse.wst.common.modulecore;bundle-version="1.1.200", - org.apache.ant;bundle-version="1.7.0", + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.wst.server.ui;bundle-version="1.1.305", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.jst.server.core;bundle-version="1.2.101", + org.eclipse.jem.util;bundle-version="2.1.2", + org.eclipse.wst.common.modulecore;bundle-version="1.2.100", + org.apache.ant;bundle-version="1.7.1", org.jboss.ide.eclipse.as.core, - org.eclipse.ui.ide;bundle-version="3.4.0", + org.eclipse.ui.ide;bundle-version="3.7.0", org.jboss.ide.eclipse.as.ui, - org.eclipse.core.filesystem;bundle-version="1.2.0", - org.eclipse.ui.navigator;bundle-version="3.3.100", + org.eclipse.core.filesystem;bundle-version="1.3.100", + org.eclipse.ui.navigator;bundle-version="3.5.0", org.jboss.tools.jmx.core, - org.eclipse.core.variables;bundle-version="3.2.200", + org.eclipse.core.variables;bundle-version="3.2.500", org.jboss.ide.eclipse.as.wtp.core, org.jboss.ide.eclipse.as.wtp.ui, - org.eclipse.emf.common;bundle-version="2.5.0", - org.eclipse.emf.ecore;bundle-version="2.5.0", - org.eclipse.wst.common.modulecore.ui;bundle-version="1.0.0" + org.eclipse.emf.common;bundle-version="2.7.0", + org.eclipse.emf.ecore;bundle-version="2.7.0", + org.eclipse.wst.common.modulecore.ui;bundle-version="1.0.100" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.ide.eclipse.archives.webtools, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -4,14 +4,14 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.as.classpath.core;singleton:=true Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.jdt.core, - org.eclipse.wst.server.core, - org.eclipse.core.resources, - org.eclipse.jdt.launching, - org.eclipse.jst.server.core, - org.eclipse.wst.common.project.facet.core, - org.eclipse.jst.common.project.facet.core, +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.jdt.launching;bundle-version="3.6.0", + org.eclipse.jst.server.core;bundle-version="1.2.101", + org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", + org.eclipse.jst.common.project.facet.core;bundle-version="1.4.200", org.jboss.ide.eclipse.as.core Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.as.classpath.core, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/plugin.xml 2011-04-01 17:51:08 UTC (rev 30223) @@ -8,8 +8,49 @@ id="org.jboss.ide.eclipse.as.classpath.core.ejb3.classpathContainer"/> </extension> + <!-- J2EE Libraries --> + <extension + point="org.eclipse.jdt.core.classpathContainerInitializer"> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer" + id="org.jboss.ide.eclipse.as.classpath.core.j2ee-1.3"> + </classpathContainerInitializer> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE14ClasspathContainerInitializer" + id="org.jboss.ide.eclipse.as.classpath.core.j2ee-1.4"> + </classpathContainerInitializer> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE50ClasspathContainerInitializer" + id="org.jboss.ide.eclipse.as.classpath.core.javaee-5.0"> + </classpathContainerInitializer> + <!-- Legacy ID's --> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer" + id="org.jboss.ide.eclipse.jdt.core.classpath.j2ee-1.3"> + </classpathContainerInitializer> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE14ClasspathContainerInitializer" + id="org.jboss.ide.eclipse.jdt.core.classpath.j2ee-1.4"> + </classpathContainerInitializer> + </extension> + + <!-- + Cannot be enabled before resource change listening is implemented.(max) <extension + point="org.eclipse.jdt.core.classpathContainerInitializer"> + <classpathContainerInitializer + class="org.jboss.ide.eclipse.as.classpath.core.DirectoryLibraryContainerInitializer" + id="org.jboss.ide.eclipse.as.classpath.core.DirectoryLibraryContainer"> + </classpathContainerInitializer> + </extension> + --> + + + <!-- + Items below here must be investigated when adding new server types + --> + <extension point="org.eclipse.wst.common.project.facet.core.runtimes"> <adapter> @@ -93,45 +134,6 @@ id="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer"> </classpathContainerInitializer> </extension> - - - - <!-- J2EE Libraries --> - <extension - point="org.eclipse.jdt.core.classpathContainerInitializer"> - <classpathContainerInitializer - class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer" - id="org.jboss.ide.eclipse.as.classpath.core.j2ee-1.3"> - </classpathContainerInitializer> - <classpathContainerInitializer - class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE14ClasspathContainerInitializer" - id="org.jboss.ide.eclipse.as.classpath.core.j2ee-1.4"> - </classpathContainerInitializer> - <classpathContainerInitializer - class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE50ClasspathContainerInitializer" - id="org.jboss.ide.eclipse.as.classpath.core.javaee-5.0"> - </classpathContainerInitializer> - <!-- Legacy ID's --> - <classpathContainerInitializer - class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer" - id="org.jboss.ide.eclipse.jdt.core.classpath.j2ee-1.3"> - </classpathContainerInitializer> - <classpathContainerInitializer - class="org.jboss.ide.eclipse.as.classpath.core.jee.J2EE14ClasspathContainerInitializer" - id="org.jboss.ide.eclipse.jdt.core.classpath.j2ee-1.4"> - </classpathContainerInitializer> - </extension> - - <!-- - Cannot be enabled before resource change listening is implemented.(max) - <extension - point="org.eclipse.jdt.core.classpathContainerInitializer"> - <classpathContainerInitializer - class="org.jboss.ide.eclipse.as.classpath.core.DirectoryLibraryContainerInitializer" - id="org.jboss.ide.eclipse.as.classpath.core.DirectoryLibraryContainer"> - </classpathContainerInitializer> - </extension> - --> - + </plugin> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -4,15 +4,15 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.as.classpath.ui;singleton:=true Bundle-Version: 2.1.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.classpath.ui.ClasspathUIPlugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, +Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", org.jboss.ide.eclipse.as.classpath.core, org.jboss.ide.eclipse.as.core, - org.eclipse.wst.server.core, - org.eclipse.wst.server.ui, - org.eclipse.jdt.ui, - org.eclipse.jdt.core, - org.eclipse.core.resources + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.wst.server.ui;bundle-version="1.1.305", + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.core.resources;bundle-version="3.7.100" Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -5,29 +5,27 @@ Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.core.JBossServerCorePlugin Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.debug.core, - org.eclipse.jdt.launching, - org.eclipse.jdt.core, - org.eclipse.jst.server.core, - org.eclipse.wst.server.core, - org.eclipse.jst.j2ee, - org.eclipse.wst.xml.core, - org.apache.ant, - org.jboss.tools.jmx.core, - org.eclipse.core.variables, - org.eclipse.jem.util, - org.eclipse.wst.common.emfworkbench.integration, +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.debug.core;bundle-version="3.7.0", + org.eclipse.jdt.launching;bundle-version="3.6.0", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.jst.server.core;bundle-version="1.2.101", + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.jst.j2ee;bundle-version="1.1.500", + org.eclipse.wst.xml.core;bundle-version="1.1.600", + org.apache.ant;bundle-version="1.7.1", + org.eclipse.core.variables;bundle-version="3.2.500", + org.eclipse.jem.util;bundle-version="2.1.2", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", org.jboss.ide.eclipse.as.wtp.core, - org.eclipse.wst.common.project.facet.core, - org.eclipse.wst.common.frameworks, - org.eclipse.jst.jee, - org.eclipse.core.commands + org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", + org.eclipse.wst.common.frameworks;bundle-version="1.2.0", + org.eclipse.jst.jee;bundle-version="1.0.401", + org.eclipse.core.commands;bundle-version="3.6.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.as.core, org.jboss.ide.eclipse.as.core.extensions.descriptors, org.jboss.ide.eclipse.as.core.extensions.events, - org.jboss.ide.eclipse.as.core.extensions.jmx, org.jboss.ide.eclipse.as.core.extensions.polling, org.jboss.ide.eclipse.as.core.modules, org.jboss.ide.eclipse.as.core.publishers, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -19,6 +19,8 @@ import java.util.Iterator; import java.util.List; +import javax.management.MBeanServerConnection; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; @@ -259,4 +261,38 @@ public IJBossServerPublishMethodType[] findPossiblePublishMethods(IServer server) { return findPossiblePublishMethods(server.getServerType()); } + + // API extension + public static interface IServerJMXRunnable { + public void run(MBeanServerConnection connection) throws Exception; + } + + public static interface IServerJMXRunner { + public void run(IServer server, IServerJMXRunnable runnable) throws CoreException; + public void beginTransaction(IServer server, Object lock); + public void endTransaction(IServer server, Object lock); + } + + private IServerJMXRunner jmxRunner = null; + private Object JMX_RUNNER_NOT_FOUND = null; + public IServerJMXRunner getJMXRunner() { + if( jmxRunner != null ) + return this.jmxRunner; + if( JMX_RUNNER_NOT_FOUND != null) + return null; + + // find runner + IExtensionRegistry registry = Platform.getExtensionRegistry(); + IConfigurationElement[] cf = registry.getConfigurationElementsFor(JBossServerCorePlugin.PLUGIN_ID, "pollers"); //$NON-NLS-1$ + for( int i = 0; i < cf.length; i++ ) { + try { + Object o = cf[i].createExecutableExtension("class"); //$NON-NLS-1$ + if( o != null && (o instanceof IServerJMXRunner)) + return ((IServerJMXRunner)o); + } catch(Exception e) { + } + } + JMX_RUNNER_NOT_FOUND = new Object(); + return null; + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -15,8 +15,10 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; +import org.eclipse.core.runtime.Status; import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework; import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent; import org.eclipse.wst.server.core.IServer; @@ -92,6 +94,21 @@ return JBossServerCorePlugin.getDefault().getStateLocation().append(".global"); //$NON-NLS-1$ } + public static void log(IStatus status) { + getDefault().getLog().log(status); + } + public static void log(int severity, String message, Throwable e) { + log(new Status(severity, PLUGIN_ID, 0, message, e)); + } + + public static void log(Throwable e) { + log(e.getMessage(), e); + } + + public static void log(String message, Throwable e) { + log(IStatus.ERROR, message, e); + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathCategory.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; -import org.jboss.tools.jmx.core.IMemento; +import org.jboss.ide.eclipse.as.core.util.internal.IMemento; /** * A class representing an XPath Category, which Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -38,8 +38,8 @@ import org.jboss.ide.eclipse.as.core.util.IConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.ServerUtil; -import org.jboss.tools.jmx.core.IMemento; -import org.jboss.tools.jmx.core.util.XMLMemento; +import org.jboss.ide.eclipse.as.core.util.internal.IMemento; +import org.jboss.ide.eclipse.as.core.util.internal.XMLMemento; /** * The class representing the model for all xpath storage and searching Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -24,7 +24,7 @@ import org.jaxen.XPath; import org.jaxen.dom4j.Dom4jXPath; import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode; -import org.jboss.tools.jmx.core.IMemento; +import org.jboss.ide.eclipse.as.core.util.internal.IMemento; /** * A simple value object to hold the XPath query data Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -33,6 +33,12 @@ public static final int JMXPOLLER_CODE = POLLING_CODE | (2 << 16); public static final int BEHAVIOR_STATE_CODE = POLLING_CODE | (3 << 16); + + public static final int STATE_STARTED = 1; + public static final int STATE_STOPPED = 0; + public static final int STATE_TRANSITION = 2; + + // Polling.Behavior Codes public static final int BEHAVIOR_PROCESS_TERMINATED = BEHAVIOR_STATE_CODE | 1; public static final int BEHAVIOR_FORCE_STOP = BEHAVIOR_STATE_CODE | 2; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -1,179 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.ide.eclipse.as.core.extensions.jmx; - -import java.io.IOException; - -import javax.management.MBeanServerConnection; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerListener; -import org.eclipse.wst.server.core.ServerEvent; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.server.IDeployableServer; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; -import org.jboss.tools.jmx.core.ExtensionManager; -import org.jboss.tools.jmx.core.IConnectionProvider; -import org.jboss.tools.jmx.core.IConnectionProviderListener; -import org.jboss.tools.jmx.core.IConnectionWrapper; -import org.jboss.tools.jmx.core.IJMXRunnable; -import org.jboss.tools.jmx.core.JMXException; -import org.jboss.tools.jmx.core.tree.ErrorRoot; -import org.jboss.tools.jmx.core.tree.NodeUtils; -import org.jboss.tools.jmx.core.tree.Root; - -public class JBossServerConnection implements IConnectionWrapper, IServerListener, IConnectionProviderListener { - private IServer server; - private Root root; - private boolean isConnected; - private boolean isLoading; - public JBossServerConnection(IServer server) { - this.server = server; - this.isConnected = false; - this.isLoading = false; - checkState(); // prime the state - ((JBossServerConnectionProvider)getProvider()).addListener(this); - server.addServerListener(this); - } - - public void connect() throws IOException { - // Not supported - } - - public void disconnect() throws IOException { - // Not supported - } - - public IConnectionProvider getProvider() { - return ExtensionManager.getProvider(JBossServerConnectionProvider.PROVIDER_ID); - } - - public Root getRoot() { - return root; - } - - public void loadRoot(IProgressMonitor monitor) { - if( isConnected() && !isLoading) { - isLoading = true; - // saferunner just adds itself as a concern and then removes, after each call. - // This will ensure the classloader does not need to make multiple loads - JMXClassLoaderRepository.getDefault().addConcerned(server, this); - try { - if( root == null ) { - root = NodeUtils.createObjectNameTree(this, monitor); - } - } catch( CoreException ce ) { - IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ce.getMessage(), ce); - JBossServerCorePlugin.getDefault().getLog().log(status); - root = new ErrorRoot(); - } finally { - JMXClassLoaderRepository.getDefault().removeConcerned(server, this); - isLoading = false; - } - } - } - - public boolean isConnected() { - return isConnected; - } - - public void run(IJMXRunnable runnable) throws JMXException { - // do nothing if the server is down. - if( server.getServerState() != IServer.STATE_STARTED ) - return; - JMXSafeRunner.run(server, runnable); - } - - public String getName() { - return server.getName(); - } - - - /* ************** - * If there's a change in teh server state, then set my connection - * state properly. If there's been a change then fire to teh listeners - */ - - public void serverChanged(ServerEvent event) { - int eventKind = event.getKind(); - if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) { - // server change event - if ((eventKind & ServerEvent.STATE_CHANGE) != 0) { - new Job("Connecting to " + event.getServer().getName() + " via JMX") { //$NON-NLS-1$ //$NON-NLS-2$ - @Override - protected IStatus run(IProgressMonitor monitor) { - checkState(); - return Status.OK_STATUS; - } - }.schedule(); - } - } - } - - protected void checkState() { - IDeployableServer jbs = ServerConverter.getDeployableServer(server); - if( server.getServerState() == IServer.STATE_STARTED && jbs != null && jbs.hasJMXProvider()) { - try { - JMXSafeRunner.run(server, new IJMXRunnable() { - public void run(MBeanServerConnection connection) - throws Exception { - // Do nothing, just see if the connection worked - } - }); - if( !isConnected ) { - isConnected = true; - ((JBossServerConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this); - } - } catch( Exception jmxe ) { - // I thought i was connected but I'm not. - if( isConnected ) { - isConnected = false; - ((JBossServerConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this); - } - } - } else { - root = null; - if( isConnected ) { - // server is not in STATE_STARTED, but thinks its connected - isConnected = false; - ((JBossServerConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this); - } - } - } - - - - /* ************* - * The following three methods are just here so that this class - * is removed as a listener to the server if it is removed - */ - - public void connectionAdded(IConnectionWrapper connection) { - // ignore - } - - public void connectionChanged(IConnectionWrapper connection) { - // ignore - } - - public void connectionRemoved(IConnectionWrapper connection) { - server.removeServerListener(this); - } - - public boolean canControl() { - return false; - } -} \ No newline at end of file Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -1,198 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.ide.eclipse.as.core.extensions.jmx; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerLifecycleListener; -import org.eclipse.wst.server.core.ServerCore; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.Messages; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; -import org.jboss.tools.jmx.core.ExtensionManager; -import org.jboss.tools.jmx.core.IConnectionProvider; -import org.jboss.tools.jmx.core.IConnectionProviderListener; -import org.jboss.tools.jmx.core.IConnectionWrapper; -import org.jboss.tools.jmx.core.IJMXRunnable; -import org.jboss.tools.jmx.core.JMXException; - -public class JBossServerConnectionProvider implements IConnectionProvider, IServerLifecycleListener { - public static final String PROVIDER_ID = "org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider"; //$NON-NLS-1$ - - public static JBossServerConnectionProvider getProvider() { - return (JBossServerConnectionProvider)ExtensionManager.getProvider(PROVIDER_ID); - } - - public static JBossServerConnection getConnection(IServer s) { - return (JBossServerConnection)getProvider().findConnection(s); - } - - // Run this action on the server. - // If the connection doesn't exist, make a new one - public static void run(IServer s, IJMXRunnable r) throws JMXException { - JBossServerConnection c = getConnection(s); - if( c != null ) - // JMX is not installed here - c.run(r); - } - - - private ArrayList<IConnectionProviderListener> listeners = - new ArrayList<IConnectionProviderListener>(); - - private HashMap<String, JBossServerConnection> idToConnection; - public JBossServerConnectionProvider() { - ServerCore.addServerLifecycleListener(this); - } - - protected boolean belongsHere(IServer server) { - return ServerConverter.getJBossServer(server) != null; - } - - protected JBossServerConnection createConnection(IServer server) { - return new JBossServerConnection(server); - } - - public void serverAdded(IServer server) { - if( belongsHere(server)) { - getConnections(); - if( !idToConnection.containsKey(server.getId())) { - JBossServerConnection connection = createConnection(server); - idToConnection.put(server.getId(), connection); - } - fireAdded(idToConnection.get(server.getId())); - } - } - - public void serverChanged(IServer server) { - if( belongsHere(server)) { - getConnections(); - if( !idToConnection.containsKey(server.getId())) { - JBossServerConnection connection = createConnection(server); - idToConnection.put(server.getId(), connection); - } - fireAdded(idToConnection.get(server.getId())); - } - } - - public void serverRemoved(IServer server) { - if( belongsHere(server)) { - JBossServerConnection connection; - if( idToConnection != null ) { - connection = idToConnection.get(server.getId()); - if( connection != null ) { - idToConnection.remove(server.getId()); - fireRemoved(connection); - } - } else { - // hasn't been initialized yet - getConnections(); - - // but now its missing from the collection, so make one up - fireRemoved(createConnection(server)); - } - } - } - - public IConnectionWrapper findConnection(IServer s) { - getConnections(); - return idToConnection.get(s.getId()); - } - - public IConnectionWrapper[] getConnections() { - // do it all on demand right now - if( idToConnection == null ) { - // load them all - idToConnection = new HashMap<String, JBossServerConnection>(); - IServer[] allServers = ServerCore.getServers(); - JBossServerConnection c; - for( int i = 0; i < allServers.length; i++ ) { - if( belongsHere(allServers[i])) { - c = createConnection(allServers[i]); - if( c != null ) - idToConnection.put(allServers[i].getId(), c); - } - } - } - ArrayList<JBossServerConnection> list = new ArrayList<JBossServerConnection>(); - list.addAll(idToConnection.values()); - return list.toArray(new JBossServerConnection[list.size()]); - } - - public String getName(IConnectionWrapper wrapper) { - if( wrapper instanceof JBossServerConnection) { - return ((JBossServerConnection)wrapper).getName(); - } - return null; - } - - public String getId() { - return PROVIDER_ID; - } - - public void addListener(IConnectionProviderListener listener) { - if( !listeners.contains(listener)) - listeners.add(listener); - } - - public void removeListener(IConnectionProviderListener listener) { - listeners.remove(listener); - } - - void fireAdded(IConnectionWrapper wrapper) { - for(Iterator<IConnectionProviderListener> i = listeners.iterator(); i.hasNext();) - try { - i.next().connectionAdded(wrapper); - } catch(RuntimeException re) {} - } - - void fireChanged(IConnectionWrapper wrapper) { - for(Iterator<IConnectionProviderListener> i = listeners.iterator(); i.hasNext();) - try { - i.next().connectionChanged(wrapper); - } catch(RuntimeException re) {} - } - - void fireRemoved(IConnectionWrapper wrapper) { - for(Iterator<IConnectionProviderListener> i = listeners.iterator(); i.hasNext();) - try { - i.next().connectionRemoved(wrapper); - } catch(RuntimeException re) {} - } - public boolean canCreate() { - return false; - } - - @SuppressWarnings(value={"unchecked"}) - public IConnectionWrapper createConnection(Map map) throws CoreException { - throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, Messages.NotSupported, null)); - } - - public void addConnection(IConnectionWrapper connection) { - // Not Supported - } - public void removeConnection(IConnectionWrapper connection) { - // Not Supported - } - public boolean canDelete(IConnectionWrapper wrapper) { - return false; - } - public void connectionChanged(IConnectionWrapper connection) { - // do nothing - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXClassLoaderRepository.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXClassLoaderRepository.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXClassLoaderRepository.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -1,134 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.ide.eclipse.as.core.extensions.jmx; - -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.HashMap; - -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.server.core.IRuntime; -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.Messages; -import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; - -/** - * A repository for classloaders that relate to servers, - * specifically jmx. It basically loads teh jboss-clientall.jar. - * - * - * @author Rob Stryker - * - */ -public class JMXClassLoaderRepository { - protected static JMXClassLoaderRepository instance; - public static JMXClassLoaderRepository getDefault() { - if( instance == null ) { - instance = new JMXClassLoaderRepository(); - } - return instance; - } - - protected HashMap<String, ClassLoader> idToLoader; - protected HashMap<String, ArrayList<Object>> idToConcerned; - protected JMXClassLoaderRepository() { - idToLoader = new HashMap<String, ClassLoader>(); - idToConcerned = new HashMap<String, ArrayList<Object>>(); - } - - /** - * Add a concerned citizen to the list of said citizens. - * These are people who may at any time ask to access - * the classloader. - * - * @param server - * @param concerned - */ - public void addConcerned(IServer server, Object concerned) { - ArrayList<Object> list = idToConcerned.get(server.getId()); - if( list == null ) { - list = new ArrayList<Object>(); - idToConcerned.put(server.getId(), list); - } - if( !list.contains(concerned)) - list.add(concerned); - } - - /** - * Removes an element from the list of concerned citizens. - * If no one cares about this server any longer, remove - * its classloader cache and forget about it. - * - * @param server - * @param concerned - */ - public void removeConcerned(IServer server, Object concerned) { - ArrayList<Object> list = idToConcerned.get(server.getId()); - if( list != null ) { - list.remove(concerned); - if( list.size() == 0 ) { - idToConcerned.remove(server.getId()); - idToLoader.remove(server.getId()); - } - } - } - - /** - * Get the classloader for some server. - * If there are 0 concerned citizens, null should be returned. - * @param server - * @return - */ - public ClassLoader getClassLoader(IServer server) { - ClassLoader loader = idToLoader.get(server.getId()); - if( loader == null && anyoneCares(server)) { - loadClassLoader(server); - } - return idToLoader.get(server.getId()); - } - - /** - * Actually create and store the classloader - * @param s - */ - protected void loadClassLoader(IServer s) { - try { - IRuntime rt = s.getRuntime(); - IPath loc = rt.getLocation(); - URL url = loc.append(IJBossServerConstants.CLIENT).append(IJBossServerConstants.JBOSSALL_CLIENT_JAR) - .toFile().toURI().toURL(); - URLClassLoader loader = new URLClassLoader(new URL[] { url, }, - Thread.currentThread().getContextClassLoader()); - idToLoader.put(s.getId(), loader); - } catch (MalformedURLException murle) { - JBossServerCorePlugin.getDefault().getLog().log( - new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, - NLS.bind(Messages.loadJMXClassesFailed, s.getName()), murle)); - } - } - - /** - * Are there any concerned citizens for this server? - * @param server - * @return - */ - protected boolean anyoneCares(IServer server) { - ArrayList<Object> list = idToConcerned.get(server.getId()); - if( list != null && list.size() > 0 ) return true; - return false; - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.ide.eclipse.as.core.extensions.jmx; - -import java.util.Properties; - -import javax.management.MBeanServerConnection; -import javax.naming.InitialContext; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; -import org.jboss.tools.jmx.core.IJMXRunnable; -import org.jboss.tools.jmx.core.JMXException; - -public class JMXSafeRunner { - private String user, pass; - private IServer server; - - public JMXSafeRunner(IServer s) { - this.server = s; - user = ServerConverter.getJBossServer(s).getUsername(); - pass = ServerConverter.getJBossServer(s).getPassword(); - } - - public void setUser(String user) { - this.user = user; - } - public void setPass(String pass) { - this.pass = pass; - } - - public void run(IJMXRunnable r) throws CoreException { - run(server,r,user,pass); - } - - public static void run(IServer s, IJMXRunnable r) throws JMXException { - String user = ServerConverter.getJBossServer(s).getUsername(); - String pass = ServerConverter.getJBossServer(s).getPassword(); - run(s,r,user,pass); - } - - public static void run(IServer s, IJMXRunnable r, String user, String pass) throws JMXException { - JMXClassLoaderRepository.getDefault().addConcerned(s, r); - ClassLoader currentLoader = Thread.currentThread() - .getContextClassLoader(); - ClassLoader newLoader = JMXClassLoaderRepository.getDefault() - .getClassLoader(s); - Thread.currentThread().setContextClassLoader(newLoader); - InitialContext ic = null; - try { - JMXUtil.setCredentials(s,user,pass); - Properties p = JMXUtil.getDefaultProperties(s); - ic = new InitialContext(p); - Object obj = ic.lookup(IJBossRuntimeConstants.RMIAdaptor); - ic.close(); - if (obj instanceof MBeanServerConnection) { - MBeanServerConnection connection = (MBeanServerConnection) obj; - r.run(connection); - } - } catch( Exception e ) { - throw new JMXException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, - e.getMessage() == null ? e.getClass().getName() : e.getMessage(), e)); - } finally { - JMXClassLoaderRepository.getDefault().removeConcerned(s, r); - Thread.currentThread().setContextClassLoader(currentLoader); - } - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXUtil.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -1,123 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.ide.eclipse.as.core.extensions.jmx; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.security.Principal; -import java.util.Properties; - -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; - -/** - * Utility class - * - * @author Rob Stryker rob.stryker(a)redhat.com - * - */ -public class JMXUtil { - - /** - * In the current thread, set the credentials from some server - * - * @param server - */ - public static void setCredentials(IServer server) - throws CredentialException { - String user = ServerConverter.getJBossServer(server).getUsername(); - String pass = ServerConverter.getJBossServer(server).getPassword(); - setCredentials(server, user, pass); - } - - public static void setCredentials(IServer server, Object principal, - Object credential) throws CredentialException { - Exception temp = null; - try { - // get our methods - Class simplePrincipal = Thread.currentThread() - .getContextClassLoader().loadClass( - IJBossServerConstants.CLASS_SIMPLE_PRINCIPAL); - Class securityAssoc = Thread.currentThread() - .getContextClassLoader().loadClass( - IJBossServerConstants.CLASS_SECURITY_ASSOCIATION); - securityAssoc.getMethods(); // force-init the methods since the - // class hasn't been initialized yet. - - Constructor newSimplePrincipal = simplePrincipal - .getConstructor(new Class[] { String.class }); - Object newPrincipalInstance = newSimplePrincipal - .newInstance(new Object[] { principal }); - - // set the principal - Method setPrincipalMethod = securityAssoc.getMethod( - IJBossServerConstants.METHOD_SET_PRINCIPAL, - new Class[] { Principal.class }); - setPrincipalMethod.invoke(null, - new Object[] { newPrincipalInstance }); - - // set the credential - Method setCredentialMethod = securityAssoc.getMethod( - IJBossServerConstants.METHOD_SET_CREDENTIAL, - new Class[] { Object.class }); - setCredentialMethod.invoke(null, new Object[] { credential }); - } catch (ClassNotFoundException e) { - temp = e; - } catch (SecurityException e) { - temp = e; - } catch (NoSuchMethodException e) { - temp = e; - } catch (IllegalArgumentException e) { - temp = e; - } catch (InstantiationException e) { - temp = e; - } catch (IllegalAccessException e) { - temp = e; - } catch (InvocationTargetException e) { - temp = e; - } - if( temp != null ) - throw new CredentialException(temp); - } - - public static class CredentialException extends Exception { - private static final long serialVersionUID = 1L; - protected Exception wrapped; - - public CredentialException(Exception wrapped) { - this.wrapped = wrapped; - } - - public Exception getWrapped() { - return wrapped; - } - } - - public static Properties getDefaultProperties(IServer server) { - JBossServer jbs = ServerConverter.getJBossServer(server); - Properties props = new Properties(); - if( jbs != null ) { - - int port = jbs.getJNDIPort(); - props.put(IJBossServerConstants.NAMING_FACTORY_KEY, - IJBossServerConstants.NAMING_FACTORY_VALUE); - props.put(IJBossServerConstants.NAMING_FACTORY_PKGS, - IJBossServerConstants.NAMING_FACTORY_INTERFACES); - props.put(IJBossServerConstants.NAMING_FACTORY_PROVIDER_URL, - "jnp://" + jbs.getHost() + ":" + port); //$NON-NLS-1$ //$NON-NLS-2$ - props.put(IJBossServerConstants.JNP_DISABLE_DISCOVERY, new Boolean(true).booleanValue()); - } - return props; - } -} Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/JMXPoller.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -1,252 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ - -package org.jboss.ide.eclipse.as.core.extensions.polling; - -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.naming.CommunicationException; -import javax.naming.NamingException; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.server.core.IServer; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.Messages; -import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; -import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; -import org.jboss.ide.eclipse.as.core.extensions.jmx.JMXClassLoaderRepository; -import org.jboss.ide.eclipse.as.core.extensions.jmx.JMXSafeRunner; -import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; -import org.jboss.ide.eclipse.as.core.server.internal.PollThread; -import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; -import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; -import org.jboss.tools.jmx.core.IJMXRunnable; - -/** - * A poller dedicated to server startup, checks via JMX - * @author Rob rob.stryker(a)redhat.com - * - */ -public class JMXPoller implements IServerStatePoller { - - public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller"; //$NON-NLS-1$ - public static final int JMXPOLLER_CODE = IEventCodes.JMXPOLLER_CODE; - public static final Properties IGNORED_PROPERTIES = new Properties(); - - public static final String REQUIRED_USER = "org.jboss.ide.eclipse.as.core.extensions.polling.jmx.REQUIRED_USER"; //$NON-NLS-1$ - public static final String REQUIRED_PASS = "org.jboss.ide.eclipse.as.core.extensions.polling.jmx.REQUIRED_PASS"; //$NON-NLS-1$ - - public static final int STATE_STARTED = 1; - public static final int STATE_STOPPED = 0; - public static final int STATE_TRANSITION = 2; - - private int started; - private boolean canceled, done; - private boolean waitingForCredentials = false; - private boolean ceFound,nnfeFound,startingFound; - - - private IServer server; - private ServerStatePollerType type; - private PollingException pollingException = null; - private RequiresInfoException requiresInfoException = null; - private Properties requiredPropertiesReturned = null; - - private JMXPollerRunnable runnable; - private JMXSafeRunner runner; - - public void beginPolling(IServer server, boolean expectedState, - PollThread pt) { - ceFound = nnfeFound = startingFound = canceled = done = false; - this.server = server; - launchJMXPoller(); - } - - private class JMXPollerRunnable implements IJMXRunnable { - public void run(MBeanServerConnection connection) throws Exception { - Object attInfo = connection.getAttribute( - new ObjectName(IJBossRuntimeConstants.SYSTEM_MBEAN), - IJBossRuntimeConstants.STARTED_METHOD); - boolean b = ((Boolean) attInfo).booleanValue(); - started = b ? STATE_STARTED : STATE_TRANSITION; - done = b; - if( !startingFound ) { - startingFound = true; - IStatus s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID, - JMXPOLLER_CODE|started, Messages.ServerStarting, null); - log(s); - } - } - } - - private class PollerRunnable implements Runnable { - public void run() { - JMXClassLoaderRepository.getDefault().addConcerned(server, this); - runnable = new JMXPollerRunnable(); - runner = new JMXSafeRunner(server); - while( !done && !canceled) { - try { - runner.run(runnable); - } catch(CoreException ce) { - handleException(ce.getCause()); - } - - try { Thread.sleep(500);} - catch (InterruptedException e) {} - } - JMXClassLoaderRepository.getDefault().removeConcerned(server, this); - } - - protected void handleException(Throwable t) { - if( t instanceof SecurityException ) { - synchronized(this) { - if( !waitingForCredentials ) { - waitingForCredentials = true; - requiresInfoException = new PollingSecurityException( - NLS.bind(Messages.securityException, t.getMessage())); - } else { - // we're waiting. are they back yet? - if( requiredPropertiesReturned != null ) { - if( requiredPropertiesReturned == IGNORED_PROPERTIES) { - requiresInfoException = null; - done = true; - started = STATE_STARTED; - } else { - requiresInfoException = null; - String user, pass; - user = (String)requiredPropertiesReturned.get(REQUIRED_USER); - pass = (String)requiredPropertiesReturned.get(REQUIRED_PASS); - requiredPropertiesReturned = null; - runner.setUser(user); - runner.setPass(pass); - waitingForCredentials = false; - } - } - } - } - return; - } - - if( t instanceof CommunicationException ) { - started = STATE_STOPPED; - if( !ceFound ) { - ceFound = true; - IStatus s = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, JMXPOLLER_CODE|started, t.getMessage(), t); - log(s); - } - return; - } - - if( t instanceof NamingException ) { - started = STATE_STOPPED; - if( !nnfeFound ) { - nnfeFound = true; - IStatus s = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, JMXPOLLER_CODE|started, t.getMessage(), t); - log(s); - } - return; - } - - if( t != null ) { - pollingException = new PollingException(t.getMessage()); - done = true; - } - } - } - - - private void launchJMXPoller() { - PollerRunnable run = new PollerRunnable(); - Thread t = new Thread(run, Messages.JMXPoller); - t.start(); - } - - public void cancel(int type) { - canceled = true; - } - - public void cleanup() { - } - - public class PollingSecurityException extends RequiresInfoException { - private static final long serialVersionUID = 1L; - public PollingSecurityException(String msg) { - super(msg); - } - } - - public boolean getState() throws PollingException, RequiresInfoException { - if (pollingException != null) - throw pollingException; - if( requiresInfoException != null ) - throw requiresInfoException; - - if (started == 0) - return SERVER_DOWN; - if (started == 1) - return SERVER_UP; - - if (!done && !canceled) - return SERVER_DOWN; // Not there yet. - - return SERVER_UP; // done or canceled, doesnt matter - } - - public boolean isComplete() throws PollingException, RequiresInfoException { - if (pollingException != null) - throw pollingException; - if( requiresInfoException != null ) - throw requiresInfoException; - return done; - } - - public void failureHandled(Properties properties) { - if( properties == null ) { - requiredPropertiesReturned = IGNORED_PROPERTIES; - } else - requiredPropertiesReturned = properties; - } - - public List<String> getRequiredProperties() { - ArrayList<String> list = new ArrayList<String>(); - list.add(REQUIRED_USER); - list.add(REQUIRED_PASS); - return list; - } - - public ServerStatePollerType getPollerType() { - return type; - } - - public void setPollerType(ServerStatePollerType type) { - this.type = type; - } - - public IServer getServer() { - return server; - } - - public int getTimeoutBehavior() { - return TIMEOUT_BEHAVIOR_SUCCEED; - } - - private void log(IStatus s) { - if( !canceled ) - ServerLogger.getDefault().log(server,s); - } -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -22,26 +22,21 @@ import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.IDebugEventSetListener; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.model.IProcess; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.ExtensionManager.IServerJMXRunnable; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; -import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider; -import org.jboss.ide.eclipse.as.core.extensions.jmx.JMXClassLoaderRepository; import org.jboss.ide.eclipse.as.core.extensions.polling.ProcessTerminatedPoller.IProcessProvider; import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior.JBossBehaviourDelegate; -import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossServerStartupLaunchUtil; import org.jboss.ide.eclipse.as.core.server.internal.launch.StopLaunchConfiguration; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; -import org.jboss.tools.jmx.core.IJMXRunnable; -import org.jboss.tools.jmx.core.JMXException; /** * @@ -174,16 +169,16 @@ public void publishStart(final IProgressMonitor monitor) throws CoreException { - if( shouldSuspendScanner()) { - JMXClassLoaderRepository.getDefault().addConcerned(getServer(), this); - IJMXRunnable r = new IJMXRunnable() { + if( shouldSuspendScanner() ) { + ExtensionManager.getDefault().getJMXRunner().beginTransaction(getServer(), this); + IServerJMXRunnable r = new IServerJMXRunnable() { public void run(MBeanServerConnection connection) throws Exception { suspendDeployment(connection, monitor); } }; try { - JBossServerConnectionProvider.run(getServer(), r); - } catch( JMXException jmxe ) { + ExtensionManager.getDefault().getJMXRunner().run(getServer(), r); + } catch( CoreException jmxe ) { IStatus status = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.SUSPEND_DEPLOYMENT_SCANNER, Messages.JMXPauseScannerError, jmxe); ServerLogger.getDefault().log(getServer(), status); } @@ -192,24 +187,25 @@ public void publishFinish(final IProgressMonitor monitor) throws CoreException { if( shouldSuspendScanner()) { - IJMXRunnable r = new IJMXRunnable() { + IServerJMXRunnable r = new IServerJMXRunnable() { public void run(MBeanServerConnection connection) throws Exception { resumeDeployment(connection, monitor); } }; try { - JBossServerConnectionProvider.run(getServer(), r); - } catch( JMXException jmxe ) { + ExtensionManager.getDefault().getJMXRunner().run(getServer(), r); + } catch( CoreException jmxe ) { IStatus status = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.RESUME_DEPLOYMENT_SCANNER, Messages.JMXResumeScannerError, jmxe); ServerLogger.getDefault().log(getServer(), status); } finally { - JMXClassLoaderRepository.getDefault().removeConcerned(getServer(), this); + ExtensionManager.getDefault().getJMXRunner().endTransaction(getServer(), this); } } } protected boolean shouldSuspendScanner() { - return getActualBehavior().shouldSuspendScanner(); + return getActualBehavior().shouldSuspendScanner() && + ExtensionManager.getDefault().getJMXRunner() != null; } protected void suspendDeployment(final MBeanServerConnection connection, IProgressMonitor monitor) throws Exception { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -11,31 +11,12 @@ package org.jboss.ide.eclipse.as.core.server.internal; import java.io.File; -import java.net.URI; -import java.util.ArrayList; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerEvent; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; -import org.jboss.ide.eclipse.as.core.Messages; -import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; -import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; -import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider; -import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; import org.jboss.ide.eclipse.as.core.server.UnitedServerListener; import org.jboss.ide.eclipse.as.core.util.FileUtil; -import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.ServerUtil; -import org.jboss.tools.jmx.core.IJMXRunnable; -import org.jboss.tools.jmx.core.JMXException; public class ServerListener extends UnitedServerListener { private static ServerListener instance; @@ -56,98 +37,4 @@ File f = JBossServerCorePlugin.getServerStateLocation(server).toFile(); FileUtil.safeDelete(f); } - - public void serverChanged(ServerEvent event) { - IServer server = event.getServer(); - JBossServer jbs = (JBossServer)server.loadAdapter(JBossServer.class, new NullProgressMonitor()); - if( jbs != null && jbs.hasJMXProvider()) { - int eventKind = event.getKind(); - if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) { - // server change event - if ((eventKind & ServerEvent.STATE_CHANGE) != 0) { - if( event.getServer().getServerState() == IServer.STATE_STARTED ) { - String[] folders = getDeployLocationFolders(server); - if( folders.length > 0 ) - doDeploymentAddition(event, folders); - } - } - } - } - } - - protected void doDeploymentAddition(final ServerEvent event, final String[] folders) { - IJMXRunnable r = new IJMXRunnable() { - public void run(MBeanServerConnection connection) throws Exception { - ensureDeployLocationAdded(event.getServer(), connection, folders); - } - }; - try { - JBossServerConnectionProvider.run(event.getServer(), r); - } catch( JMXException jmxe ) { - IStatus s = jmxe.getStatus(); - IStatus newStatus = new Status(s.getSeverity(), s.getPlugin(), IEventCodes.ADD_DEPLOYMENT_FOLDER_FAIL, - Messages.AddingJMXDeploymentFailed, s.getException()); - ServerLogger.getDefault().log(event.getServer(), newStatus); - } - } - - protected String[] getDeployLocationFolders(IServer server) { - JBossServer ds = ServerConverter.getJBossServer(server); - ArrayList<String> folders = new ArrayList<String>(); - // add the server folder deploy loc. first - String insideServer = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_SERVER); - String metadata = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_METADATA); - String custom = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_CUSTOM); - String type = ds.getDeployLocationType(); - String serverHome = null; - if (server != null && server.getRuntime()!= null && server.getRuntime().getLocation() != null) { - serverHome = server.getRuntime().getLocation().toString(); - } - folders.add(insideServer); - if( type.equals(JBossServer.DEPLOY_METADATA) && !folders.contains(metadata)) - folders.add(metadata); - if( type.equals(JBossServer.DEPLOY_CUSTOM) && !folders.contains(custom) && !custom.equals(serverHome)) - folders.add(custom); - - IModule[] modules2 = org.eclipse.wst.server.core.ServerUtil.getModules(server.getServerType().getRuntimeType().getModuleTypes()); - if (modules2 != null) { - int size = modules2.length; - for (int i = 0; i < size; i++) { - IModule[] module = new IModule[] { modules2[i] }; - IStatus status = server.canModifyModules(module, null, null); - if (status != null && status.getSeverity() != IStatus.ERROR) { - String tempFolder = PublishUtil.getDeployRootFolder(module, ds).toString(); - if( !folders.contains(tempFolder)) - folders.add(tempFolder); - } - } - } - folders.remove(insideServer); // doesn't need to be added to deployment scanner - String[] folders2 = (String[]) folders.toArray(new String[folders.size()]); - return folders2; - } - - protected void ensureDeployLocationAdded(IServer server, MBeanServerConnection connection) throws Exception { - String[] folders2 = getDeployLocationFolders(server); - ensureDeployLocationAdded(server, connection, folders2); - } - - protected void ensureDeployLocationAdded(IServer server, - MBeanServerConnection connection, String[] folders2) throws Exception { - for( int i = 0; i < folders2.length; i++ ) { - String asURL = encode(folders2[i]); - ObjectName name = new ObjectName(IJBossRuntimeConstants.DEPLOYMENT_SCANNER_MBEAN_NAME); - connection.invoke(name, IJBossRuntimeConstants.addURL, new Object[] { asURL }, new String[] {String.class.getName()}); - } - } - - private String encode(String folder) throws Exception { - folder = folder.replace("\\", "/"); //$NON-NLS-1$//$NON-NLS-2$ - if (! folder.startsWith("/")) { //$NON-NLS-1$ - folder = "/" + folder; //$NON-NLS-1$ - } - URI uri = new URI("file", null, folder, null); //$NON-NLS-1$ - //return URLEncoder.encode(uri.toASCIIString()); - return uri.toASCIIString(); - } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -28,10 +28,9 @@ import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; -import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; -import org.jboss.tools.jmx.core.IMemento; -import org.jboss.tools.jmx.core.util.XMLMemento; +import org.jboss.ide.eclipse.as.core.util.internal.IMemento; +import org.jboss.ide.eclipse.as.core.util.internal.XMLMemento; public class DeploymentPreferenceLoader { public static final String DEPLOYMENT_PREFERENCES_KEY = "org.jboss.ide.eclipse.as.core.util.deploymentPreferenceKey"; //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -10,10 +10,15 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.util; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.File; import java.io.FileFilter; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.ArrayList; import java.util.Date; @@ -165,4 +170,111 @@ } } + + public static void copyDir(File from, File to) { + copyDir(from, to, false); + } + + public static void copyDir(File from, File to, boolean mkdirs) { + copyDir(from, to, mkdirs, true); + } + + public static void copyDir(File from, File to, boolean mkdirs, boolean includeSubdirs) { + copyDir(from, to, includeSubdirs, mkdirs, false); + } + + public static void copyDir(File from, boolean includeSubdirs, File to) { + copyDir(from, to, includeSubdirs, false, false); + } + + public static void copyDir(File from, File to, boolean includeSubdirs, boolean mkdirs, boolean overwriteOnlyOlderFiles) { + copyDir(from, to, includeSubdirs, mkdirs, overwriteOnlyOlderFiles, null); + } + + public static void copyDir(File from, File to, boolean includeSubdirs, boolean mkdirs, boolean overwriteOnlyOlderFiles, FileFilter filter) { + if(filter != null && !filter.accept(from)) return; + if (mkdirs) to.mkdirs(); + if(from == null || !from.isDirectory() || !to.isDirectory()) return; + File[] fs = from.listFiles(); + if(fs == null) return; + for (int i = 0; i < fs.length; i++) { + String n = fs[i].getName(); + File c = new File(to, n); + if (fs[i].isDirectory() && !includeSubdirs) continue; + if(filter != null && !filter.accept(new File(from, n))) continue; + + if(fs[i].isDirectory()) { + c.mkdirs(); + copyDir(fs[i], c, includeSubdirs, mkdirs, overwriteOnlyOlderFiles, filter); + } else if (overwriteOnlyOlderFiles && fs[i].isFile() && c.isFile()) { + copyFile(fs[i], c, false, c.lastModified() < fs[i].lastModified()); + } else { + copyFile(fs[i], c); + } + } + } + public static boolean copyFile(File source, File dest, boolean mkdirs) { + return copyFile(source, dest, mkdirs, true); + } + + public static boolean copyFile(File source, File dest) { + return copyFile(source, dest, false, true); + } + + public static boolean copyFile(File source, File dest, boolean mkdirs, boolean overwrite) { + if (mkdirs) dest.getParentFile().mkdirs(); + if(!source.isFile()) return false; + if(dest.isFile() && !isSameFile(dest)) dest.delete(); + if(dest.isFile() && !overwrite) return false; + if(!dest.exists()) + try { + dest.createNewFile(); + } catch (IOException e1) { + JBossServerCorePlugin.log(e1); + } + InputStream is = null; + OutputStream os = null; + try { + is = new BufferedInputStream(new FileInputStream(source), 16 * 1024); + os = new BufferedOutputStream(new FileOutputStream(dest), 16 * 1024); + copyStream(is, os); + return true; + } catch (IOException e) { + JBossServerCorePlugin.log(e); + return false; + } finally { + try { + if (is != null) is.close(); + } catch (IOException e) { + JBossServerCorePlugin.log(e); + } + try { + if (os != null) os.close(); + } catch (IOException e) { + JBossServerCorePlugin.log(e); + } + } + } + + public static void copyStream(InputStream is, OutputStream os) throws IOException { + byte[] buffer = new byte[1<<14]; + while (true) { + int r = is.read(buffer); + if (r > 0) { + os.write(buffer, 0, r); + } else if (r == -1) break; + } + os.flush(); + } + public static boolean isSameFile(File f) { + if(!f.exists()) return false; + String fn = f.getName(); + try { + String cn = f.getCanonicalFile().getName(); + return fn.equals(cn); + } catch (IOException e) { + return false; + } + } + } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-04-01 17:51:08 UTC (rev 30223) @@ -6,6 +6,7 @@ <extension-point id="pollerFailureHandler" name="org.jboss.ide.eclipse.as.core.runtime.server.pollerFailureHandler" schema="schema/pollerFailureHandler.exsd"/> <extension-point id="publishers" name="org.jboss.ide.eclipse.as.core.publishers" schema="schema/publishers.exsd"/> <extension-point id="publishMethod" name="org.jboss.ide.eclipse.as.core.publishMethod" schema="schema/publishMethod.exsd"/> + <extension-point id="jmxRunner" name="org.jboss.ide.eclipse.as.core.jmxRunner" schema="schema/jmxRunner.exsd"/> <extension point="org.eclipse.wst.server.core.serverTypes"> @@ -674,12 +675,6 @@ supportsStartup="true" supportsShutdown="true"/> <serverPoller - class="org.jboss.ide.eclipse.as.core.extensions.polling.JMXPoller" - id="org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller" - name="JMX Poller" - supportsStartup="true" - supportsShutdown="true"/> - <serverPoller class="org.jboss.ide.eclipse.as.core.extensions.polling.ProcessTerminatedPoller" id="org.jboss.ide.eclipse.as.core.runtime.server.processTerminatedPoller" name="Process Terminated Poller" @@ -1117,12 +1112,6 @@ </publisher> </extension> <extension - point="org.jboss.tools.jmx.core.MBeanServerConnectionProvider"> - <connectionProvider - class="org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider"> - </connectionProvider> - </extension> - <extension point="org.eclipse.jdt.core.classpathContainerInitializer"> <classpathContainerInitializer class="org.jboss.ide.eclipse.as.core.server.internal.launch.RunJarContainerWrapper$RunJarContainerInitializer" Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -3,9 +3,9 @@ Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.ide.eclipse.as.doc.user;singleton:=true Bundle-Version: 2.1.0.qualifier -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.help +Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.help;bundle-version="3.5.0" Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.classpath =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.classpath (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.classpath 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.project =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.project (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.project 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.ide.eclipse.as.jmx.integration</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/.settings/org.eclipse.jdt.core.prefs 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,8 @@ +#Thu Mar 31 18:56:18 EDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,18 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Integration +Bundle-SymbolicName: org.jboss.ide.eclipse.as.jmx.integration;singleton:=true +Bundle-Version: 0.9.0.qualifier +Bundle-Activator: org.jboss.ide.eclipse.as.jmx.integration.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.jboss.ide.eclipse.as.core, + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.jboss.tools.jmx.core;bundle-version="1.2.0", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.ui.navigator;bundle-version="3.5.0", + org.jboss.tools.jmx.ui;bundle-version="1.2.0", + org.eclipse.wst.server.ui;bundle-version="1.1.305", + org.jboss.ide.eclipse.as.ui;bundle-version="2.2.0" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/Activator.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/Activator.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$1.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$2.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$2.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner$1.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXClassLoaderRepository.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXClassLoaderRepository.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$JMXPollerRunnable.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$JMXPollerRunnable.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollerRunnable.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollerRunnable.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollingSecurityException.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollingSecurityException.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction$1.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ContentProvider.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ContentProvider.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$LabelProvider.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$LabelProvider.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXSafeRunner.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXSafeRunner.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener$1.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil$CredentialException.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil$CredentialException.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler$1.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/bin/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/build.properties 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,5 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/plugin.xml 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + point="org.jboss.ide.eclipse.as.core.jmxRunner"> + <jmxRunner + class="org.jboss.ide.eclipse.as.jmx.integration.JMXRunner"> + </jmxRunner> + </extension> + <extension + point="org.jboss.tools.jmx.core.MBeanServerConnectionProvider"> + <connectionProvider + class="org.jboss.ide.eclipse.as.jmx.integration.JBossServerConnectionProvider"> + </connectionProvider> + </extension> + + <extension + point="org.jboss.ide.eclipse.as.core.pollers"> + <serverPoller + class="org.jboss.ide.eclipse.as.jmx.integration.JMXPoller" + id="org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller" + name="JMX Poller" + supportsStartup="true" + supportsShutdown="true"/> + </extension> + + + <extension + point="org.eclipse.ui.navigator.navigatorContent"> + <actionProvider + class="org.jboss.ide.eclipse.as.ui.views.server.extensions.JMXProvider$ActionProvider" + id="org.jboss.ide.eclipse.as.ui.extensions.showInJMXView"> + <enablement> + <instanceof + value="org.eclipse.wst.server.core.IServer"> + </instanceof> + </enablement> + </actionProvider> + <navigatorContent + name="%NavigatorContent_JMX" + id="org.jboss.ide.eclipse.as.ui.extensions.jmx" + icon="$nl$/icons/jmeth_obj.gif" + activeByDefault="false" + priority="low"> + contentProvider="org.jboss.ide.eclipse.as.jmx.integration.JMXProvider$ContentProvider" + labelProvider="org.jboss.ide.eclipse.as.jmx.integration.JMXProvider$LabelProvider" + <triggerPoints> + <instanceof + value="org.eclipse.wst.server.core.IServer"> + </instanceof> + </triggerPoints> + <possibleChildren> + <or> + <instanceof + value="org.jboss.tools.jmx.core.tree.Node"> + </instanceof> + <instanceof + value="org.jboss.ide.eclipse.as.ui.views.server.extensions.JMXProvider$Wrapper"> + </instanceof> + <instanceof + value="org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorerContentProvider$DelayProxy"> + </instanceof> + <instanceof + value="org.jboss.tools.jmx.core.MBeanFeatureInfoWrapper"> + </instanceof> + </or> + </possibleChildren> + </navigatorContent> + </extension> + <extension + point="org.eclipse.ui.navigator.viewer"> + <viewerContentBinding + viewerId="org.eclipse.wst.server.ui.ServersView"> + <includes> + <contentExtension + isRoot="false" + pattern="org.jboss.ide.eclipse.as.ui.extensions.jmx"> + </contentExtension> + <contentExtension + isRoot="false" + pattern="org.jboss.tools.jmx.ui.internal.views.navigator.JMXLinkHelper"> + </contentExtension> + </includes> + </viewerContentBinding> + <viewerActionBinding + viewerId="org.eclipse.wst.server.ui.ServersView"> + <includes> + <actionExtension + pattern="org.jboss.ide.eclipse.as.ui.extensions.showInJMXView"/> + <actionExtension + pattern="org.jboss.tools.jmx.ui.internal.views.navigator.actionProvider"> + </actionExtension> + </includes> + </viewerActionBinding> + </extension> +</plugin> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/pom.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/pom.xml (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/pom.xml 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.2-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.as.plugins</groupId> + <artifactId>org.jboss.ide.eclipse.as.jmx.integration</artifactId> + <version>0.9.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> \ No newline at end of file Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/Activator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/Activator.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/Activator.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,50 @@ +package org.jboss.ide.eclipse.as.jmx.integration; + +import org.eclipse.core.runtime.Plugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends Plugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.jmx.integration"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,179 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.jmx.integration; + +import java.io.IOException; + +import javax.management.MBeanServerConnection; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerListener; +import org.eclipse.wst.server.core.ServerEvent; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.tools.jmx.core.ExtensionManager; +import org.jboss.tools.jmx.core.IConnectionProvider; +import org.jboss.tools.jmx.core.IConnectionProviderListener; +import org.jboss.tools.jmx.core.IConnectionWrapper; +import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; +import org.jboss.tools.jmx.core.tree.ErrorRoot; +import org.jboss.tools.jmx.core.tree.NodeUtils; +import org.jboss.tools.jmx.core.tree.Root; + +public class JBossServerConnection implements IConnectionWrapper, IServerListener, IConnectionProviderListener { + private IServer server; + private Root root; + private boolean isConnected; + private boolean isLoading; + public JBossServerConnection(IServer server) { + this.server = server; + this.isConnected = false; + this.isLoading = false; + checkState(); // prime the state + ((JBossServerConnectionProvider)getProvider()).addListener(this); + server.addServerListener(this); + } + + public void connect() throws IOException { + // Not supported + } + + public void disconnect() throws IOException { + // Not supported + } + + public IConnectionProvider getProvider() { + return ExtensionManager.getProvider(JBossServerConnectionProvider.PROVIDER_ID); + } + + public Root getRoot() { + return root; + } + + public void loadRoot(IProgressMonitor monitor) { + if( isConnected() && !isLoading) { + isLoading = true; + // saferunner just adds itself as a concern and then removes, after each call. + // This will ensure the classloader does not need to make multiple loads + JMXClassLoaderRepository.getDefault().addConcerned(server, this); + try { + if( root == null ) { + root = NodeUtils.createObjectNameTree(this, monitor); + } + } catch( CoreException ce ) { + IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ce.getMessage(), ce); + JBossServerCorePlugin.getDefault().getLog().log(status); + root = new ErrorRoot(); + } finally { + JMXClassLoaderRepository.getDefault().removeConcerned(server, this); + isLoading = false; + } + } + } + + public boolean isConnected() { + return isConnected; + } + + public void run(IJMXRunnable runnable) throws JMXException { + // do nothing if the server is down. + if( server.getServerState() != IServer.STATE_STARTED ) + return; + JMXSafeRunner.run(server, runnable); + } + + public String getName() { + return server.getName(); + } + + + /* ************** + * If there's a change in teh server state, then set my connection + * state properly. If there's been a change then fire to teh listeners + */ + + public void serverChanged(ServerEvent event) { + int eventKind = event.getKind(); + if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) { + // server change event + if ((eventKind & ServerEvent.STATE_CHANGE) != 0) { + new Job("Connecting to " + event.getServer().getName() + " via JMX") { //$NON-NLS-1$ //$NON-NLS-2$ + @Override + protected IStatus run(IProgressMonitor monitor) { + checkState(); + return Status.OK_STATUS; + } + }.schedule(); + } + } + } + + protected void checkState() { + IDeployableServer jbs = ServerConverter.getDeployableServer(server); + if( server.getServerState() == IServer.STATE_STARTED && jbs != null && jbs.hasJMXProvider()) { + try { + JMXSafeRunner.run(server, new IJMXRunnable() { + public void run(MBeanServerConnection connection) + throws Exception { + // Do nothing, just see if the connection worked + } + }); + if( !isConnected ) { + isConnected = true; + ((JBossServerConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this); + } + } catch( Exception jmxe ) { + // I thought i was connected but I'm not. + if( isConnected ) { + isConnected = false; + ((JBossServerConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this); + } + } + } else { + root = null; + if( isConnected ) { + // server is not in STATE_STARTED, but thinks its connected + isConnected = false; + ((JBossServerConnectionProvider)getProvider()).fireChanged(JBossServerConnection.this); + } + } + } + + + + /* ************* + * The following three methods are just here so that this class + * is removed as a listener to the server if it is removed + */ + + public void connectionAdded(IConnectionWrapper connection) { + // ignore + } + + public void connectionChanged(IConnectionWrapper connection) { + // ignore + } + + public void connectionRemoved(IConnectionWrapper connection) { + server.removeServerListener(this); + } + + public boolean canControl() { + return false; + } +} \ No newline at end of file Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,202 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.jmx.integration; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import javax.management.MBeanServerConnection; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerLifecycleListener; +import org.eclipse.wst.server.core.ServerCore; +import org.jboss.ide.eclipse.as.core.ExtensionManager.IServerJMXRunnable; +import org.jboss.ide.eclipse.as.core.ExtensionManager.IServerJMXRunner; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.tools.jmx.core.ExtensionManager; +import org.jboss.tools.jmx.core.IConnectionProvider; +import org.jboss.tools.jmx.core.IConnectionProviderListener; +import org.jboss.tools.jmx.core.IConnectionWrapper; +import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; + +public class JBossServerConnectionProvider implements IConnectionProvider, IServerLifecycleListener { + public static final String PROVIDER_ID = "org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider"; //$NON-NLS-1$ + + public static JBossServerConnectionProvider getProvider() { + return (JBossServerConnectionProvider)ExtensionManager.getProvider(PROVIDER_ID); + } + + public static JBossServerConnection getConnection(IServer s) { + return (JBossServerConnection)getProvider().findConnection(s); + } + + // Run this action on the server. + // If the connection doesn't exist, make a new one + public static void run(IServer s, IJMXRunnable r) throws JMXException { + JBossServerConnection c = getConnection(s); + if( c != null ) + // JMX is not installed here + c.run(r); + } + + + private ArrayList<IConnectionProviderListener> listeners = + new ArrayList<IConnectionProviderListener>(); + + private HashMap<String, JBossServerConnection> idToConnection; + public JBossServerConnectionProvider() { + ServerCore.addServerLifecycleListener(this); + } + + protected boolean belongsHere(IServer server) { + return ServerConverter.getJBossServer(server) != null; + } + + protected JBossServerConnection createConnection(IServer server) { + return new JBossServerConnection(server); + } + + public void serverAdded(IServer server) { + if( belongsHere(server)) { + getConnections(); + if( !idToConnection.containsKey(server.getId())) { + JBossServerConnection connection = createConnection(server); + idToConnection.put(server.getId(), connection); + } + fireAdded(idToConnection.get(server.getId())); + } + } + + public void serverChanged(IServer server) { + if( belongsHere(server)) { + getConnections(); + if( !idToConnection.containsKey(server.getId())) { + JBossServerConnection connection = createConnection(server); + idToConnection.put(server.getId(), connection); + } + fireAdded(idToConnection.get(server.getId())); + } + } + + public void serverRemoved(IServer server) { + if( belongsHere(server)) { + JBossServerConnection connection; + if( idToConnection != null ) { + connection = idToConnection.get(server.getId()); + if( connection != null ) { + idToConnection.remove(server.getId()); + fireRemoved(connection); + } + } else { + // hasn't been initialized yet + getConnections(); + + // but now its missing from the collection, so make one up + fireRemoved(createConnection(server)); + } + } + } + + public IConnectionWrapper findConnection(IServer s) { + getConnections(); + return idToConnection.get(s.getId()); + } + + public IConnectionWrapper[] getConnections() { + // do it all on demand right now + if( idToConnection == null ) { + // load them all + idToConnection = new HashMap<String, JBossServerConnection>(); + IServer[] allServers = ServerCore.getServers(); + JBossServerConnection c; + for( int i = 0; i < allServers.length; i++ ) { + if( belongsHere(allServers[i])) { + c = createConnection(allServers[i]); + if( c != null ) + idToConnection.put(allServers[i].getId(), c); + } + } + } + ArrayList<JBossServerConnection> list = new ArrayList<JBossServerConnection>(); + list.addAll(idToConnection.values()); + return list.toArray(new JBossServerConnection[list.size()]); + } + + public String getName(IConnectionWrapper wrapper) { + if( wrapper instanceof JBossServerConnection) { + return ((JBossServerConnection)wrapper).getName(); + } + return null; + } + + public String getId() { + return PROVIDER_ID; + } + + public void addListener(IConnectionProviderListener listener) { + if( !listeners.contains(listener)) + listeners.add(listener); + } + + public void removeListener(IConnectionProviderListener listener) { + listeners.remove(listener); + } + + void fireAdded(IConnectionWrapper wrapper) { + for(Iterator<IConnectionProviderListener> i = listeners.iterator(); i.hasNext();) + try { + i.next().connectionAdded(wrapper); + } catch(RuntimeException re) {} + } + + void fireChanged(IConnectionWrapper wrapper) { + for(Iterator<IConnectionProviderListener> i = listeners.iterator(); i.hasNext();) + try { + i.next().connectionChanged(wrapper); + } catch(RuntimeException re) {} + } + + void fireRemoved(IConnectionWrapper wrapper) { + for(Iterator<IConnectionProviderListener> i = listeners.iterator(); i.hasNext();) + try { + i.next().connectionRemoved(wrapper); + } catch(RuntimeException re) {} + } + public boolean canCreate() { + return false; + } + + @SuppressWarnings(value={"unchecked"}) + public IConnectionWrapper createConnection(Map map) throws CoreException { + throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, Messages.NotSupported, null)); + } + + public void addConnection(IConnectionWrapper connection) { + // Not Supported + } + public void removeConnection(IConnectionWrapper connection) { + // Not Supported + } + public boolean canDelete(IConnectionWrapper wrapper) { + return false; + } + public void connectionChanged(IConnectionWrapper connection) { + // do nothing + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,34 @@ +package org.jboss.ide.eclipse.as.jmx.integration; + +import javax.management.MBeanServerConnection; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.ExtensionManager.IServerJMXRunnable; +import org.jboss.ide.eclipse.as.core.ExtensionManager.IServerJMXRunner; +import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; + +public class JBossServerJMXRunner implements IServerJMXRunner { + + public void run(IServer server, final IServerJMXRunnable runnable) throws CoreException { + IJMXRunnable runnable2 = new IJMXRunnable() { + public void run(MBeanServerConnection connection) throws Exception { + runnable.run(connection); + } + }; + try { + JBossServerConnectionProvider.run(server, runnable2); + } catch(JMXException jmxe) { + // TODO wrap and log + } + } + + public void beginTransaction(IServer server, Object lock) { + JMXClassLoaderRepository.getDefault().addConcerned(server, lock); + } + + public void endTransaction(IServer server, Object lock) { + JMXClassLoaderRepository.getDefault().removeConcerned(server, lock); + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXClassLoaderRepository.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXClassLoaderRepository.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXClassLoaderRepository.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,134 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.jmx.integration; + +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.HashMap; + +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; +import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; + +/** + * A repository for classloaders that relate to servers, + * specifically jmx. It basically loads teh jboss-clientall.jar. + * + * + * @author Rob Stryker + * + */ +public class JMXClassLoaderRepository { + protected static JMXClassLoaderRepository instance; + public static JMXClassLoaderRepository getDefault() { + if( instance == null ) { + instance = new JMXClassLoaderRepository(); + } + return instance; + } + + protected HashMap<String, ClassLoader> idToLoader; + protected HashMap<String, ArrayList<Object>> idToConcerned; + protected JMXClassLoaderRepository() { + idToLoader = new HashMap<String, ClassLoader>(); + idToConcerned = new HashMap<String, ArrayList<Object>>(); + } + + /** + * Add a concerned citizen to the list of said citizens. + * These are people who may at any time ask to access + * the classloader. + * + * @param server + * @param concerned + */ + public void addConcerned(IServer server, Object concerned) { + ArrayList<Object> list = idToConcerned.get(server.getId()); + if( list == null ) { + list = new ArrayList<Object>(); + idToConcerned.put(server.getId(), list); + } + if( !list.contains(concerned)) + list.add(concerned); + } + + /** + * Removes an element from the list of concerned citizens. + * If no one cares about this server any longer, remove + * its classloader cache and forget about it. + * + * @param server + * @param concerned + */ + public void removeConcerned(IServer server, Object concerned) { + ArrayList<Object> list = idToConcerned.get(server.getId()); + if( list != null ) { + list.remove(concerned); + if( list.size() == 0 ) { + idToConcerned.remove(server.getId()); + idToLoader.remove(server.getId()); + } + } + } + + /** + * Get the classloader for some server. + * If there are 0 concerned citizens, null should be returned. + * @param server + * @return + */ + public ClassLoader getClassLoader(IServer server) { + ClassLoader loader = idToLoader.get(server.getId()); + if( loader == null && anyoneCares(server)) { + loadClassLoader(server); + } + return idToLoader.get(server.getId()); + } + + /** + * Actually create and store the classloader + * @param s + */ + protected void loadClassLoader(IServer s) { + try { + IRuntime rt = s.getRuntime(); + IPath loc = rt.getLocation(); + URL url = loc.append(IJBossServerConstants.CLIENT).append(IJBossServerConstants.JBOSSALL_CLIENT_JAR) + .toFile().toURI().toURL(); + URLClassLoader loader = new URLClassLoader(new URL[] { url, }, + Thread.currentThread().getContextClassLoader()); + idToLoader.put(s.getId(), loader); + } catch (MalformedURLException murle) { + JBossServerCorePlugin.getDefault().getLog().log( + new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + NLS.bind(Messages.loadJMXClassesFailed, s.getName()), murle)); + } + } + + /** + * Are there any concerned citizens for this server? + * @param server + * @return + */ + protected boolean anyoneCares(IServer server) { + ArrayList<Object> list = idToConcerned.get(server.getId()); + if( list != null && list.size() > 0 ) return true; + return false; + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,250 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.ide.eclipse.as.jmx.integration; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.naming.CommunicationException; +import javax.naming.NamingException; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.Messages; +import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; +import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; +import org.jboss.ide.eclipse.as.core.server.internal.PollThread; +import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType; +import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; +import org.jboss.tools.jmx.core.IJMXRunnable; + +/** + * A poller dedicated to server startup, checks via JMX + * @author Rob rob.stryker(a)redhat.com + * + */ +public class JMXPoller implements IServerStatePoller { + + public static final String POLLER_ID = "org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller"; //$NON-NLS-1$ + public static final int JMXPOLLER_CODE = IEventCodes.JMXPOLLER_CODE; + public static final Properties IGNORED_PROPERTIES = new Properties(); + + public static final String REQUIRED_USER = "org.jboss.ide.eclipse.as.core.extensions.polling.jmx.REQUIRED_USER"; //$NON-NLS-1$ + public static final String REQUIRED_PASS = "org.jboss.ide.eclipse.as.core.extensions.polling.jmx.REQUIRED_PASS"; //$NON-NLS-1$ + + public static final int STATE_STARTED = IEventCodes.STATE_STARTED; + public static final int STATE_STOPPED = IEventCodes.STATE_STOPPED; + public static final int STATE_TRANSITION = IEventCodes.STATE_TRANSITION; + + private int started; + private boolean canceled, done; + private boolean waitingForCredentials = false; + private boolean ceFound,nnfeFound,startingFound; + + + private IServer server; + private ServerStatePollerType type; + private PollingException pollingException = null; + private RequiresInfoException requiresInfoException = null; + private Properties requiredPropertiesReturned = null; + + private JMXPollerRunnable runnable; + private JMXSafeRunner runner; + + public void beginPolling(IServer server, boolean expectedState, + PollThread pt) { + ceFound = nnfeFound = startingFound = canceled = done = false; + this.server = server; + launchJMXPoller(); + } + + private class JMXPollerRunnable implements IJMXRunnable { + public void run(MBeanServerConnection connection) throws Exception { + Object attInfo = connection.getAttribute( + new ObjectName(IJBossRuntimeConstants.SYSTEM_MBEAN), + IJBossRuntimeConstants.STARTED_METHOD); + boolean b = ((Boolean) attInfo).booleanValue(); + started = b ? STATE_STARTED : STATE_TRANSITION; + done = b; + if( !startingFound ) { + startingFound = true; + IStatus s = new Status(IStatus.INFO, JBossServerCorePlugin.PLUGIN_ID, + JMXPOLLER_CODE|started, Messages.ServerStarting, null); + log(s); + } + } + } + + private class PollerRunnable implements Runnable { + public void run() { + JMXClassLoaderRepository.getDefault().addConcerned(server, this); + runnable = new JMXPollerRunnable(); + runner = new JMXSafeRunner(server); + while( !done && !canceled) { + try { + runner.run(runnable); + } catch(CoreException ce) { + handleException(ce.getCause()); + } + + try { Thread.sleep(500);} + catch (InterruptedException e) {} + } + JMXClassLoaderRepository.getDefault().removeConcerned(server, this); + } + + protected void handleException(Throwable t) { + if( t instanceof SecurityException ) { + synchronized(this) { + if( !waitingForCredentials ) { + waitingForCredentials = true; + requiresInfoException = new PollingSecurityException( + NLS.bind(Messages.securityException, t.getMessage())); + } else { + // we're waiting. are they back yet? + if( requiredPropertiesReturned != null ) { + if( requiredPropertiesReturned == IGNORED_PROPERTIES) { + requiresInfoException = null; + done = true; + started = STATE_STARTED; + } else { + requiresInfoException = null; + String user, pass; + user = (String)requiredPropertiesReturned.get(REQUIRED_USER); + pass = (String)requiredPropertiesReturned.get(REQUIRED_PASS); + requiredPropertiesReturned = null; + runner.setUser(user); + runner.setPass(pass); + waitingForCredentials = false; + } + } + } + } + return; + } + + if( t instanceof CommunicationException ) { + started = STATE_STOPPED; + if( !ceFound ) { + ceFound = true; + IStatus s = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, JMXPOLLER_CODE|started, t.getMessage(), t); + log(s); + } + return; + } + + if( t instanceof NamingException ) { + started = STATE_STOPPED; + if( !nnfeFound ) { + nnfeFound = true; + IStatus s = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, JMXPOLLER_CODE|started, t.getMessage(), t); + log(s); + } + return; + } + + if( t != null ) { + pollingException = new PollingException(t.getMessage()); + done = true; + } + } + } + + + private void launchJMXPoller() { + PollerRunnable run = new PollerRunnable(); + Thread t = new Thread(run, Messages.JMXPoller); + t.start(); + } + + public void cancel(int type) { + canceled = true; + } + + public void cleanup() { + } + + public class PollingSecurityException extends RequiresInfoException { + private static final long serialVersionUID = 1L; + public PollingSecurityException(String msg) { + super(msg); + } + } + + public boolean getState() throws PollingException, RequiresInfoException { + if (pollingException != null) + throw pollingException; + if( requiresInfoException != null ) + throw requiresInfoException; + + if (started == 0) + return SERVER_DOWN; + if (started == 1) + return SERVER_UP; + + if (!done && !canceled) + return SERVER_DOWN; // Not there yet. + + return SERVER_UP; // done or canceled, doesnt matter + } + + public boolean isComplete() throws PollingException, RequiresInfoException { + if (pollingException != null) + throw pollingException; + if( requiresInfoException != null ) + throw requiresInfoException; + return done; + } + + public void failureHandled(Properties properties) { + if( properties == null ) { + requiredPropertiesReturned = IGNORED_PROPERTIES; + } else + requiredPropertiesReturned = properties; + } + + public List<String> getRequiredProperties() { + ArrayList<String> list = new ArrayList<String>(); + list.add(REQUIRED_USER); + list.add(REQUIRED_PASS); + return list; + } + + public ServerStatePollerType getPollerType() { + return type; + } + + public void setPollerType(ServerStatePollerType type) { + this.type = type; + } + + public IServer getServer() { + return server; + } + + public int getTimeoutBehavior() { + return TIMEOUT_BEHAVIOR_SUCCEED; + } + + private void log(IStatus s) { + if( !canceled ) + ServerLogger.getDefault().log(server,s); + } +} Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java ___________________________________________________________________ Added: svn:executable + * Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,192 @@ +package org.jboss.ide.eclipse.as.jmx.integration; + +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.action.IContributionItem; +import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.StructuredViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.navigator.CommonActionProvider; +import org.eclipse.ui.navigator.CommonViewer; +import org.eclipse.ui.navigator.ICommonActionExtensionSite; +import org.eclipse.ui.navigator.ICommonViewerSite; +import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; +import org.eclipse.ui.views.IViewDescriptor; +import org.eclipse.ui.views.IViewRegistry; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; +import org.jboss.tools.jmx.core.ExtensionManager; +import org.jboss.tools.jmx.core.IConnectionWrapper; +import org.jboss.tools.jmx.ui.internal.views.navigator.JMXNavigator; +import org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorerContentProvider; +import org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorerLabelProvider; + +public class JMXProvider { + + public static class ActionProvider extends CommonActionProvider { + private ICommonActionExtensionSite actionSite; + private ShowInJMXViewAction showInJMXViewAction; + public ActionProvider() { + super(); + } + + public void init(ICommonActionExtensionSite aSite) { + super.init(aSite); + this.actionSite = aSite; + createActions(aSite); + } + + protected void createActions(ICommonActionExtensionSite aSite) { + ICommonViewerSite site = aSite.getViewSite(); + if( site instanceof ICommonViewerWorkbenchSite ) { + StructuredViewer v = aSite.getStructuredViewer(); + if( v instanceof CommonViewer ) { + CommonViewer cv = (CommonViewer)v; + ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)site; + showInJMXViewAction = new ShowInJMXViewAction(wsSite.getSelectionProvider()); + } + } + } + + public void fillContextMenu(IMenuManager menu) { + ICommonViewerSite site = actionSite.getViewSite(); + IStructuredSelection selection = null; + if (site instanceof ICommonViewerWorkbenchSite) { + ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site; + selection = (IStructuredSelection) wsSite.getSelectionProvider() + .getSelection(); + } + + IContributionItem quick = menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$ + if( quick != null && selection != null && selection.toArray().length == 1 ) { + if( selection.getFirstElement() instanceof IServer ) { + if( menu instanceof MenuManager ) { + ((MenuManager)quick).add(showInJMXViewAction); + } + } + } + } + + public class ShowInJMXViewAction extends AbstractServerAction { + public ShowInJMXViewAction(ISelectionProvider sp) { + super(sp, null); + + IViewRegistry reg = PlatformUI.getWorkbench().getViewRegistry(); + IViewDescriptor desc = reg.find(JMXNavigator.VIEW_ID); + setText(desc.getLabel()); + setImageDescriptor(desc.getImageDescriptor()); + } + + public boolean accept(IServer server) { + return (server.getServerType() != null && + server.loadAdapter(JBossServer.class, new NullProgressMonitor()) != null + && server.getServerState() == IServer.STATE_STARTED); + } + + public void perform(final IServer server) { + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow() ; + if (window != null) { + IWorkbenchPage page = window.getActivePage(); + if (page != null) { + IWorkbenchPart part = page.findView(JMXNavigator.VIEW_ID); + if (part == null) { + try { + part = page.showView(JMXNavigator.VIEW_ID); + } catch (PartInitException e) { + } + } else /* if( part != null ) */ { + final JMXNavigator view = (JMXNavigator) part.getAdapter(JMXNavigator.class); + if (view != null) { + view.setFocus(); + Display.getDefault().asyncExec(new Runnable() { + public void run() { + JBossServerConnectionProvider provider = + (JBossServerConnectionProvider)ExtensionManager.getProvider( + JBossServerConnectionProvider.PROVIDER_ID); + JBossServerConnection connection = provider.getConnection(server); + if( connection != null ) { + view.getCommonViewer().collapseAll(); + ISelection sel = new StructuredSelection(new Object[] { connection }); + view.getCommonViewer().setSelection(sel, true); + view.getCommonViewer().expandToLevel(connection, 2); + } + } + }); + } + } + } + } + } + } + } + + public static class ContentProvider implements ITreeContentProvider { + private MBeanExplorerContentProvider delegate; + public ContentProvider() { + delegate = new MBeanExplorerContentProvider(); + } + public Object[] getChildren(Object parentElement) { + if( parentElement instanceof IServer ) { + Object sel = JBossServerConnectionProvider.getConnection((IServer)parentElement); + if( sel != null ) + return new Object[] { sel }; + } + return delegate.getChildren(parentElement); + } + public Object getParent(Object element) { + return delegate.getParent(element); + } + public boolean hasChildren(Object element) { + return delegate.hasChildren(element); + } + public Object[] getElements(Object inputElement) { + return delegate.getElements(inputElement); + } + public void dispose() { + delegate.dispose(); + } + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + delegate.inputChanged(viewer, oldInput, newInput); + } + } + + public static class LabelProvider extends org.eclipse.jface.viewers.LabelProvider { + private MBeanExplorerLabelProvider delegate; + public LabelProvider() { + delegate = new MBeanExplorerLabelProvider(); + } + + public void dispose() { + delegate.dispose(); + } + + public String getText(Object element) { + if( element instanceof IConnectionWrapper ) { + return "JMX"; //$NON-NLS-1$ + } + return delegate.getText(element); + } + + public Image getImage(Object element) { + if( element instanceof IConnectionWrapper ) { + return JBossServerUISharedImages.getImage(JBossServerUISharedImages.JMX_IMAGE); + } + return delegate.getImage(element); + } + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXSafeRunner.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXSafeRunner.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXSafeRunner.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,82 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.jmx.integration; + +import java.util.Properties; + +import javax.management.MBeanServerConnection; +import javax.naming.InitialContext; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; + +public class JMXSafeRunner { + private String user, pass; + private IServer server; + + public JMXSafeRunner(IServer s) { + this.server = s; + user = ServerConverter.getJBossServer(s).getUsername(); + pass = ServerConverter.getJBossServer(s).getPassword(); + } + + public void setUser(String user) { + this.user = user; + } + public void setPass(String pass) { + this.pass = pass; + } + + public void run(IJMXRunnable r) throws CoreException { + run(server,r,user,pass); + } + + public static void run(IServer s, IJMXRunnable r) throws JMXException { + String user = ServerConverter.getJBossServer(s).getUsername(); + String pass = ServerConverter.getJBossServer(s).getPassword(); + run(s,r,user,pass); + } + + public static void run(IServer s, IJMXRunnable r, String user, String pass) throws JMXException { + JMXClassLoaderRepository.getDefault().addConcerned(s, r); + ClassLoader currentLoader = Thread.currentThread() + .getContextClassLoader(); + ClassLoader newLoader = JMXClassLoaderRepository.getDefault() + .getClassLoader(s); + Thread.currentThread().setContextClassLoader(newLoader); + InitialContext ic = null; + try { + JMXUtil.setCredentials(s,user,pass); + Properties p = JMXUtil.getDefaultProperties(s); + ic = new InitialContext(p); + Object obj = ic.lookup(IJBossRuntimeConstants.RMIAdaptor); + ic.close(); + if (obj instanceof MBeanServerConnection) { + MBeanServerConnection connection = (MBeanServerConnection) obj; + r.run(connection); + } + } catch( Exception e ) { + throw new JMXException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, + e.getMessage() == null ? e.getClass().getName() : e.getMessage(), e)); + } finally { + JMXClassLoaderRepository.getDefault().removeConcerned(s, r); + Thread.currentThread().setContextClassLoader(currentLoader); + } + } + +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,137 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.jmx.integration; + +import java.net.URI; +import java.util.ArrayList; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.ServerEvent; +import org.jboss.ide.eclipse.as.core.Messages; +import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; +import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; +import org.jboss.ide.eclipse.as.core.server.UnitedServerListener; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.tools.jmx.core.IJMXRunnable; +import org.jboss.tools.jmx.core.JMXException; + +public class JMXServerLifecycleListener extends UnitedServerListener { + private static JMXServerLifecycleListener instance; + public static JMXServerLifecycleListener getDefault() { + if( instance == null ) + instance = new JMXServerLifecycleListener(); + return instance; + } + + public void serverChanged(ServerEvent event) { + IServer server = event.getServer(); + JBossServer jbs = (JBossServer)server.loadAdapter(JBossServer.class, new NullProgressMonitor()); + if( jbs != null && jbs.hasJMXProvider()) { + int eventKind = event.getKind(); + if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) { + // server change event + if ((eventKind & ServerEvent.STATE_CHANGE) != 0) { + if( event.getServer().getServerState() == IServer.STATE_STARTED ) { + String[] folders = getDeployLocationFolders(server); + if( folders.length > 0 ) + doDeploymentAddition(event, folders); + } + } + } + } + } + + protected void doDeploymentAddition(final ServerEvent event, final String[] folders) { + IJMXRunnable r = new IJMXRunnable() { + public void run(MBeanServerConnection connection) throws Exception { + ensureDeployLocationAdded(event.getServer(), connection, folders); + } + }; + try { + JBossServerConnectionProvider.run(event.getServer(), r); + } catch( JMXException jmxe ) { + IStatus s = jmxe.getStatus(); + IStatus newStatus = new Status(s.getSeverity(), s.getPlugin(), IEventCodes.ADD_DEPLOYMENT_FOLDER_FAIL, + Messages.AddingJMXDeploymentFailed, s.getException()); + ServerLogger.getDefault().log(event.getServer(), newStatus); + } + } + + protected String[] getDeployLocationFolders(IServer server) { + JBossServer ds = ServerConverter.getJBossServer(server); + ArrayList<String> folders = new ArrayList<String>(); + // add the server folder deploy loc. first + String insideServer = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_SERVER); + String metadata = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_METADATA); + String custom = JBossServer.getDeployFolder(ds, JBossServer.DEPLOY_CUSTOM); + String type = ds.getDeployLocationType(); + String serverHome = null; + if (server != null && server.getRuntime()!= null && server.getRuntime().getLocation() != null) { + serverHome = server.getRuntime().getLocation().toString(); + } + folders.add(insideServer); + if( type.equals(JBossServer.DEPLOY_METADATA) && !folders.contains(metadata)) + folders.add(metadata); + if( type.equals(JBossServer.DEPLOY_CUSTOM) && !folders.contains(custom) && !custom.equals(serverHome)) + folders.add(custom); + + IModule[] modules2 = org.eclipse.wst.server.core.ServerUtil.getModules(server.getServerType().getRuntimeType().getModuleTypes()); + if (modules2 != null) { + int size = modules2.length; + for (int i = 0; i < size; i++) { + IModule[] module = new IModule[] { modules2[i] }; + IStatus status = server.canModifyModules(module, null, null); + if (status != null && status.getSeverity() != IStatus.ERROR) { + String tempFolder = PublishUtil.getDeployRootFolder(module, ds).toString(); + if( !folders.contains(tempFolder)) + folders.add(tempFolder); + } + } + } + folders.remove(insideServer); // doesn't need to be added to deployment scanner + String[] folders2 = (String[]) folders.toArray(new String[folders.size()]); + return folders2; + } + + protected void ensureDeployLocationAdded(IServer server, MBeanServerConnection connection) throws Exception { + String[] folders2 = getDeployLocationFolders(server); + ensureDeployLocationAdded(server, connection, folders2); + } + + protected void ensureDeployLocationAdded(IServer server, + MBeanServerConnection connection, String[] folders2) throws Exception { + for( int i = 0; i < folders2.length; i++ ) { + String asURL = encode(folders2[i]); + ObjectName name = new ObjectName(IJBossRuntimeConstants.DEPLOYMENT_SCANNER_MBEAN_NAME); + connection.invoke(name, IJBossRuntimeConstants.addURL, new Object[] { asURL }, new String[] {String.class.getName()}); + } + } + + private String encode(String folder) throws Exception { + folder = folder.replace("\\", "/"); //$NON-NLS-1$//$NON-NLS-2$ + if (! folder.startsWith("/")) { //$NON-NLS-1$ + folder = "/" + folder; //$NON-NLS-1$ + } + URI uri = new URI("file", null, folder, null); //$NON-NLS-1$ + //return URLEncoder.encode(uri.toASCIIString()); + return uri.toASCIIString(); + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,123 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.ide.eclipse.as.jmx.integration; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.security.Principal; +import java.util.Properties; + +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; + +/** + * Utility class + * + * @author Rob Stryker rob.stryker(a)redhat.com + * + */ +public class JMXUtil { + + /** + * In the current thread, set the credentials from some server + * + * @param server + */ + public static void setCredentials(IServer server) + throws CredentialException { + String user = ServerConverter.getJBossServer(server).getUsername(); + String pass = ServerConverter.getJBossServer(server).getPassword(); + setCredentials(server, user, pass); + } + + public static void setCredentials(IServer server, Object principal, + Object credential) throws CredentialException { + Exception temp = null; + try { + // get our methods + Class simplePrincipal = Thread.currentThread() + .getContextClassLoader().loadClass( + IJBossServerConstants.CLASS_SIMPLE_PRINCIPAL); + Class securityAssoc = Thread.currentThread() + .getContextClassLoader().loadClass( + IJBossServerConstants.CLASS_SECURITY_ASSOCIATION); + securityAssoc.getMethods(); // force-init the methods since the + // class hasn't been initialized yet. + + Constructor newSimplePrincipal = simplePrincipal + .getConstructor(new Class[] { String.class }); + Object newPrincipalInstance = newSimplePrincipal + .newInstance(new Object[] { principal }); + + // set the principal + Method setPrincipalMethod = securityAssoc.getMethod( + IJBossServerConstants.METHOD_SET_PRINCIPAL, + new Class[] { Principal.class }); + setPrincipalMethod.invoke(null, + new Object[] { newPrincipalInstance }); + + // set the credential + Method setCredentialMethod = securityAssoc.getMethod( + IJBossServerConstants.METHOD_SET_CREDENTIAL, + new Class[] { Object.class }); + setCredentialMethod.invoke(null, new Object[] { credential }); + } catch (ClassNotFoundException e) { + temp = e; + } catch (SecurityException e) { + temp = e; + } catch (NoSuchMethodException e) { + temp = e; + } catch (IllegalArgumentException e) { + temp = e; + } catch (InstantiationException e) { + temp = e; + } catch (IllegalAccessException e) { + temp = e; + } catch (InvocationTargetException e) { + temp = e; + } + if( temp != null ) + throw new CredentialException(temp); + } + + public static class CredentialException extends Exception { + private static final long serialVersionUID = 1L; + protected Exception wrapped; + + public CredentialException(Exception wrapped) { + this.wrapped = wrapped; + } + + public Exception getWrapped() { + return wrapped; + } + } + + public static Properties getDefaultProperties(IServer server) { + JBossServer jbs = ServerConverter.getJBossServer(server); + Properties props = new Properties(); + if( jbs != null ) { + + int port = jbs.getJNDIPort(); + props.put(IJBossServerConstants.NAMING_FACTORY_KEY, + IJBossServerConstants.NAMING_FACTORY_VALUE); + props.put(IJBossServerConstants.NAMING_FACTORY_PKGS, + IJBossServerConstants.NAMING_FACTORY_INTERFACES); + props.put(IJBossServerConstants.NAMING_FACTORY_PROVIDER_URL, + "jnp://" + jbs.getHost() + ":" + port); //$NON-NLS-1$ //$NON-NLS-2$ + props.put(IJBossServerConstants.JNP_DISABLE_DISCOVERY, new Boolean(true).booleanValue()); + } + return props; + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,62 @@ +package org.jboss.ide.eclipse.as.jmx.integration; + +import java.util.List; +import java.util.Properties; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.jboss.ide.eclipse.as.core.server.IPollerFailureHandler; +import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; +import org.jboss.ide.eclipse.as.ui.Messages; +import org.jboss.ide.eclipse.as.ui.dialogs.RequiredCredentialsDialog; + +/** + * + * @author rob.stryker <rob.stryker(a)redhat.com&gt; + * + */ +public class SecurityFailureHandler implements IPollerFailureHandler { + + public boolean accepts(IServerStatePoller poller, String action, + List requiredProperties) { + if( poller.getPollerType().getId().equals(JMXPoller.POLLER_ID)) + return true; + return false; + } + + public void handle(final IServerStatePoller poller, String action, List requiredProperties) { + Display.getDefault().asyncExec(new Runnable() { + public void run() { + IServer server = poller.getServer(); + IServerWorkingCopy copy = server.createWorkingCopy(); + JBossServer jbs = ServerConverter.getJBossServer(copy); + RequiredCredentialsDialog d = new RequiredCredentialsDialog(new Shell(), jbs); + if( d.open() == Window.OK) { + if( d.getSave() ) { + jbs.setPassword(d.getPass()); + jbs.setUsername(d.getUser()); + try { + copy.save(false, null); + } catch( CoreException ce ) { + JBossServerUIPlugin.log(Messages.ServerSaveFailed, ce); + } + } + + Properties p = new Properties(); + p.put(JMXPoller.REQUIRED_USER, d.getUser()); + p.put(JMXPoller.REQUIRED_PASS, d.getPass()); + poller.failureHandled(p); + } else { + poller.failureHandled(null); + } + } + }); + } +} Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/MANIFEST.MF (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,17 @@ +Manifest-Version: 1.0 +Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.jboss.ide. + eclipse.as.core,org.eclipse.wst.server.core;bundle-version="1.1.302", + org.jboss.tools.jmx.core;bundle-version="1.2.0",org.eclipse.core.reso + urces;bundle-version="3.7.100",org.eclipse.ui.navigator;bundle-versio + n="3.5.0",org.jboss.tools.jmx.ui;bundle-version="1.2.0",org.eclipse.w + st.server.ui;bundle-version="1.1.305",org.jboss.ide.eclipse.as.ui;bun + dle-version="2.2.0" +Bundle-ActivationPolicy: lazy +Bundle-Version: 0.9.0.v20110401-0131-M1 +Bundle-Name: Integration +Bundle-Activator: org.jboss.ide.eclipse.as.jmx.integration.Activator +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.jboss.ide.eclipse.as.jmx.integration;singleto + n:=true +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/Activator.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/Activator.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$1.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$2.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection$2.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner$1.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JBossServerJMXRunner.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXClassLoaderRepository.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXClassLoaderRepository.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$JMXPollerRunnable.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$JMXPollerRunnable.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollerRunnable.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollerRunnable.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollingSecurityException.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller$PollingSecurityException.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction$1.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider$ShowInJMXViewAction.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ActionProvider.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ContentProvider.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$ContentProvider.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$LabelProvider.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider$LabelProvider.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXProvider.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXSafeRunner.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXSafeRunner.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener$1.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXServerLifecycleListener.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil$CredentialException.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil$CredentialException.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler$1.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler$1.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.class =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/classes/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/maven-archiver/pom.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/maven-archiver/pom.properties (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/maven-archiver/pom.properties 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,5 @@ +#Generated by Maven +#Fri Apr 01 01:32:56 EDT 2011 +version=0.9.0-SNAPSHOT +groupId=org.jboss.tools.as.plugins +artifactId=org.jboss.ide.eclipse.as.jmx.integration Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/org.jboss.ide.eclipse.as.jmx.integration-0.9.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/org.jboss.ide.eclipse.as.jmx.integration-0.9.0-SNAPSHOT.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/p2artifacts.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/p2artifacts.xml (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/p2artifacts.xml 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,14 @@ +<?xml version='1.0' encoding='UTF-8'?> +<?artifactRepository version='1.1.0'?> +<artifacts size='1'> + <artifact classifier='osgi.bundle' id='org.jboss.ide.eclipse.as.jmx.integration' version='0.9.0.v20110401-0131-M1'> + <properties size='6'> + <property name='artifact.size' value='41481'/> + <property name='download.size' value='41481'/> + <property name='download.md5' value='4fec1d88df5fb4e5f7eddf1947e98a4b'/> + <property name='maven-groupId' value='org.jboss.tools.as.plugins'/> + <property name='maven-artifactId' value='org.jboss.ide.eclipse.as.jmx.integration'/> + <property name='maven-version' value='0.9.0-SNAPSHOT'/> + </properties> + </artifact> +</artifacts> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/p2content.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/p2content.xml (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/target/p2content.xml 2011-04-01 17:51:08 UTC (rev 30223) @@ -0,0 +1,40 @@ +<?xml version='1.0' encoding='UTF-8'?> +<units size='1'> + <unit id='org.jboss.ide.eclipse.as.jmx.integration' version='0.9.0.v20110401-0131-M1'> + <update id='org.jboss.ide.eclipse.as.jmx.integration' range='[0.0.0,0.9.0.v20110401-0131-M1)' severity='0'/> + <properties size='4'> + <property name='org.eclipse.equinox.p2.name' value='Integration'/> + <property name='maven-groupId' value='org.jboss.tools.as.plugins'/> + <property name='maven-artifactId' value='org.jboss.ide.eclipse.as.jmx.integration'/> + <property name='maven-version' value='0.9.0-SNAPSHOT'/> + </properties> + <provides size='3'> + <provided namespace='org.eclipse.equinox.p2.iu' name='org.jboss.ide.eclipse.as.jmx.integration' version='0.9.0.v20110401-0131-M1'/> + <provided namespace='osgi.bundle' name='org.jboss.ide.eclipse.as.jmx.integration' version='0.9.0.v20110401-0131-M1'/> + <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/> + </provides> + <requires size='10'> + <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/> + <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/> + <required namespace='osgi.bundle' name='org.jboss.ide.eclipse.as.core' range='0.0.0'/> + <required namespace='osgi.bundle' name='org.eclipse.wst.server.core' range='1.1.302'/> + <required namespace='osgi.bundle' name='org.jboss.tools.jmx.core' range='1.2.0'/> + <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.7.100'/> + <required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='3.5.0'/> + <required namespace='osgi.bundle' name='org.jboss.tools.jmx.ui' range='1.2.0'/> + <required namespace='osgi.bundle' name='org.eclipse.wst.server.ui' range='1.1.305'/> + <required namespace='osgi.bundle' name='org.jboss.ide.eclipse.as.ui' range='2.2.0'/> + </requires> + <artifacts size='1'> + <artifact classifier='osgi.bundle' id='org.jboss.ide.eclipse.as.jmx.integration' version='0.9.0.v20110401-0131-M1'/> + </artifacts> + <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/> + <touchpointData size='1'> + <instructions size='1'> + <instruction key='manifest'> + Bundle-RequiredExecutionEnvironment: JavaSE-1.6&#xA;Bundle-Name: Integration&#xA;Created-By: Apache Maven&#xA;Bundle-Activator: org.jboss.ide.eclipse.as.jmx.integration.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-SymbolicName: org.jboss.ide.eclipse.as.jmx.integration;singleton:=true&#xA;Bundle-ManifestVersion: 2&#xA;Build-Jdk: 1.6.0_24&#xA;Archiver-Version: Plexus Archiver&#xA;Bundle-Version: 0.9.0.v20110401-0131-M1&#xA;Built-By: rob&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.jboss.ide.eclipse.as.core,org.eclipse.wst.server.core;bundle-version=&quot;1.1.302&quot;,org.jboss.tools.jmx.core;bundle-version=&quot;1.2.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.7.100&quot;,org.eclipse.ui.navigator;bundle-version=&quot;3.5.0&quot;,org.jboss.tools.jmx.ui;bundle-version=&quot;1.2.0&quot;,org.eclipse.wst.server.ui;bundle-version=&quot;1.1.305&quot;,org.jboss.ide.eclipse.as.ui;bundle-version=&quot;2.2.0&! quot;&#xA; + </instruction> + </instructions> + </touchpointData> + </unit> +</units> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -5,25 +5,25 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.as.rse.core;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.rse.core.RSECorePlugin -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.rse.core, - org.eclipse.rse.subsystems.files.core, - org.eclipse.rse.services, - org.eclipse.rse.services.files.ftp, - org.eclipse.rse.services.local, - org.eclipse.rse.services.ssh, - org.eclipse.rse.subsystems.shells.core, +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.rse.core;bundle-version="3.1.200", + org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100", + org.eclipse.rse.services;bundle-version="3.2.100", + org.eclipse.rse.services.files.ftp;bundle-version="3.0.300", + org.eclipse.rse.services.local;bundle-version="2.1.300", + org.eclipse.rse.services.ssh;bundle-version="3.1.0", + org.eclipse.rse.subsystems.shells.core;bundle-version="3.1.200", org.jboss.ide.eclipse.as.core, org.jboss.ide.eclipse.as.wtp.core, - org.eclipse.wst.server.core, - org.eclipse.wst.common.project.facet.core, - org.eclipse.core.resources, - org.eclipse.wst.common.modulecore, - org.eclipse.wst.common.emfworkbench.integration, - org.eclipse.jem.util, + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.wst.common.modulecore;bundle-version="1.2.100", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", + org.eclipse.jem.util;bundle-version="2.1.2", org.jboss.ide.eclipse.archives.webtools, - org.eclipse.debug.core, - org.eclipse.jdt.launching + org.eclipse.debug.core;bundle-version="3.7.0", + org.eclipse.jdt.launching;bundle-version="3.6.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.jboss.ide.eclipse.as.rse.core Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -5,33 +5,33 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.as.rse.ui;singleton:=true Bundle-Version: 0.9.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.rse.ui.RSEUIPlugin -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.ui, - org.eclipse.rse.core, - org.eclipse.rse.subsystems.files.core, - org.eclipse.rse.services, - org.eclipse.rse.services.files.ftp, - org.eclipse.rse.services.local, - org.eclipse.rse.services.ssh, +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.rse.core;bundle-version="3.1.200", + org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100", + org.eclipse.rse.services;bundle-version="3.2.100", + org.eclipse.rse.services.files.ftp;bundle-version="3.0.300", + org.eclipse.rse.services.local;bundle-version="2.1.300", + org.eclipse.rse.services.ssh;bundle-version="3.1.0", org.jboss.ide.eclipse.as.core, org.jboss.ide.eclipse.as.wtp.core, - org.eclipse.tm.terminal, - org.eclipse.wst.server.core, - org.eclipse.wst.common.project.facet.core, - org.eclipse.core.resources, - org.eclipse.wst.common.modulecore, - org.eclipse.wst.common.emfworkbench.integration, - org.eclipse.jem.util, + org.eclipse.tm.terminal;bundle-version="3.1.0", + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.wst.common.modulecore;bundle-version="1.2.100", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", + org.eclipse.jem.util;bundle-version="2.1.2", org.jboss.ide.eclipse.as.rse.core, org.jboss.ide.eclipse.as.ui, - org.eclipse.rse.files.ui, - org.eclipse.rse.ui, - org.eclipse.wst.server.ui, - org.eclipse.debug.ui;bundle-version="[3.6.0,4.0.0)", - org.eclipse.rse.subsystems.shells.dstore;bundle-version="2.1.200", - org.eclipse.rse.subsystems.shells.local;bundle-version="2.1.100", - org.eclipse.rse.subsystems.shells.ssh;bundle-version="2.1.100", - org.eclipse.rse.subsystems.shells.telnet;bundle-version="1.2.0" + org.eclipse.rse.files.ui;bundle-version="3.2.0", + org.eclipse.rse.ui;bundle-version="3.2.0", + org.eclipse.wst.server.ui;bundle-version="1.1.305", + org.eclipse.debug.ui;bundle-version="3.7.0", + org.eclipse.rse.subsystems.shells.dstore;bundle-version="2.1.300", + org.eclipse.rse.subsystems.shells.local;bundle-version="2.1.300", + org.eclipse.rse.subsystems.shells.ssh;bundle-version="2.1.300", + org.eclipse.rse.subsystems.shells.telnet;bundle-version="1.2.200" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Localization: plugin Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -4,56 +4,54 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.as.ui;singleton:=true Bundle-Version: 2.2.0.qualifier Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", - org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)", - org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", - org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)", - org.eclipse.debug.ui;bundle-version="[3.5.0,4.0.0)", - org.eclipse.jdt.debug;bundle-version="[3.5.0,4.0.0)", - org.eclipse.jdt.launching;bundle-version="[3.5.0,4.0.0)", - org.eclipse.jdt.ui;bundle-version="[3.5.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui.console;bundle-version="[3.4.0,4.0.0)", - org.eclipse.jdt.core.manipulation;bundle-version="[1.3.0,2.0.0)", - org.eclipse.search;bundle-version="[3.5.0,4.0.0)", - org.eclipse.ui.forms;bundle-version="[3.4.0,4.0.0)", - org.eclipse.core.resources, - org.eclipse.jface, - com.ibm.icu, - org.eclipse.jst.server.ui, - org.eclipse.wst.server.core, - org.eclipse.wst.server.ui, - org.eclipse.wst.server.ui.doc.user, - org.eclipse.jdt.debug.ui, - org.eclipse.text, - org.eclipse.debug.core, - org.eclipse.ui.views, - org.eclipse.wst.xml.ui, - org.eclipse.wst.sse.ui, - org.eclipse.wst.sse.core, - org.eclipse.wst.xml.core, - org.eclipse.core.filesystem, - org.eclipse.jst.server.core, - org.eclipse.wst.common.project.facet.core, - org.eclipse.jst.servlet.ui, - org.eclipse.jst.j2ee, - org.eclipse.jst.j2ee.ui, - org.eclipse.wst.web.ui, - org.eclipse.wst.common.frameworks.ui, - org.eclipse.jem.util, - org.apache.ant, +Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0", + org.eclipse.jface.text;bundle-version="3.7.0", + org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0", + org.eclipse.ui.editors;bundle-version="3.7.0", + org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.core.filebuffers;bundle-version="3.5.200", + org.eclipse.core.variables;bundle-version="3.2.500", + org.eclipse.core.expressions;bundle-version="3.4.200", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.debug.ui;bundle-version="3.7.0", + org.eclipse.jdt.debug;bundle-version="3.7.0", + org.eclipse.jdt.launching;bundle-version="3.6.0", + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.ltk.core.refactoring;bundle-version="3.5.200", + org.eclipse.ui.console;bundle-version="3.5.100", + org.eclipse.jdt.core.manipulation;bundle-version="1.3.0", + org.eclipse.search;bundle-version="3.6.100", + org.eclipse.ui.forms;bundle-version="3.5.100", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.jface;bundle-version="3.7.0", + com.ibm.icu;bundle-version="4.2.1", + org.eclipse.jst.server.ui;bundle-version="1.1.201", + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.wst.server.ui;bundle-version="1.1.305", + org.eclipse.wst.server.ui.doc.user;bundle-version="1.1.300", + org.eclipse.jdt.debug.ui;bundle-version="3.6.0", + org.eclipse.text;bundle-version="3.5.100", + org.eclipse.debug.core;bundle-version="3.7.0", + org.eclipse.ui.views;bundle-version="3.6.0", + org.eclipse.wst.xml.ui;bundle-version="1.1.200", + org.eclipse.wst.sse.ui;bundle-version="1.3.0", + org.eclipse.wst.sse.core;bundle-version="1.1.600", + org.eclipse.wst.xml.core;bundle-version="1.1.600", + org.eclipse.core.filesystem;bundle-version="1.3.100", + org.eclipse.jst.server.core;bundle-version="1.2.101", + org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", + org.eclipse.jst.servlet.ui;bundle-version="1.1.500", + org.eclipse.jst.j2ee;bundle-version="1.1.500", + org.eclipse.jst.j2ee.ui;bundle-version="1.1.500", + org.eclipse.wst.web.ui;bundle-version="1.1.400", + org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.0", + org.eclipse.jem.util;bundle-version="2.1.2", + org.apache.ant;bundle-version="1.7.1", org.jboss.ide.eclipse.as.core, - org.eclipse.ui.navigator, - org.eclipse.ui.views.log, - org.jboss.tools.jmx.ui, - org.jboss.tools.jmx.core, - org.eclipse.jst.j2ee.core + org.eclipse.ui.navigator;bundle-version="3.5.0", + org.eclipse.ui.views.log;bundle-version="1.0.200", + org.eclipse.jst.j2ee.core;bundle-version="1.2.100" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.as.ui, org.jboss.ide.eclipse.as.ui.dialogs, Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -1,63 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.launch; - -import java.util.List; -import java.util.Properties; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.window.Window; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerWorkingCopy; -import org.jboss.ide.eclipse.as.core.extensions.polling.JMXPoller; -import org.jboss.ide.eclipse.as.core.server.IPollerFailureHandler; -import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; -import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin; -import org.jboss.ide.eclipse.as.ui.Messages; -import org.jboss.ide.eclipse.as.ui.dialogs.RequiredCredentialsDialog; - -/** - * - * @author rob.stryker <rob.stryker(a)redhat.com&gt; - * - */ -public class SecurityFailureHandler implements IPollerFailureHandler { - - public boolean accepts(IServerStatePoller poller, String action, - List requiredProperties) { - if( poller.getPollerType().getId().equals(JMXPoller.POLLER_ID)) - return true; - return false; - } - - public void handle(final IServerStatePoller poller, String action, List requiredProperties) { - Display.getDefault().asyncExec(new Runnable() { - public void run() { - IServer server = poller.getServer(); - IServerWorkingCopy copy = server.createWorkingCopy(); - JBossServer jbs = ServerConverter.getJBossServer(copy); - RequiredCredentialsDialog d = new RequiredCredentialsDialog(new Shell(), jbs); - if( d.open() == Window.OK) { - if( d.getSave() ) { - jbs.setPassword(d.getPass()); - jbs.setUsername(d.getUser()); - try { - copy.save(false, null); - } catch( CoreException ce ) { - JBossServerUIPlugin.log(Messages.ServerSaveFailed, ce); - } - } - - Properties p = new Properties(); - p.put(JMXPoller.REQUIRED_USER, d.getUser()); - p.put(JMXPoller.REQUIRED_PASS, d.getPass()); - poller.failureHandled(p); - } else { - poller.failureHandled(null); - } - } - }); - } -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -13,7 +13,6 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.ui.internal.provisional.ManagedUIDecorator; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; -import org.jboss.ide.eclipse.as.core.extensions.polling.JMXPoller; import org.jboss.ide.eclipse.as.core.server.internal.PollThread; import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; import org.jboss.ide.eclipse.as.ui.Messages; @@ -72,11 +71,11 @@ return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK); int state = code & 0xF; switch(state) { - case JMXPoller.STATE_STARTED: + case IEventCodes.STATE_STARTED: return new ManagedUIDecorator().getStateImage(IServer.STATE_STARTED, ILaunchManager.RUN_MODE, 1); - case JMXPoller.STATE_STOPPED: + case IEventCodes.STATE_STOPPED: return new ManagedUIDecorator().getStateImage(IServer.STATE_STOPPED, ILaunchManager.RUN_MODE, 1); - case JMXPoller.STATE_TRANSITION: + case IEventCodes.STATE_TRANSITION: return new ManagedUIDecorator().getStateImage(IServer.STATE_STARTING, ILaunchManager.RUN_MODE, 1); } } else if( (code & IEventCodes.FULL_POLLER_MASK) == IEventCodes.BEHAVIOR_STATE_CODE) { Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -1,194 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.views.server.extensions; - -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.action.IContributionItem; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jface.viewers.StructuredViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.navigator.CommonActionProvider; -import org.eclipse.ui.navigator.CommonViewer; -import org.eclipse.ui.navigator.ICommonActionExtensionSite; -import org.eclipse.ui.navigator.ICommonViewerSite; -import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite; -import org.eclipse.ui.views.IViewDescriptor; -import org.eclipse.ui.views.IViewRegistry; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction; -import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnection; -import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages; -import org.jboss.tools.jmx.core.ExtensionManager; -import org.jboss.tools.jmx.core.IConnectionWrapper; -import org.jboss.tools.jmx.ui.internal.views.navigator.JMXNavigator; -import org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorerContentProvider; -import org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorerLabelProvider; - -public class JMXProvider { - - public static class ActionProvider extends CommonActionProvider { - private ICommonActionExtensionSite actionSite; - private ShowInJMXViewAction showInJMXViewAction; - public ActionProvider() { - super(); - } - - public void init(ICommonActionExtensionSite aSite) { - super.init(aSite); - this.actionSite = aSite; - createActions(aSite); - } - - protected void createActions(ICommonActionExtensionSite aSite) { - ICommonViewerSite site = aSite.getViewSite(); - if( site instanceof ICommonViewerWorkbenchSite ) { - StructuredViewer v = aSite.getStructuredViewer(); - if( v instanceof CommonViewer ) { - CommonViewer cv = (CommonViewer)v; - ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite)site; - showInJMXViewAction = new ShowInJMXViewAction(wsSite.getSelectionProvider()); - } - } - } - - public void fillContextMenu(IMenuManager menu) { - ICommonViewerSite site = actionSite.getViewSite(); - IStructuredSelection selection = null; - if (site instanceof ICommonViewerWorkbenchSite) { - ICommonViewerWorkbenchSite wsSite = (ICommonViewerWorkbenchSite) site; - selection = (IStructuredSelection) wsSite.getSelectionProvider() - .getSelection(); - } - - IContributionItem quick = menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$ - if( quick != null && selection != null && selection.toArray().length == 1 ) { - if( selection.getFirstElement() instanceof IServer ) { - if( menu instanceof MenuManager ) { - ((MenuManager)quick).add(showInJMXViewAction); - } - } - } - } - - public class ShowInJMXViewAction extends AbstractServerAction { - public ShowInJMXViewAction(ISelectionProvider sp) { - super(sp, null); - - IViewRegistry reg = PlatformUI.getWorkbench().getViewRegistry(); - IViewDescriptor desc = reg.find(JMXNavigator.VIEW_ID); - setText(desc.getLabel()); - setImageDescriptor(desc.getImageDescriptor()); - } - - public boolean accept(IServer server) { - return (server.getServerType() != null && - server.loadAdapter(JBossServer.class, new NullProgressMonitor()) != null - && server.getServerState() == IServer.STATE_STARTED); - } - - public void perform(final IServer server) { - IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow() ; - if (window != null) { - IWorkbenchPage page = window.getActivePage(); - if (page != null) { - IWorkbenchPart part = page.findView(JMXNavigator.VIEW_ID); - if (part == null) { - try { - part = page.showView(JMXNavigator.VIEW_ID); - } catch (PartInitException e) { - } - } else /* if( part != null ) */ { - final JMXNavigator view = (JMXNavigator) part.getAdapter(JMXNavigator.class); - if (view != null) { - view.setFocus(); - Display.getDefault().asyncExec(new Runnable() { - public void run() { - JBossServerConnectionProvider provider = - (JBossServerConnectionProvider)ExtensionManager.getProvider( - JBossServerConnectionProvider.PROVIDER_ID); - JBossServerConnection connection = provider.getConnection(server); - if( connection != null ) { - view.getCommonViewer().collapseAll(); - ISelection sel = new StructuredSelection(new Object[] { connection }); - view.getCommonViewer().setSelection(sel, true); - view.getCommonViewer().expandToLevel(connection, 2); - } - } - }); - } - } - } - } - } - } - } - - public static class ContentProvider implements ITreeContentProvider { - private MBeanExplorerContentProvider delegate; - public ContentProvider() { - delegate = new MBeanExplorerContentProvider(); - } - public Object[] getChildren(Object parentElement) { - if( parentElement instanceof IServer ) { - Object sel = JBossServerConnectionProvider.getConnection((IServer)parentElement); - if( sel != null ) - return new Object[] { sel }; - } - return delegate.getChildren(parentElement); - } - public Object getParent(Object element) { - return delegate.getParent(element); - } - public boolean hasChildren(Object element) { - return delegate.hasChildren(element); - } - public Object[] getElements(Object inputElement) { - return delegate.getElements(inputElement); - } - public void dispose() { - delegate.dispose(); - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - delegate.inputChanged(viewer, oldInput, newInput); - } - } - - public static class LabelProvider extends org.eclipse.jface.viewers.LabelProvider { - private MBeanExplorerLabelProvider delegate; - public LabelProvider() { - delegate = new MBeanExplorerLabelProvider(); - } - - public void dispose() { - delegate.dispose(); - } - - public String getText(Object element) { - if( element instanceof IConnectionWrapper ) { - return "JMX"; //$NON-NLS-1$ - } - return delegate.getText(element); - } - - public Image getImage(Object element) { - if( element instanceof IConnectionWrapper ) { - return JBossServerUISharedImages.getImage(JBossServerUISharedImages.JMX_IMAGE); - } - return delegate.getImage(element); - } - } - -} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -511,7 +511,7 @@ dest = new Path(homeDir).append(dest); dest = dest.append(d.getNewConfig()); dest.toFile().mkdirs(); - org.jboss.tools.jmx.core.util.FileUtil.copyDir(source.toFile(), dest.toFile()); + FileUtil.copyDir(source.toFile(), dest.toFile()); configDirText.setText(d.getNewDest()); configurations.setSelection(new StructuredSelection(d.getNewConfig())); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-04-01 17:51:08 UTC (rev 30223) @@ -399,45 +399,6 @@ </instanceof> </enablement> </actionProvider> - <actionProvider - class="org.jboss.ide.eclipse.as.ui.views.server.extensions.JMXProvider$ActionProvider" - id="org.jboss.ide.eclipse.as.ui.extensions.showInJMXView"> - <enablement> - <instanceof - value="org.eclipse.wst.server.core.IServer"> - </instanceof> - </enablement> - </actionProvider> - <navigatorContent - activeByDefault="false" - contentProvider="org.jboss.ide.eclipse.as.ui.views.server.extensions.JMXProvider$ContentProvider" - icon="$nl$/icons/jmeth_obj.gif" - id="org.jboss.ide.eclipse.as.ui.extensions.jmx" - labelProvider="org.jboss.ide.eclipse.as.ui.views.server.extensions.JMXProvider$LabelProvider" - name="%NavigatorContent_JMX" - priority="low"> - <triggerPoints> - <instanceof - value="org.eclipse.wst.server.core.IServer"> - </instanceof> - </triggerPoints> - <possibleChildren> - <or> - <instanceof - value="org.jboss.tools.jmx.core.tree.Node"> - </instanceof> - <instanceof - value="org.jboss.ide.eclipse.as.ui.views.server.extensions.JMXProvider$Wrapper"> - </instanceof> - <instanceof - value="org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorerContentProvider$DelayProxy"> - </instanceof> - <instanceof - value="org.jboss.tools.jmx.core.MBeanFeatureInfoWrapper"> - </instanceof> - </or> - </possibleChildren> - </navigatorContent> </extension> @@ -450,14 +411,6 @@ isRoot="false" pattern="org.jboss.ide.eclipse.as.ui.extensions.xml"> </contentExtension> - <contentExtension - isRoot="false" - pattern="org.jboss.ide.eclipse.as.ui.extensions.jmx"> - </contentExtension> - <contentExtension - isRoot="false" - pattern="org.jboss.tools.jmx.ui.internal.views.navigator.JMXLinkHelper"> - </contentExtension> </includes> </viewerContentBinding> <viewerActionBinding @@ -467,11 +420,6 @@ pattern="org.jboss.ide.eclipse.as.ui.extensions.modules"/> <actionExtension pattern="org.jboss.ide.eclipse.as.ui.extensions.serverLog"/> - <actionExtension - pattern="org.jboss.ide.eclipse.as.ui.extensions.showInJMXView"/> - <actionExtension - pattern="org.jboss.tools.jmx.ui.internal.views.navigator.actionProvider"> - </actionExtension> </includes> </viewerActionBinding> </extension> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -5,22 +5,22 @@ Bundle-Version: 2.1.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.ui.mbeans.Activator Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.wst.xml.core, - org.eclipse.wst.xml.ui, - org.eclipse.wst.sse.ui, - org.eclipse.jface.text, - org.eclipse.wst.sse.core, - org.eclipse.jdt, - org.eclipse.jdt.core, - org.eclipse.jdt.debug, - org.eclipse.jdt.debug.ui, - org.eclipse.core.resources, - org.eclipse.wst.xml.ui.infopop, - org.eclipse.jdt.ui, - org.eclipse.ui.ide, - org.eclipse.core.filesystem, +Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.wst.xml.core;bundle-version="1.1.600", + org.eclipse.wst.xml.ui;bundle-version="1.1.200", + org.eclipse.wst.sse.ui;bundle-version="1.3.0", + org.eclipse.jface.text;bundle-version="3.7.0", + org.eclipse.wst.sse.core;bundle-version="1.1.600", + org.eclipse.jdt;bundle-version="3.7.0", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.jdt.debug;bundle-version="3.7.0", + org.eclipse.jdt.debug.ui;bundle-version="3.6.0", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.wst.xml.ui.infopop;bundle-version="1.0.400", + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.ui.ide;bundle-version="3.7.0", + org.eclipse.core.filesystem;bundle-version="1.3.100", org.jboss.ide.eclipse.as.ui Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.as.ui.mbeans.editors.proposals Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -4,24 +4,24 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.as.wtp.core;singleton:=true Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.wtp.core.ASWTPToolsPlugin -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.wst.server.core;bundle-version="1.1.101", - org.eclipse.wst.common.modulecore;bundle-version="1.1.300", - org.eclipse.core.resources;bundle-version="3.5.0", - org.eclipse.emf.common;bundle-version="2.5.0", - org.eclipse.emf.ecore;bundle-version="2.5.0", - org.eclipse.jst.jee;bundle-version="1.0.200", - org.eclipse.jst.j2ee.core;bundle-version="1.1.300", - org.eclipse.jst.j2ee;bundle-version="1.1.300", - org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0", - org.eclipse.jem.util;bundle-version="2.0.200", - org.eclipse.wst.web;bundle-version="1.1.300", - org.eclipse.wst.common.frameworks;bundle-version="1.1.300", - org.eclipse.jst.common.frameworks;bundle-version="1.1.300", - org.eclipse.core.commands;bundle-version="3.5.0", - org.eclipse.jst.server.core;bundle-version="1.2.0", - org.eclipse.jdt.core;bundle-version="3.5.0", - org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.300" +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.wst.common.modulecore;bundle-version="1.2.100", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.emf.common;bundle-version="2.7.0", + org.eclipse.emf.ecore;bundle-version="2.7.0", + org.eclipse.jst.jee;bundle-version="1.0.401", + org.eclipse.jst.j2ee.core;bundle-version="1.2.100", + org.eclipse.jst.j2ee;bundle-version="1.1.500", + org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", + org.eclipse.jem.util;bundle-version="2.1.2", + org.eclipse.wst.web;bundle-version="1.1.500", + org.eclipse.wst.common.frameworks;bundle-version="1.2.0", + org.eclipse.jst.common.frameworks;bundle-version="1.1.500", + org.eclipse.core.commands;bundle-version="3.6.0", + org.eclipse.jst.server.core;bundle-version="1.2.101", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.ide.eclipse.as.wtp.core.modules, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/ASWTPToolsPlugin.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/ASWTPToolsPlugin.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/ASWTPToolsPlugin.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Plugin; import org.osgi.framework.BundleContext; @@ -39,7 +38,6 @@ public void start(BundleContext context) throws Exception { super.start(context); plugin = this; - ResourcesPlugin.getWorkspace().addResourceChangeListener(WTP31DependencyListener.INSTANCE); } /* @@ -47,7 +45,6 @@ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ public void stop(BundleContext context) throws Exception { - ResourcesPlugin.getWorkspace().removeResourceChangeListener(WTP31DependencyListener.INSTANCE); plugin = null; super.stop(context); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/WTP31DependencyListener.java 2011-04-01 17:51:08 UTC (rev 30223) @@ -38,9 +38,10 @@ * */ -public class WTP31DependencyListener implements IResourceChangeListener, - IResourceDeltaVisitor { +public class WTP31DependencyListener { //implements IResourceChangeListener, IResourceDeltaVisitor { + /* + public static WTP31DependencyListener INSTANCE = new WTP31DependencyListener(); private WTP31DependencyListener() { @@ -112,7 +113,7 @@ // } else if ((IResourceDelta.REMOVED & kind) != 0) { // updateModuleDependencies(); // return false; - /* } else */ + // } else if ((IResourceDelta.CHANGED & kind) != 0) { // int flags = delta.getFlags(); // if ((IResourceDelta.OPEN & flags) != 0) { @@ -155,7 +156,7 @@ // IDependencyGraph.MODIFIED); // } // } - /* } else */ + // } else if (endsWithIgnoreCase(name, IModuleExtensions.DOT_JAR) || endsWithIgnoreCase(name, IModuleExtensions.DOT_WAR) || endsWithIgnoreCase(name, IModuleExtensions.DOT_RAR)) { @@ -221,4 +222,5 @@ public static boolean isFolder(IResource resource, IVirtualFolder folder) { return J2EEComponentClasspathUpdater.isFolder(resource, folder); } + */ } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/META-INF/MANIFEST.MF 2011-04-01 17:51:08 UTC (rev 30223) @@ -4,29 +4,29 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.as.wtp.ui;singleton:=true Bundle-Version: 2.2.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.wtp.ui.WTPOveridePlugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.resources;bundle-version="3.5.0", - org.eclipse.wst.common.modulecore;bundle-version="1.1.300", - org.eclipse.jst.j2ee;bundle-version="1.1.300", - org.eclipse.jst.j2ee.core;bundle-version="1.1.300", - org.eclipse.jst.j2ee.ui;bundle-version="1.1.300", - org.eclipse.wst.common.core;bundle-version="1.1.201", - org.eclipse.wst.common.frameworks;bundle-version="1.1.300", - org.eclipse.wst.common.frameworks.ui;bundle-version="1.1.300", - org.eclipse.jst.common.frameworks;bundle-version="1.1.300", - org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0", - org.eclipse.jdt;bundle-version="3.5.0", - org.eclipse.jdt.core;bundle-version="3.5.0", - org.eclipse.jem.util;bundle-version="2.0.200", - org.eclipse.jst.jee;bundle-version="1.0.200", - org.eclipse.jdt.ui;bundle-version="3.5.0", - org.eclipse.wst.server.ui;bundle-version="1.1.102", - org.eclipse.wst.server.core;bundle-version="1.1.101", - org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.300", - org.eclipse.emf.ecore;bundle-version="2.5.0", +Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.wst.common.modulecore;bundle-version="1.2.100", + org.eclipse.jst.j2ee;bundle-version="1.1.500", + org.eclipse.jst.j2ee.core;bundle-version="1.2.100", + org.eclipse.jst.j2ee.ui;bundle-version="1.1.500", + org.eclipse.wst.common.core;bundle-version="1.2.0", + org.eclipse.wst.common.frameworks;bundle-version="1.2.0", + org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.0", + org.eclipse.jst.common.frameworks;bundle-version="1.1.500", + org.eclipse.wst.common.project.facet.core;bundle-version="1.4.200", + org.eclipse.jdt;bundle-version="3.7.0", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.jem.util;bundle-version="2.1.2", + org.eclipse.jst.jee;bundle-version="1.0.401", + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.wst.server.ui;bundle-version="1.1.305", + org.eclipse.wst.server.core;bundle-version="1.1.302", + org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100", + org.eclipse.emf.ecore;bundle-version="2.7.0", org.jboss.ide.eclipse.as.wtp.core;bundle-version="1.0.0", - org.eclipse.debug.ui;bundle-version="3.5.1";resolution:=optional + org.eclipse.debug.ui;bundle-version="3.7.0";resolution:=optional Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: JBoss by Red Hat Modified: trunk/as/plugins/pom.xml =================================================================== --- trunk/as/plugins/pom.xml 2011-04-01 17:48:24 UTC (rev 30222) +++ trunk/as/plugins/pom.xml 2011-04-01 17:51:08 UTC (rev 30223) @@ -17,7 +17,8 @@ <module>org.jboss.ide.eclipse.as.wtp.core</module> <module>org.jboss.ide.eclipse.as.wtp.ui</module> <module>org.jboss.ide.eclipse.as.rse.core</module> - <module>org.jboss.ide.eclipse.as.rse.ui</module> + <module>org.jboss.ide.eclipse.as.rse.ui</module> + <module>org.jboss.ide.eclipse.as.jmx.integration</module> </modules> </project>