JBoss Tools SVN: r4835 - 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: 2007-11-11 14:33:24 -0500 (Sun, 11 Nov 2007)
New Revision: 4835
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java
Log:
JBIDE-1293 JMXSafeRunner now more safe (and won't log an error unless the server is IServer.STATE_STARTED)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java 2007-11-11 19:32:33 UTC (rev 4834)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java 2007-11-11 19:33:24 UTC (rev 4835)
@@ -427,6 +427,9 @@
public static class JMXSafeRunner {
public static void run(IServer s, JMXRunnable r) {
+ // do nothing if the server is down.
+ if( s.getServerState() != IServer.STATE_STARTED ) return;
+
ClassLoader currentLoader = Thread.currentThread()
.getContextClassLoader();
ClassLoader newLoader = JMXClassLoaderRepository.getDefault()
@@ -444,9 +447,13 @@
r.run(connection);
}
} catch (Exception e) {
- JBossServerCorePlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- "Error while running JMX-safe code", e));
+ // if the server isn't started (or began shutting
+ // down during the op),don't log the error.
+ if( s.getServerState() != IServer.STATE_STARTED ) {
+ JBossServerCorePlugin.getDefault().getLog().log(
+ new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ "Error while running JMX-safe code", e));
+ }
}
Thread.currentThread().setContextClassLoader(currentLoader);
}
17 years, 2 months
JBoss Tools SVN: r4834 - 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: 2007-11-11 14:32:33 -0500 (Sun, 11 Nov 2007)
New Revision: 4834
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java
Log:
undoing the last fix so that I can properly re-commit it with JIRA issue attached
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java 2007-11-11 19:31:24 UTC (rev 4833)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java 2007-11-11 19:32:33 UTC (rev 4834)
@@ -427,9 +427,6 @@
public static class JMXSafeRunner {
public static void run(IServer s, JMXRunnable r) {
- // do nothing if the server is down.
- if( s.getServerState() != IServer.STATE_STARTED ) return;
-
ClassLoader currentLoader = Thread.currentThread()
.getContextClassLoader();
ClassLoader newLoader = JMXClassLoaderRepository.getDefault()
@@ -447,13 +444,9 @@
r.run(connection);
}
} catch (Exception e) {
- // if the server isn't started (or began shutting
- // down during the op), don't log the error.
- if( s.getServerState() != IServer.STATE_STARTED ) {
- JBossServerCorePlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- "Error while running JMX-safe code", e));
- }
+ JBossServerCorePlugin.getDefault().getLog().log(
+ new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ "Error while running JMX-safe code", e));
}
Thread.currentThread().setContextClassLoader(currentLoader);
}
17 years, 2 months
JBoss Tools SVN: r4833 - 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: 2007-11-11 14:31:24 -0500 (Sun, 11 Nov 2007)
New Revision: 4833
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java
Log:
JMXSafeRunner now more safe (I hope)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java 2007-11-10 01:15:06 UTC (rev 4832)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXModel.java 2007-11-11 19:31:24 UTC (rev 4833)
@@ -427,6 +427,9 @@
public static class JMXSafeRunner {
public static void run(IServer s, JMXRunnable r) {
+ // do nothing if the server is down.
+ if( s.getServerState() != IServer.STATE_STARTED ) return;
+
ClassLoader currentLoader = Thread.currentThread()
.getContextClassLoader();
ClassLoader newLoader = JMXClassLoaderRepository.getDefault()
@@ -444,9 +447,13 @@
r.run(connection);
}
} catch (Exception e) {
- JBossServerCorePlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- "Error while running JMX-safe code", e));
+ // if the server isn't started (or began shutting
+ // down during the op), don't log the error.
+ if( s.getServerState() != IServer.STATE_STARTED ) {
+ JBossServerCorePlugin.getDefault().getLog().log(
+ new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ "Error while running JMX-safe code", e));
+ }
}
Thread.currentThread().setContextClassLoader(currentLoader);
}
17 years, 2 months
JBoss Tools SVN: r4832 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-11-09 20:15:06 -0500 (Fri, 09 Nov 2007)
New Revision: 4832
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
Log:
rroll back the changes
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2007-11-10 01:05:19 UTC (rev 4831)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2007-11-10 01:15:06 UTC (rev 4832)
@@ -81,9 +81,7 @@
for (IResource r : this.resourcesToCleanup) {
try {
System.out.println("Deleting " + r);
- // TODO - need to figure out how to wait until all build/validation
- // are finished
- //r.delete(true, null);
+ r.delete(true, null);
} catch(Exception e) {
System.out.println("Error deleting " + r);
e.printStackTrace();
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2007-11-10 01:05:19 UTC (rev 4831)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2007-11-10 01:15:06 UTC (rev 4832)
@@ -21,8 +21,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceProxy;
import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
@@ -52,29 +50,22 @@
@Override
protected void setUp() throws Exception {
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject war = (IProject)wsRoot.findMember("warprj");
- IProject ear = (IProject)wsRoot.findMember("earprj");
+
+ seam2Facet = ProjectFacetsManager.getProjectFacet("jst.seam");
+ seam2FacetVersion = seam2Facet.getVersion("2.0");
- if(war==null && ear==null) {
+ File folder = new File(System.getProperty("jbosstools.test.seam.2.0.0.home", "/home/max/work/products/jboss-seam-2.0.0.CR2"));
- seam2Facet = ProjectFacetsManager.getProjectFacet("jst.seam");
- seam2FacetVersion = seam2Facet.getVersion("2.0");
-
- File folder = new File(System.getProperty("jbosstools.test.seam.2.0.0.home", "c:/java/jboss-seam-2.0.0.CR3"));
-
- SeamRuntimeManager.getInstance().addRuntime(SEAM_2_0_0, folder.getAbsolutePath(), SeamVersion.SEAM_2_0, true);
- SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_2_0_0);
+ SeamRuntimeManager.getInstance().addRuntime(SEAM_2_0_0, folder.getAbsolutePath(), SeamVersion.SEAM_2_0, true);
+ SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_2_0_0);
+
+ warProject = createSeamWarProject("warprj");
+ earProject = createSeamEarProject("earprj");
- warProject = createSeamWarProject("warprj");
- earProject = createSeamEarProject("earprj");
-
- warProject.getProject().getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
- } else {
- warProject = ProjectFacetsManager.create(war);
- earProject = ProjectFacetsManager.create(ear);
- }
+ warProject.getProject().getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
+
+
super.setUp();
}
@@ -96,9 +87,6 @@
warlibs.add("antlr-runtime.jar");
warlibs.add("commons-beanutils.jar");
warlibs.add("commons-digester.jar");
- warlibs.add("commons-collections.jar");
- warlibs.add("janino.jar");
- warlibs.add("antlr.jar");
warlibs.add("drools-compiler.jar");
warlibs.add("drools-core.jar");
warlibs.add("core.jar");
17 years, 2 months
JBoss Tools SVN: r4831 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-11-09 20:05:19 -0500 (Fri, 09 Nov 2007)
New Revision: 4831
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
fix compilation poblem.
Syntax error, insert ")" to complete VariableInitializer
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2007-11-10 00:45:53 UTC (rev 4830)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2007-11-10 01:05:19 UTC (rev 4831)
@@ -406,7 +406,7 @@
ArrayList<String> l = new ArrayList<String>();
for (int i = 0; i < es.length; i++) {
if(es[i].getEntryKind() != IClasspathEntry.CPE_SOURCE) continue;
- IResource member = project.findMember(es[i].getPath().removeFirstSegments(1);
+ IResource member = project.findMember(es[i].getPath().removeFirstSegments(1));
if(member.exists()) { // The member might not exist!
l.add(member.getLocation().toString());
}
17 years, 2 months
JBoss Tools SVN: r4830 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-11-09 19:45:53 -0500 (Fri, 09 Nov 2007)
New Revision: 4830
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-1288 Fix NPE
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2007-11-09 16:15:24 UTC (rev 4829)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2007-11-10 00:45:53 UTC (rev 4830)
@@ -406,7 +406,10 @@
ArrayList<String> l = new ArrayList<String>();
for (int i = 0; i < es.length; i++) {
if(es[i].getEntryKind() != IClasspathEntry.CPE_SOURCE) continue;
- l.add(project.findMember(es[i].getPath().removeFirstSegments(1)).getLocation().toString());
+ IResource member = project.findMember(es[i].getPath().removeFirstSegments(1);
+ if(member.exists()) { // The member might not exist!
+ l.add(member.getLocation().toString());
+ }
}
return l.toArray(new String[0]);
} catch (Exception e) {
17 years, 2 months
JBoss Tools SVN: r4826 - in trunk/hibernatetools/docs/reference/en: modules and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: afedosik
Date: 2007-11-09 11:01:03 -0500 (Fri, 09 Nov 2007)
New Revision: 4826
Added:
trunk/hibernatetools/docs/reference/en/images/hbmxmlcompletion.gif
Modified:
trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml
trunk/hibernatetools/docs/reference/en/modules/plugins.xml
Log:
http://jira.jboss.com/jira/browse/RHDS-290 the path for images is fixed
Added: trunk/hibernatetools/docs/reference/en/images/hbmxmlcompletion.gif
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/hbmxmlcompletion.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml 2007-11-09 15:17:04 UTC (rev 4825)
+++ trunk/hibernatetools/docs/reference/en/modules/codegenarchitecture.xml 2007-11-09 16:01:03 UTC (rev 4826)
@@ -67,7 +67,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/architecture.png" format="PNG" />
+ fileref="images/architecture.png" format="PNG" />
</imageobject>
</mediaobject></para>
Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2007-11-09 15:17:04 UTC (rev 4825)
+++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2007-11-09 16:01:03 UTC (rev 4826)
@@ -64,7 +64,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/hibernatecfgwizard.png"
+ fileref="images/hibernatecfgwizard.png"
format="PNG" />
</imageobject>
</mediaobject>
@@ -114,7 +114,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/consolecfgwizard.png"
+ fileref="images/consolecfgwizard.png"
format="PNG" />
</imageobject>
@@ -238,7 +238,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/consolecfgclasspath.png"
+ fileref="images/consolecfgclasspath.png"
format="PNG" />
</imageobject>
@@ -301,7 +301,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/consolecfgmappings.png"
+ fileref="images/consolecfgmappings.png"
format="PNG" />
</imageobject>
@@ -355,7 +355,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/consoleoutline-before-reveng.png"
+ fileref="images/consoleoutline-before-reveng.png"
format="PNG" />
</imageobject>
@@ -391,7 +391,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/codegendropdown.gif"
+ fileref="images/codegendropdown.gif"
format="GIF" />
</imageobject>
</mediaobject>
@@ -405,7 +405,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/codegenmaintab.png"
+ fileref="images/codegenmaintab.png"
format="PNG" />
</imageobject>
</mediaobject>
@@ -566,7 +566,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/codegenexporters.png"
+ fileref="images/codegenexporters.png"
format="PNG" />
</imageobject>
</mediaobject>
@@ -731,7 +731,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/hbmxmlcompletion.gif"
+ fileref="images/hbmxmlcompletion.gif"
format="GIF" />
</imageobject>
</mediaobject>
@@ -753,7 +753,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/hbmxml-typecompletion.png"
+ fileref="images/hbmxml-typecompletion.png"
format="PNG" />
</imageobject>
</mediaobject><mediaobject>
@@ -763,7 +763,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/hbmxml-namecompletion.PNG"
+ fileref="images/hbmxml-namecompletion.PNG"
format="PNG" />
</imageobject>
</mediaobject></para>
@@ -791,7 +791,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/hbmxml-tablecompletion.png"
+ fileref="images/hbmxml-tablecompletion.png"
format="PNG" />
</imageobject>
</mediaobject></para>
@@ -824,7 +824,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/cfgxml-propertycomplete.png"
+ fileref="images/cfgxml-propertycomplete.png"
format="PNG" />
</imageobject>
</mediaobject></para>
@@ -864,7 +864,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/revengxml_overview.png"
+ fileref="images/revengxml_overview.png"
format="PNG" />
</imageobject>
</mediaobject></para>
@@ -880,7 +880,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/revengxml_tablefilters.png"
+ fileref="images/revengxml_tablefilters.png"
format="PNG" />
</imageobject>
</mediaobject></para>
@@ -896,7 +896,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/revengxml_typemappings.png"
+ fileref="images/revengxml_typemappings.png"
format="PNG" />
</imageobject>
</mediaobject></para>
@@ -912,7 +912,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/revengxml_tablescolumn.png"
+ fileref="images/revengxml_tablescolumn.png"
format="PNG" />
</imageobject>
</mediaobject></para>
@@ -942,7 +942,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/queryconsole.png" />
+ fileref="images/queryconsole.png" />
</imageobject>
</mediaobject> Hibernate Console perspective showing entity structure,
query editor and result</para>
@@ -960,7 +960,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/entitymodel.png" />
+ fileref="images/entitymodel.png" />
</imageobject>
</mediaobject>
@@ -1010,7 +1010,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/dynamicquerytranslation.png"
+ fileref="images/dynamicquerytranslation.png"
format="PNG" />
</imageobject>
</mediaobject>
@@ -1034,7 +1034,7 @@
<imageobject role="html">
<imagedata align="center"
- fileref="../shared/images/properties.png" format="PNG" />
+ fileref="images/properties.png" format="PNG" />
</imageobject>
</mediaobject></para>
</section>
17 years, 2 months