JBoss Tools SVN: r11893 - in trunk: as/plugins/org.jboss.ide.eclipse.as.ui and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-19 20:48:57 -0500 (Wed, 19 Nov 2008)
New Revision: 11893
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jmeth_obj.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jmxIcon.JPG
Modified:
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.ui/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java
trunk/jmx/plugins/org.jboss.tools.jmx.ui/META-INF/MANIFEST.MF
trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/ActionProvider.java
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java
Log:
JBIDE-2760 - some additional touches to add to servers view as well.
Modified: 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 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2008-11-20 01:48:57 UTC (rev 11893)
@@ -24,9 +24,11 @@
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);
@@ -49,7 +51,8 @@
}
public void loadRoot(IProgressMonitor monitor) {
- if( isConnected()) {
+ 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);
@@ -62,6 +65,7 @@
JBossServerCorePlugin.getDefault().getLog().log(status);
} finally {
JMXClassLoaderRepository.getDefault().removeConcerned(server, this);
+ isLoading = false;
}
}
}
@@ -89,7 +93,6 @@
public void serverChanged(ServerEvent event) {
int eventKind = event.getKind();
- IServer server = event.getServer();
if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) {
// server change event
if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
Modified: 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 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java 2008-11-20 01:48:57 UTC (rev 11893)
@@ -98,6 +98,7 @@
}
public IConnectionWrapper findConnection(IServer s) {
+ getConnections();
return idToConnection.get(s.getId());
}
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 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2008-11-20 01:48:57 UTC (rev 11893)
@@ -43,7 +43,9 @@
org.apache.ant,
org.jboss.ide.eclipse.as.core,
org.eclipse.ui.navigator;bundle-version="3.3.100",
- org.eclipse.ui.views.log;bundle-version="1.0.0"
+ org.eclipse.ui.views.log;bundle-version="1.0.0",
+ org.jboss.tools.jmx.ui;bundle-version="0.2.2",
+ org.jboss.tools.jmx.core;bundle-version="0.2.1"
Eclipse-LazyStart: true
Export-Package: org.jboss.ide.eclipse.as.ui,
org.jboss.ide.eclipse.as.ui.dialogs,
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jmeth_obj.gif
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jmeth_obj.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jmxIcon.JPG
===================================================================
(Binary files differ)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2008-11-20 01:48:57 UTC (rev 11893)
@@ -51,8 +51,8 @@
public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE";
public static final String PUBLISH_IMAGE = "PUBLISH_IMAGE";
public static final String UNPUBLISH_IMAGE = "UNPUBLISH_IMAGE";
+ public static final String JMX_IMAGE = "JMX_IMAGE";
-
private static JBossServerUISharedImages instance;
private Hashtable<String, Object> images, descriptors;
@@ -75,7 +75,7 @@
descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif"));
descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/publish.gif"));
descriptors.put(UNPUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/unpublish.gif"));
-
+ descriptors.put(JMX_IMAGE, createImageDescriptor(pluginBundle, "/icons/jmeth_obj.gif"));
Iterator<String> iter = descriptors.keySet().iterator();
while (iter.hasNext()) {
Added: 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 (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java 2008-11-20 01:48:57 UTC (rev 11893)
@@ -0,0 +1,67 @@
+package org.jboss.ide.eclipse.as.ui.views.server.extensions;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider;
+import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
+import org.jboss.tools.jmx.core.IConnectionWrapper;
+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 ContentProvider implements ITreeContentProvider {
+ private MBeanExplorerContentProvider delegate;
+ public ContentProvider() {
+ delegate = new MBeanExplorerContentProvider();
+ }
+ public Object[] getChildren(Object parentElement) {
+ if( parentElement instanceof IServer )
+ return new Object[] { JBossServerConnectionProvider.getConnection((IServer)parentElement)};
+ 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";
+ }
+ 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/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-11-20 01:48:57 UTC (rev 11893)
@@ -426,6 +426,33 @@
</instanceof>
</enablement>
</actionProvider>
+ <navigatorContent
+ activeByDefault="true"
+ contentProvider="org.jboss.ide.eclipse.as.ui.views.server.extensions.JMXProvider$ContentProvider"
+ icon="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="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>
+ </or>
+ </possibleChildren>
+ </navigatorContent>
</extension>
@@ -439,6 +466,14 @@
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
@@ -448,6 +483,9 @@
pattern="org.jboss.ide.eclipse.as.ui.extensions.modules"/>
<actionExtension
pattern="org.jboss.ide.eclipse.as.ui.extensions.serverLog"/>
+ <actionExtension
+ pattern="org.jboss.tools.jmx.ui.internal.views.navigator.actionProvider">
+ </actionExtension>
</includes>
</viewerActionBinding>
</extension>
@@ -483,9 +521,6 @@
icon="icons/jboss.gif"
id="org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider"
name="JBoss Server">
- <wizardPage
- class="org.jboss.tools.jmx.ui.internal.wizards.DefaultConnectionWizardPage">
- </wizardPage>
</providerUI>
</extension>
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java 2008-11-20 01:48:57 UTC (rev 11893)
@@ -31,7 +31,7 @@
* Loads the root object in the current thread if it is not loaded.
* If it is loaded, does nothing.
*/
- public void loadRoot(IProgressMonitor monitor);
+ public void loadRoot(IProgressMonitor monitor) throws CoreException;
/**
* Gets the current root object, or null if its not yet loaded.
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java 2008-11-20 01:48:57 UTC (rev 11893)
@@ -38,7 +38,7 @@
private JMXConnector connector;
private MBeanServerConnection connection;
private Root root;
-
+ private boolean isLoading;
private boolean isConnected;
private Map<String, String[]> environment;
@@ -47,6 +47,7 @@
public DefaultConnectionWrapper(MBeanServerConnectionDescriptor descriptor) throws MalformedURLException {
this.descriptor = descriptor;
this.isConnected = false;
+ this.isLoading = false;
String username = descriptor.getUserName();
environment = new HashMap<String, String[]>();
if (username != null && username.length() > 0) {
@@ -102,12 +103,13 @@
return root;
}
- public void loadRoot(IProgressMonitor monitor) {
- if( isConnected && root == null ) {
+ public void loadRoot(IProgressMonitor monitor) throws CoreException {
+ if( isConnected && root == null && !isLoading) {
try {
+ isLoading = true;
root = NodeUtils.createObjectNameTree(this, monitor);
- } catch( CoreException ce ) {
- // TODO LOG
+ } finally {
+ isLoading = false;
}
}
}
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/META-INF/MANIFEST.MF 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/META-INF/MANIFEST.MF 2008-11-20 01:48:57 UTC (rev 11893)
@@ -13,6 +13,7 @@
org.jboss.tools.jmx.core;bundle-version="0.2.1"
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.jboss.tools.jmx.ui.extensions
+Export-Package: org.jboss.tools.jmx.ui.extensions,
+ org.jboss.tools.jmx.ui.internal.views.navigator
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/plugin.xml 2008-11-20 01:48:57 UTC (rev 11893)
@@ -81,7 +81,7 @@
<navigatorContent
activeByDefault="true"
contentProvider="org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorerContentProvider"
- icon="icons/sample.gif"
+ icon="icons/full/obj16/jmeth_obj.gif"
id="org.jboss.tools.jmx.ui.internal.views.navigator.root"
labelProvider="org.jboss.tools.jmx.ui.internal.views.navigator.MBeanExplorerLabelProvider"
name="MBeans"
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/ActionProvider.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/ActionProvider.java 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/ActionProvider.java 2008-11-20 01:48:57 UTC (rev 11893)
@@ -65,8 +65,11 @@
}
// Finish up
- menu.add(new Separator());
- menu.add(newConnectionAction);
+ int size = getSelectionSize();
+ if( size == 0 || (size == 1 && getWrappersFromSelection().length == 1)) {
+ menu.add(new Separator());
+ menu.add(newConnectionAction);
+ }
}
protected boolean anyConnected(IConnectionWrapper[] connections) {
@@ -82,6 +85,16 @@
return true;
}
+ protected int getSelectionSize() {
+ if( getContext() != null && getContext().getSelection() != null ) {
+ ISelection sel = getContext().getSelection();
+ if( sel instanceof IStructuredSelection ) {
+ return ((IStructuredSelection)sel).size();
+ }
+ }
+ return -1;
+ }
+
protected IConnectionWrapper[] getWrappersFromSelection() {
ArrayList<IConnectionWrapper> list = new ArrayList<IConnectionWrapper>();
if( getContext() != null && getContext().getSelection() != null ) {
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java 2008-11-19 23:38:57 UTC (rev 11892)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java 2008-11-20 01:48:57 UTC (rev 11893)
@@ -12,6 +12,7 @@
import java.util.HashMap;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -108,9 +109,11 @@
protected IStatus run(IProgressMonitor monitor) {
try {
w.loadRoot(monitor);
- } catch( RuntimeException re ) {
+ } catch( CoreException ce ) {
+ return ce.getStatus();
+ } finally {
+ loading.remove(w);
}
- loading.remove(w);
Display.getDefault().asyncExec(new Runnable() {
public void run() {
if( viewer instanceof StructuredViewer)
17 years, 5 months
JBoss Tools SVN: r11892 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-19 18:38:57 -0500 (Wed, 19 Nov 2008)
New Revision: 11892
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/AppClientModule16.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/AppClientModule24.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/EJBModule16.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/EJBModule24.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/WebModule16.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/WebModule24.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/file-info.png
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/ignore.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/info_obj.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jar_obj.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/multiple_files.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/sample.gif
Log:
unused images
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/AppClientModule16.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/AppClientModule24.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/EJBModule16.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/EJBModule24.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/WebModule16.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/WebModule24.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/file-info.png
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/ignore.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/info_obj.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/jar_obj.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/multiple_files.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/sample.gif
===================================================================
(Binary files differ)
17 years, 5 months
JBoss Tools SVN: r11891 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-11-19 14:48:30 -0500 (Wed, 19 Nov 2008)
New Revision: 11891
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3094 Fixed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java 2008-11-19 19:36:42 UTC (rev 11890)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java 2008-11-19 19:48:30 UTC (rev 11891)
@@ -24,11 +24,16 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
+import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
public class ChangeTimeStampActionDelegate implements IWorkbenchWindowActionDelegate {
@@ -67,10 +72,11 @@
protected boolean computeEnabled() {
if(project == null || !project.isAccessible()) return false;
- boolean isWar = J2EEProjectUtilities.isDynamicWebProject(project);
- boolean isEar = J2EEProjectUtilities.isEARProject(project);
- boolean isEJB = J2EEProjectUtilities.isEJBProject(project);
- return isEar || isEJB || isWar;
+ boolean isWar = JavaEEProjectUtilities.isDynamicWebProject(project);
+ boolean isEar = JavaEEProjectUtilities.isEARProject(project);
+ boolean isEJB = JavaEEProjectUtilities.isEJBProject(project);
+ boolean isEsb = isESBProject(project);
+ return isEar || isEJB || isWar || isEsb;
}
public void run(IAction action) {
@@ -98,8 +104,8 @@
private static List<IFile> getFilesToTouch(IProject project) {
List<IFile> fs = new ArrayList<IFile>();
if(project == null || !project.isAccessible()) return fs;
- boolean isWar = J2EEProjectUtilities.isDynamicWebProject(project);
- boolean isEar = J2EEProjectUtilities.isEARProject(project);
+ boolean isWar = JavaEEProjectUtilities.isDynamicWebProject(project);
+ boolean isEar = JavaEEProjectUtilities.isEARProject(project);
boolean isReferencedByEar = false;
if(!isEar) {
@@ -125,6 +131,32 @@
fs.add(f);
}
}
+ if(isESBProject(project)) {
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ IPath path = component.getRootFolder().getProjectRelativePath();
+ IFile f = project.getFile(path.append("META-INF").append("jboss-esb.xml"));
+ if(f != null && f.exists()) {
+ fs.add(f);
+ }
+ }
+
return fs;
- }
+ }
+
+ private final static String ESB_PROJECT_FACET = "jst.jboss.esb";
+
+ private static boolean isESBProject(IProject project) {
+ IFacetedProject facetedProject = null;
+ try {
+ facetedProject = ProjectFacetsManager.create(project);
+ } catch (CoreException e) {
+ JBossServerUIPlugin.log(e.getMessage(), e);
+ return false;
+ }
+ if (facetedProject != null && ProjectFacetsManager.isProjectFacetDefined(ESB_PROJECT_FACET)) {
+ IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(ESB_PROJECT_FACET);
+ return projectFacet != null && facetedProject.hasProjectFacet(projectFacet);
+ }
+ return false;
+ }
}
\ No newline at end of file
17 years, 5 months
JBoss Tools SVN: r11890 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-19 14:36:42 -0500 (Wed, 19 Nov 2008)
New Revision: 11890
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
Log:
JBIDE-3144
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-11-19 19:14:51 UTC (rev 11889)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-11-19 19:36:42 UTC (rev 11890)
@@ -3391,5 +3391,12 @@
private void setVpeUpdateDelayTime(int vpeUpdateDelayTime) {
this.vpeUpdateDelayTime = vpeUpdateDelayTime;
}
+
+ /**
+ * @return the selectionManager
+ */
+ public ISelectionManager getSelectionManager() {
+ return selectionManager;
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-11-19 19:14:51 UTC (rev 11889)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-11-19 19:36:42 UTC (rev 11890)
@@ -23,6 +23,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+
+import org.apache.commons.httpclient.methods.GetMethod;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Path;
@@ -406,9 +408,18 @@
boolean registerFlag = isCurrentMainDocument();
- // reads and dispatch events, this code prevent eclipse
- //from sleeping during processing big pages
- getPageContext().processDisplayEvents();
+ //it's check for initialization visualController,
+ //if we trying to process some event when controller
+ //hasn't been initialized, it's causes
+ //org.eclipse.ui.PartInitException: Warning: Detected recursive
+ //attempt by part org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor to create itself
+ //(this is probably, but not necessarily, a bug)
+
+ if(visualEditor.getController().getSelectionManager()!=null) {
+ // reads and dispatch events, this code prevent eclipse
+ //from sleeping during processing big pages
+ getPageContext().processDisplayEvents();
+ }
// JBIDE-675, checks if editor was disposed or not
if (getPageContext().getSourceBuilder() == null
|| includeDocuments == null) {
17 years, 5 months
JBoss Tools SVN: r11887 - in trunk: jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-19 14:04:58 -0500 (Wed, 19 Nov 2008)
New Revision: 11887
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/Root.java
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java
Log:
JBIDE-3227 - added progress monitors, switched to a job
Modified: 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 2008-11-19 19:04:25 UTC (rev 11886)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2008-11-19 19:04:58 UTC (rev 11887)
@@ -5,6 +5,7 @@
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.wst.server.core.IServer;
@@ -47,14 +48,14 @@
return root;
}
- public void loadRoot() {
+ public void loadRoot(IProgressMonitor monitor) {
if( isConnected()) {
// 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);
+ root = NodeUtils.createObjectNameTree(this, monitor);
}
} catch( CoreException ce ) {
IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ce.getMessage(), ce);
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java 2008-11-19 19:04:25 UTC (rev 11886)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java 2008-11-19 19:04:58 UTC (rev 11887)
@@ -13,6 +13,7 @@
import java.io.IOException;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.jboss.tools.jmx.core.tree.Root;
@@ -30,7 +31,7 @@
* Loads the root object in the current thread if it is not loaded.
* If it is loaded, does nothing.
*/
- public void loadRoot();
+ public void loadRoot(IProgressMonitor monitor);
/**
* Gets the current root object, or null if its not yet loaded.
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java 2008-11-19 19:04:25 UTC (rev 11886)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java 2008-11-19 19:04:58 UTC (rev 11887)
@@ -21,6 +21,7 @@
import javax.management.remote.JMXServiceURL;
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.jboss.tools.jmx.core.ExtensionManager;
@@ -101,10 +102,10 @@
return root;
}
- public void loadRoot() {
+ public void loadRoot(IProgressMonitor monitor) {
if( isConnected && root == null ) {
try {
- root = NodeUtils.createObjectNameTree(this);
+ root = NodeUtils.createObjectNameTree(this, monitor);
} catch( CoreException ce ) {
// TODO LOG
}
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java 2008-11-19 19:04:25 UTC (rev 11886)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java 2008-11-19 19:04:58 UTC (rev 11887)
@@ -15,6 +15,8 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubProgressMonitor;
import org.jboss.tools.jmx.core.IConnectionWrapper;
import org.jboss.tools.jmx.core.IJMXRunnable;
@@ -42,18 +44,25 @@
}
@SuppressWarnings("unchecked")
- public static Root createObjectNameTree(final IConnectionWrapper connectionWrapper)
+ public static Root createObjectNameTree(final IConnectionWrapper connectionWrapper, final IProgressMonitor monitor)
throws CoreException {
final Root[] _root = new Root[1];
connectionWrapper.run(new IJMXRunnable() {
public void run(MBeanServerConnection connection) throws Exception {
- Set beanInfo = connection.queryNames(new ObjectName("*:*"), null); //$NON-NLS-1$
+ monitor.beginTask("Load MBeans", 1000);
+ Set beanInfo = connection.queryNames(new ObjectName("*:*"), null); //$NON-NLS-1$
+ monitor.worked(100);
+ SubProgressMonitor subMon = new SubProgressMonitor(monitor, 900);
+ subMon.beginTask("Inspect MBeans", beanInfo.size() * 100);
_root[0] = NodeBuilder.createRoot(connectionWrapper);
Iterator iter = beanInfo.iterator();
while (iter.hasNext()) {
ObjectName on = (ObjectName) iter.next();
NodeBuilder.addToTree(_root[0], on);
+ subMon.worked(100);
}
+ subMon.done();
+ monitor.done();
}
});
return _root[0];
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/Root.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/Root.java 2008-11-19 19:04:25 UTC (rev 11886)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/Root.java 2008-11-19 19:04:58 UTC (rev 11887)
@@ -27,9 +27,6 @@
return 0;
}
-// MBeanServerConnection getMBeanServerConnection() {
-// return mbsc;
-// }
public IConnectionWrapper getConnection() {
return connection;
}
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java 2008-11-19 19:04:25 UTC (rev 11886)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/MBeanExplorerContentProvider.java 2008-11-19 19:04:58 UTC (rev 11887)
@@ -12,7 +12,10 @@
import java.util.HashMap;
-
+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.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.StructuredViewer;
@@ -101,10 +104,10 @@
return getChildren(w.getRoot());
// Must load the model
- Thread t = new Thread() {
- public void run() {
+ Job job = new Job("Loading JMX Nodes") {
+ protected IStatus run(IProgressMonitor monitor) {
try {
- w.loadRoot();
+ w.loadRoot(monitor);
} catch( RuntimeException re ) {
}
loading.remove(w);
@@ -116,7 +119,9 @@
viewer.refresh();
}
});
+ return Status.OK_STATUS;
}
+
};
if( loading.containsKey(((IConnectionWrapper)parent))) {
@@ -124,7 +129,7 @@
}
DelayProxy p = new DelayProxy(w);
loading.put(w, p);
- t.start();
+ job.schedule();
return new Object[] { p };
}
@@ -143,6 +148,8 @@
if( parent instanceof IConnectionWrapper ) {
return ((IConnectionWrapper)parent).isConnected();
}
+ if( parent instanceof DelayProxy)
+ return false;
return true;
}
Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java 2008-11-19 19:04:25 UTC (rev 11886)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java 2008-11-19 19:04:58 UTC (rev 11887)
@@ -99,7 +99,7 @@
Root root = wrapper.getRoot();
assertTrue("Root was not null", root == null);
- wrapper.loadRoot();
+ wrapper.loadRoot(new NullProgressMonitor());
root = wrapper.getRoot();
assertTrue("Root was null", root != null);
Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java 2008-11-19 19:04:25 UTC (rev 11886)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java 2008-11-19 19:04:58 UTC (rev 11887)
@@ -3,6 +3,7 @@
import java.io.IOException;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.jboss.tools.jmx.core.IConnectionProvider;
import org.jboss.tools.jmx.core.IConnectionWrapper;
import org.jboss.tools.jmx.core.IJMXRunnable;
@@ -36,7 +37,7 @@
public void run(IJMXRunnable runnable) throws CoreException {
}
- public void loadRoot() {
+ public void loadRoot(IProgressMonitor monitor) {
}
}
17 years, 5 months
JBoss Tools SVN: r11886 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/proxy.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-11-19 14:04:25 -0500 (Wed, 19 Nov 2008)
New Revision: 11886
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/proxy/VpeNodeInvocationHandler.java
Log:
comment was adjusted, JBIDE-3144
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/proxy/VpeNodeInvocationHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/proxy/VpeNodeInvocationHandler.java 2008-11-19 18:48:11 UTC (rev 11885)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/proxy/VpeNodeInvocationHandler.java 2008-11-19 19:04:25 UTC (rev 11886)
@@ -66,7 +66,7 @@
result = ResourceUtil.getBundleValue(pageContext, toReplace);
- //fix for JBIDE-3030
+ //mareshkau,fix for JBIDE-3030, el doesn't works for external files.
if(pageContext.getVisualBuilder().getCurrentIncludeInfo()==null) {
return result;
}
17 years, 5 months
JBoss Tools SVN: r11885 - in trunk: hibernatetools/plugins/org.hibernate.eclipse/META-INF and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-11-19 13:48:11 -0500 (Wed, 19 Nov 2008)
New Revision: 11885
Modified:
trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.hblibs/plugin.properties
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/plugin.properties
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/META-INF/MANIFEST.MF
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF
trunk/tests/tests/org.jboss.tools.test/META-INF/MANIFEST.MF
Log:
JBIDE-3215
Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2008-11-19 18:48:11 UTC (rev 11885)
@@ -3,7 +3,7 @@
id="org.hibernate.eclipse.feature"
label="Hibernate Tools"
version="3.2.0.beta7"
- provider-name="Hibernate Team"
+ provider-name="JBoss, a division of Red Hat."
plugin="org.hibernate.eclipse">
<description url="http://tools.hibernate.org">
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/META-INF/MANIFEST.MF 2008-11-19 18:48:11 UTC (rev 11885)
@@ -42,7 +42,7 @@
lib/annotations/lucene-core-2.2.0.jar,
lib/hibernate/log4j-1.2.15.jar
Bundle-Activator: org.hibernate.eclipse.HibernatePlugin
-Bundle-Vendor: Hibernate Team
+Bundle-Vendor: JBoss, a division of Red Hat.
Bundle-Localization: plugin
Export-Package: EDU.oswego.cs.dl.util.concurrent,
antlr,
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 2008-11-19 18:48:11 UTC (rev 11885)
@@ -5,7 +5,7 @@
Bundle-Version: 3.2.0.beta9
Bundle-ClassPath: org.hibernate.eclipse.console.jar
Bundle-Activator: org.hibernate.eclipse.console.HibernateConsolePlugin
-Bundle-Vendor: Hibernate Team
+Bundle-Vendor: JBoss, a division of Red Hat.
Bundle-Localization: plugin
Export-Package: org.hibernate.eclipse.builder,
org.hibernate.eclipse.console,
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.help/META-INF/MANIFEST.MF 2008-11-19 18:48:11 UTC (rev 11885)
@@ -5,7 +5,7 @@
Bundle-Version: 3.2.0.beta9
Bundle-ClassPath: help.jar
Bundle-Activator: org.hibernate.eclipse.help.HelpPlugin
-Bundle-Vendor: Hibernate Team
+Bundle-Vendor: JBoss, a division of Red Hat.
Bundle-Localization: plugin
Export-Package: org.hibernate.eclipse.help
Require-Bundle: org.eclipse.core.runtime,
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/META-INF/MANIFEST.MF 2008-11-19 18:48:11 UTC (rev 11885)
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.hibernate.eclipse.jdt.apt.ui;singleton:=true
Bundle-Version: 3.2.0.beta8
Bundle-Activator: org.hibernate.eclipse.jdt.apt.ui.Activator
-Bundle-Vendor: Hibernate Team
+Bundle-Vendor: JBoss, a division of Red Hat.
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/META-INF/MANIFEST.MF 2008-11-19 18:48:11 UTC (rev 11885)
@@ -5,7 +5,7 @@
Bundle-Version: 3.2.0.beta9
Bundle-ClassPath: org.hibernate.eclipse.mapper.jar
Bundle-Activator: org.hibernate.eclipse.mapper.MapperPlugin
-Bundle-Vendor: Hibernate Team
+Bundle-Vendor: JBoss, a division of Red Hat.
Bundle-Localization: plugin
Export-Package: org.hibernate.eclipse.mapper,
org.hibernate.eclipse.mapper.editors,
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.hblibs/plugin.properties
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.hblibs/plugin.properties 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.hblibs/plugin.properties 2008-11-19 18:48:11 UTC (rev 11885)
@@ -1 +1 @@
-providerName=Red Hat, Inc
+providerName=JBoss, a division of Red Hat.
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2008-11-19 18:48:11 UTC (rev 11885)
@@ -15,7 +15,7 @@
org.eclipse.debug.core;bundle-version="3.4.0",
org.eclipse.emf.ecore;bundle-version="2.4.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Hibernate Team
+Bundle-Vendor: JBoss, a division of Red Hat.
Export-Package: org.jboss.tools.hibernate.jpt.core.internal,
org.jboss.tools.hibernate.jpt.core.internal.context,
org.jboss.tools.hibernate.jpt.core.internal.context.basic
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/MANIFEST.MF 2008-11-19 18:48:11 UTC (rev 11885)
@@ -20,7 +20,7 @@
org.jboss.tools.hibernate.jpt.core;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Hibernate Team
+Bundle-Vendor: JBoss, a division of Red Hat.
Export-Package: org.jboss.tools.hibernate.jpt.ui,
org.jboss.tools.hibernate.jpt.ui.internal.platform,
org.jboss.tools.hibernate.jpt.ui.wizard
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/plugin.properties
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/plugin.properties 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/plugin.properties 2008-11-19 18:48:11 UTC (rev 11885)
@@ -1,2 +1,2 @@
-providerName=Red Hat, Inc
+providerName=JBoss, a division of Red Hat.
pluginName=Visual Editor Plugin
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/META-INF/MANIFEST.MF 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/META-INF/MANIFEST.MF 2008-11-19 18:48:11 UTC (rev 11885)
@@ -5,7 +5,7 @@
Bundle-Version: 2.0.0
Bundle-ClassPath: view.jar
Bundle-Activator: org.jboss.tools.hibernate.ui.view.ViewPlugin
-Bundle-Vendor: Red Hat, Inc
+Bundle-Vendor: JBoss, a division of Red Hat.
Bundle-Localization: plugin
Export-Package: org.jboss.tools.hibernate.ui.view,
org.jboss.tools.hibernate.ui.view.views
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2008-11-19 18:48:11 UTC (rev 11885)
@@ -7,7 +7,7 @@
lib/hibernate-tools-tests.jar,
lib/hsqldb.jar,
lib/jaxen-1.1-beta-7.jar
-Bundle-Vendor: Hibernate Team
+Bundle-Vendor: JBoss, a division of Red Hat.
Bundle-Localization: plugin
Export-Package: org.hibernate.eclipse.console.test,
org.hibernate.eclipse.console.test.mappingproject,
Modified: trunk/tests/tests/org.jboss.tools.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/META-INF/MANIFEST.MF 2008-11-19 18:13:43 UTC (rev 11884)
+++ trunk/tests/tests/org.jboss.tools.test/META-INF/MANIFEST.MF 2008-11-19 18:48:11 UTC (rev 11885)
@@ -3,7 +3,7 @@
Bundle-Name: Tests Plug-in
Bundle-SymbolicName: org.jboss.tools.tests
Bundle-Version: 2.0.0
-Bundle-Vendor: Red Hat, Inc.
+Bundle-Vendor: JBoss, a division of Red Hat.
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
17 years, 5 months
JBoss Tools SVN: r11884 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-19 13:13:43 -0500 (Wed, 19 Nov 2008)
New Revision: 11884
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java
Log:
JBIDE-2760 - tiny change, member variables not set properly
Modified: 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 2008-11-19 17:30:03 UTC (rev 11883)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java 2008-11-19 18:13:43 UTC (rev 11884)
@@ -19,8 +19,8 @@
public JMXSafeRunner(IServer s) {
this.server = s;
- String user = ServerConverter.getJBossServer(s).getUsername();
- String pass = ServerConverter.getJBossServer(s).getPassword();
+ user = ServerConverter.getJBossServer(s).getUsername();
+ pass = ServerConverter.getJBossServer(s).getPassword();
}
public void setUser(String user) {
17 years, 5 months