JBoss Tools SVN: r33815 - branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-08-11 09:17:18 -0400 (Thu, 11 Aug 2011)
New Revision: 33815
Modified:
branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
Log:
JBIDE-9514 Project Example project zips that require empty folders (i.e. src folders) need to be imported properly
Modified: branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
===================================================================
--- branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2011-08-11 13:16:53 UTC (rev 33814)
+++ branches/jbosstools-3.2.x/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2011-08-11 13:17:18 UTC (rev 33815)
@@ -584,14 +584,16 @@
Enumeration<? extends ZipEntry> entries = sourceFile.entries();
ZipEntry entry = null;
List<ZipEntry> filesToImport = new ArrayList<ZipEntry>();
+ List<ZipEntry> directories = new ArrayList<ZipEntry>();
String prefix = projectName + "/"; //$NON-NLS-1$
while (entries.hasMoreElements()) {
entry = entries.nextElement();
- if (entry.isDirectory()) {
- continue;
- }
if (entry.getName().startsWith(prefix)) {
- filesToImport.add(entry);
+ if (!entry.isDirectory()) {
+ filesToImport.add(entry);
+ } else {
+ directories.add(entry);
+ }
}
}
@@ -600,6 +602,14 @@
structureProvider, OVERWRITE_ALL_QUERY, filesToImport);
operation.setContext(getActiveShell());
operation.run(monitor);
+ for (ZipEntry directory:directories) {
+ IPath resourcePath = new Path(directory.getName());
+ try {
+ workspace.getRoot().getFolder(resourcePath).create(false, true, null);
+ } catch (Exception e) {
+ ProjectExamplesActivator.log(e);
+ }
+ }
reconfigure(project, monitor);
}
}
@@ -646,14 +656,16 @@
Enumeration<? extends ZipEntry> entries = sourceFile.entries();
ZipEntry entry = null;
List<ZipEntry> filesToImport = new ArrayList<ZipEntry>();
+ List<ZipEntry> directories = new ArrayList<ZipEntry>();
String prefix = projectName + "/"; //$NON-NLS-1$
while (entries.hasMoreElements()) {
entry = entries.nextElement();
- if (entry.isDirectory()) {
- continue;
- }
if (entry.getName().startsWith(prefix)) {
- filesToImport.add(entry);
+ if (!entry.isDirectory()) {
+ filesToImport.add(entry);
+ } else {
+ directories.add(entry);
+ }
}
}
@@ -662,6 +674,14 @@
structureProvider, OVERWRITE_ALL_QUERY, filesToImport);
operation.setContext(getActiveShell());
operation.run(monitor);
+ for (ZipEntry directory:directories) {
+ IPath resourcePath = new Path(directory.getName());
+ try {
+ workspace.getRoot().getFolder(resourcePath).create(false, true, null);
+ } catch (Exception e) {
+ ProjectExamplesActivator.log(e);
+ }
+ }
reconfigure(project, monitor);
}
14 years, 8 months
JBoss Tools SVN: r33814 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-08-11 09:16:53 -0400 (Thu, 11 Aug 2011)
New Revision: 33814
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
Log:
JBIDE-9514 Project Example project zips that require empty folders (i.e. src folders) need to be imported properly
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2011-08-11 13:01:48 UTC (rev 33813)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2011-08-11 13:16:53 UTC (rev 33814)
@@ -587,14 +587,16 @@
Enumeration<? extends ZipEntry> entries = sourceFile.entries();
ZipEntry entry = null;
List<ZipEntry> filesToImport = new ArrayList<ZipEntry>();
+ List<ZipEntry> directories = new ArrayList<ZipEntry>();
String prefix = projectName + "/"; //$NON-NLS-1$
while (entries.hasMoreElements()) {
entry = entries.nextElement();
- if (entry.isDirectory()) {
- continue;
- }
if (entry.getName().startsWith(prefix)) {
- filesToImport.add(entry);
+ if (!entry.isDirectory()) {
+ filesToImport.add(entry);
+ } else {
+ directories.add(entry);
+ }
}
}
@@ -603,6 +605,14 @@
structureProvider, OVERWRITE_ALL_QUERY, filesToImport);
operation.setContext(getActiveShell());
operation.run(monitor);
+ for (ZipEntry directory:directories) {
+ IPath resourcePath = new Path(directory.getName());
+ try {
+ workspace.getRoot().getFolder(resourcePath).create(false, true, null);
+ } catch (Exception e) {
+ ProjectExamplesActivator.log(e);
+ }
+ }
reconfigure(project, monitor);
}
}
@@ -650,14 +660,16 @@
Enumeration<? extends ZipEntry> entries = sourceFile.entries();
ZipEntry entry = null;
List<ZipEntry> filesToImport = new ArrayList<ZipEntry>();
+ List<ZipEntry> directories = new ArrayList<ZipEntry>();
String prefix = projectName + "/"; //$NON-NLS-1$
while (entries.hasMoreElements()) {
entry = entries.nextElement();
- if (entry.isDirectory()) {
- continue;
- }
if (entry.getName().startsWith(prefix)) {
- filesToImport.add(entry);
+ if (!entry.isDirectory()) {
+ filesToImport.add(entry);
+ } else {
+ directories.add(entry);
+ }
}
}
@@ -666,6 +678,14 @@
structureProvider, OVERWRITE_ALL_QUERY, filesToImport);
operation.setContext(getActiveShell());
operation.run(monitor);
+ for (ZipEntry directory:directories) {
+ IPath resourcePath = new Path(directory.getName());
+ try {
+ workspace.getRoot().getFolder(resourcePath).create(false, true, null);
+ } catch (Exception e) {
+ ProjectExamplesActivator.log(e);
+ }
+ }
reconfigure(project, monitor);
}
14 years, 8 months
JBoss Tools SVN: r33813 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-08-11 09:01:48 -0400 (Thu, 11 Aug 2011)
New Revision: 33813
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/build.properties
Log:
vpe ui bot test: added resources to build
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/build.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/build.properties 2011-08-11 12:46:09 UTC (rev 33812)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/build.properties 2011-08-11 13:01:48 UTC (rev 33813)
@@ -2,4 +2,5 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ resources/
14 years, 8 months
JBoss Tools SVN: r33812 - trunk/seam/tests/org.jboss.tools.seam.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-08-11 08:46:09 -0400 (Thu, 11 Aug 2011)
New Revision: 33812
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/build.properties
Log:
seam ui bot test: added resources to build
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/build.properties
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/build.properties 2011-08-11 11:41:28 UTC (rev 33811)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/build.properties 2011-08-11 12:46:09 UTC (rev 33812)
@@ -1,4 +1,5 @@
source.. = src/,resources/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ resources/
14 years, 8 months
JBoss Tools SVN: r33811 - in trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test: src/org/jboss/tools/modeshape/rest/ui/bot/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-08-11 07:41:28 -0400 (Thu, 11 Aug 2011)
New Revision: 33811
Removed:
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/screenshots/
Modified:
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/ModeshapeAllTests.java
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/TeiidFilesPublishing.java
Log:
Property changes on: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test
___________________________________________________________________
Modified: svn:ignore
- target
buildlog.latest.txt
bin
build
+ bin screenshots *.log
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/ModeshapeAllTests.java
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/ModeshapeAllTests.java 2011-08-11 11:07:22 UTC (rev 33810)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/ModeshapeAllTests.java 2011-08-11 11:41:28 UTC (rev 33811)
@@ -11,8 +11,8 @@
*
*/
@SuiteClasses({
- Publishing.class,
- TeiidFilesPublishing.class
+ Publishing.class
+ //TeiidFilesPublishing.class
})
@RunWith(RequirementAwareSuite.class)
public class ModeshapeAllTests {
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/TeiidFilesPublishing.java
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/TeiidFilesPublishing.java 2011-08-11 11:07:22 UTC (rev 33810)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/TeiidFilesPublishing.java 2011-08-11 11:41:28 UTC (rev 33811)
@@ -49,6 +49,13 @@
bot.menu(IDELabel.Menu.HELP)
.menu("Project Examples...").click();
+ bot.waitUntil(Conditions.shellIsActive("Progress Information"));
+ bot.waitUntil(Conditions.shellCloses(bot.shell("Progress Information")));
+
+ bot.shell("Invalid Sites").activate();
+ bot.button("OK").click();
+
+
SWTBotShell shell = bot.shell("New Project Example");
shell.activate();
shell.bot().tree(0).expandNode("Teiid Designer")
14 years, 8 months
JBoss Tools SVN: r33810 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-11 07:07:22 -0400 (Thu, 11 Aug 2011)
New Revision: 33810
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/StreamUtils.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
Log:
[JBIDE-9524] catched IOException instead Exception
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2011-08-11 10:57:49 UTC (rev 33809)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2011-08-11 11:07:22 UTC (rev 33810)
@@ -15,7 +15,6 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -43,6 +42,7 @@
import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.core.util.StreamUtils;
import org.jboss.ide.eclipse.as.core.util.internal.FileUtils;
/**
* Utility class with an assortment of useful file methods.
@@ -174,18 +174,14 @@
try {
FileUtils.writeTo(in, to);
return Status.OK_STATUS;
- } catch (Exception e) {
+ } catch (IOException e) {
//Trace.trace(Trace.SEVERE, "Error copying file", e);
return new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, NLS.bind(Messages.errorCopyingFile, new String[] {to, e.getLocalizedMessage()}), e);
} finally {
- try {
- if (in != null)
- in.close();
- } catch (Exception ex) {
- // ignore
- }
+ StreamUtils.safeClose(in);
}
}
+
/**
* Copy a file from a to b. Closes the input stream after use.
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/StreamUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/StreamUtils.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/StreamUtils.java 2011-08-11 11:07:22 UTC (rev 33810)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * 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.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author André Dietisheim
+ */
+public class StreamUtils {
+
+ public static void safeClose(InputStream in) {
+ try {
+ if (in != null) {
+ in.close();
+ }
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/StreamUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 8 months
JBoss Tools SVN: r33809 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-11 06:57:49 -0400 (Thu, 11 Aug 2011)
New Revision: 33809
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStatePollerType.java
Log:
[JBIDE-9523] catched CoreException instead of Exception
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStatePollerType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStatePollerType.java 2011-08-11 10:54:40 UTC (rev 33808)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStatePollerType.java 2011-08-11 10:57:49 UTC (rev 33809)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -47,7 +48,7 @@
public IServerStatePoller createPoller() {
try {
return (IServerStatePoller)el.createExecutableExtension("class"); //$NON-NLS-1$
- } catch( Exception e ) {
+ } catch( CoreException e ) {
IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.CannotLoadServerPoller, el.getAttribute("name")), e); //$NON-NLS-1$
JBossServerCorePlugin.getDefault().getLog().log(s);
14 years, 8 months
JBoss Tools SVN: r33808 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-11 06:54:40 -0400 (Thu, 11 Aug 2011)
New Revision: 33808
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerAttributeHelper.java
Log:
[JBIDE-9522] catched CoreException (was: Exception)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerAttributeHelper.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerAttributeHelper.java 2011-08-11 10:49:24 UTC (rev 33807)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerAttributeHelper.java 2011-08-11 10:54:40 UTC (rev 33808)
@@ -108,10 +108,8 @@
public IServer save() {
try {
return save(false, new NullProgressMonitor());
- } catch( Exception e ) {
- IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- Messages.ServerSaveFailed, e);
- JBossServerCorePlugin.getDefault().getLog().log(s);
+ } catch( CoreException e ) {
+ JBossServerCorePlugin.log(IStatus.ERROR, Messages.ServerSaveFailed, e);
}
return null;
}
14 years, 8 months
JBoss Tools SVN: r33807 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-11 06:49:24 -0400 (Thu, 11 Aug 2011)
New Revision: 33807
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java
Log:
[JBIDE-9521] changed IServerStatePoller#beginPolling to throw PollException (was: Exception). Changed implementors accordingly and catched PollException in PollThread
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-11 10:27:16 UTC (rev 33806)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-11 10:49:24 UTC (rev 33807)
@@ -14,7 +14,7 @@
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.core.Messages"; //$NON-NLS-1$
-
+
/* Standard and re-usable */
public static String jboss;
public static String server;
@@ -60,6 +60,7 @@
public static String ModuleDeleted;
public static String ModulePublished;
public static String NoPublisherFound;
+ public static String CouldNotBeginPolling;
public static String PollingStartupSuccess;
public static String PollingShutdownSuccess;
public static String PollingStartupFailed;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-11 10:27:16 UTC (rev 33806)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-11 10:49:24 UTC (rev 33807)
@@ -8,6 +8,7 @@
JBoss7ServerBehavior_could_not_stop=Could not stop server adapter {0}
JMXPoller=JMX Poller
loadJMXClassesFailed=Could not load JMX classes for server {0}
+CouldNotBeginPolling=Could not begin polling server {0}
PollingStartupSuccess=Server Startup Succeeded
PollingShutdownSuccess=Server Shutdown Succeeded
PollingStartupFailed=Server Startup Failed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-08-11 10:27:16 UTC (rev 33806)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-08-11 10:49:24 UTC (rev 33807)
@@ -87,6 +87,10 @@
public PollingException(String message) {
super(message);
}
+
+ public PollingException(String message, Throwable t) {
+ super(message, t);
+ }
}
public class RequiresInfoException extends Exception {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-08-11 10:27:16 UTC (rev 33806)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-08-11 10:49:24 UTC (rev 33807)
@@ -148,7 +148,7 @@
}
stateStartedOrStopped = checkServerState();
}
- } catch(Exception e) {
+ } catch(PollingException e) {
abort = true;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-11 10:27:16 UTC (rev 33806)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-08-11 10:49:24 UTC (rev 33807)
@@ -18,17 +18,20 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
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.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
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.management.as7.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil;
+import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil.IServiceAware;
import org.jboss.ide.eclipse.as.management.as7.JBoss7ManangerConnectException;
import org.jboss.ide.eclipse.as.management.as7.JBoss7ServerState;
-import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil.IServiceAware;
+import org.osgi.framework.InvalidSyntaxException;
/**
* @author André Dietisheim
@@ -45,10 +48,14 @@
public void beginPolling(IServer server, boolean expectedState, PollThread pollTread) throws Exception {
}
- public void beginPolling(IServer server, boolean expectedState) throws Exception {
- this.service = JBoss7ManagerUtil.getService(server);
- this.server = server;
- this.expectedState = expectedState;
+ public void beginPolling(IServer server, boolean expectedState) throws PollingException {
+ try {
+ this.service = JBoss7ManagerUtil.getService(server);
+ this.server = server;
+ this.expectedState = expectedState;
+ } catch(InvalidSyntaxException e) {
+ throw new PollingException(NLS.bind(Messages.CouldNotBeginPolling,server.getName()), e);
+ }
}
public ServerStatePollerType getPollerType() {
Modified: 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 2011-08-11 10:27:16 UTC (rev 33806)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2011-08-11 10:49:24 UTC (rev 33807)
@@ -68,7 +68,7 @@
private JMXPollerRunnable runnable;
private JMXSafeRunner runner;
- public void beginPolling(IServer server, boolean expectedState) throws Exception {
+ public void beginPolling(IServer server, boolean expectedState) throws PollingException {
ceFound = nnfeFound = startingFound = canceled = done = false;
this.server = server;
launchJMXPoller();
14 years, 8 months
JBoss Tools SVN: r33806 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-11 06:27:16 -0400 (Thu, 11 Aug 2011)
New Revision: 33806
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
Log:
reformatted code to get better readability
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-08-11 10:22:00 UTC (rev 33805)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-08-11 10:27:16 UTC (rev 33806)
@@ -57,7 +57,7 @@
*/
@Deprecated
public void beginPolling(IServer server, boolean expectedState, PollThread pt) throws Exception;
- public void beginPolling(IServer server, boolean expectedState) throws Exception;
+ public void beginPolling(IServer server, boolean expectedState) throws PollingException;
public IServer getServer();
public boolean isComplete() throws PollingException, RequiresInfoException;
public boolean getState() throws PollingException, RequiresInfoException;
@@ -81,15 +81,29 @@
public int getTimeoutBehavior();
public class PollingException extends Exception {
+
private static final long serialVersionUID = -7830978018908940551L;
- public PollingException(String message) {super(message);}
+
+ public PollingException(String message) {
+ super(message);
+ }
}
public class RequiresInfoException extends Exception {
+
private static final long serialVersionUID = 5050044329807740335L;
private boolean checked = false;
- public RequiresInfoException(String msg) {super(msg);}
- public void setChecked() { this.checked = true; }
- public boolean getChecked() { return this.checked; }
+
+ public RequiresInfoException(String msg) {
+ super(msg);
+ }
+
+ public void setChecked() {
+ this.checked = true;
+ }
+
+ public boolean getChecked() {
+ return this.checked;
+ }
}
}
14 years, 8 months