JBoss Tools SVN: r33021 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-18 10:56:59 -0400 (Mon, 18 Jul 2011)
New Revision: 33021
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
Log:
[JBIDE-9359] renamed parameter to better reflect its purpose (was: pollThread now: currentPollThread)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-07-18 14:50:05 UTC (rev 33020)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2011-07-18 14:56:59 UTC (rev 33021)
@@ -121,9 +121,9 @@
* @return
* @return the new poll thread
*/
- public static PollThread pollServer(final boolean expectedState, PollThread pollThread, DelegatingServerBehavior behaviour) {
+ public static PollThread pollServer(final boolean expectedState, PollThread currentPollThread, DelegatingServerBehavior behaviour) {
IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, behaviour.getServer());
- return pollServer(expectedState, poller, pollThread, behaviour);
+ return pollServer(expectedState, poller, currentPollThread, behaviour);
}
/**
@@ -136,9 +136,9 @@
* @param behaviour the server behavior to use.
* @return the new poll thread
*/
- public static PollThread pollServer(boolean expectedState, IServerStatePoller poller, PollThread pollThread,
+ public static PollThread pollServer(boolean expectedState, IServerStatePoller poller, PollThread currentPollThread,
DelegatingServerBehavior behaviour) {
- stopPolling(pollThread);
+ stopPolling(currentPollThread);
PollThread newPollThread = new PollThread(expectedState, poller, behaviour);
newPollThread.start();
return newPollThread;
14 years, 9 months
JBoss Tools SVN: r33020 - 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-07-18 10:50:05 -0400 (Mon, 18 Jul 2011)
New Revision: 33020
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
Log:
[JBIDE-9054] unified the 2 pollThread methods
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-18 14:33:16 UTC (rev 33019)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-18 14:50:05 UTC (rev 33020)
@@ -87,9 +87,8 @@
}
protected void pollServer(final boolean expectedState) {
- stopPolling();
IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer());
- this.pollThread = PollThreadUtils.pollServer(expectedState, poller , pollThread, actualBehavior);
+ pollServer(expectedState, poller);
}
protected void pollServer(boolean expectedState, IServerStatePoller poller) {
14 years, 9 months
JBoss Tools SVN: r33019 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-18 10:33:16 -0400 (Mon, 18 Jul 2011)
New Revision: 33019
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-9349 - ui cleanup to properly show when a new server is created the correct status of it's jre choice.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2011-07-18 14:15:36 UTC (rev 33018)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2011-07-18 14:33:16 UTC (rev 33019)
@@ -31,6 +31,7 @@
public static String PROPERTY_CONFIG_LOCATION="org.jboss.ide.eclipse.as.core.runtime.configurationLocation"; //$NON-NLS-1$
public IRuntime getRuntime();
+ public IVMInstall getHardVM();
public IVMInstall getVM();
public void setVM(IVMInstall install);
public IExecutionEnvironment getExecutionEnvironment();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2011-07-18 14:15:36 UTC (rev 33018)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2011-07-18 14:33:16 UTC (rev 33019)
@@ -56,7 +56,8 @@
return base + " " + i; //$NON-NLS-1$
}
- public IVMInstall getVM() {
+ /* Return a vm that is hard-coded in the runtime's attributes*/
+ public IVMInstall getHardVM() {
if (getVMInstallTypeId() != null) {
String id = getAttribute(PROPERTY_VM_ID, (String)null);
String type = getAttribute(PROPERTY_VM_TYPE_ID, (String)null);
@@ -69,6 +70,14 @@
return vmInstalls[i];
}
}
+ return null;
+ }
+
+ public IVMInstall getVM() {
+ IVMInstall hard = getHardVM();
+ if( hard != null )
+ return hard;
+
if( getExecutionEnvironment() != null ) {
IVMInstall[] installs = getExecutionEnvironment().getCompatibleVMs();
if( getExecutionEnvironment().getDefaultVM() != null )
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-07-18 14:15:36 UTC (rev 33018)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-07-18 14:33:16 UTC (rev 33019)
@@ -38,6 +38,7 @@
public static String wf_HomeDirLabel;
public static String wf_JRELabel;
public static String wf_ConfigLabel;
+ public static String wf_ExecEnvironmentLabel;
public static String J2EEModuleExportOperation_could_not_export_module;
public static String J2EEModuleExportOperation_ErrorExportingArchive;
@@ -63,6 +64,7 @@
public static String rwf_NoVMSelected;
public static String rwf_jre6NotFound;
public static String rwf_noValidJRE;
+ public static String rwf_DefaultJREForExecEnv;
public static String swf_Title;
public static String swf_RuntimeInformation;
public static String swf_AuthorizationDescription;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-07-18 14:15:36 UTC (rev 33018)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-07-18 14:33:16 UTC (rev 33019)
@@ -7,6 +7,7 @@
wf_NameLabel=Name
wf_HomeDirLabel=Home Directory
wf_JRELabel=JRE
+wf_ExecEnvironmentLabel=Execution Environment
wf_ConfigLabel=Configuration
rwf_CopyConfigLabel=Copy configuration "{0}" to a new destination from "{1}".
rwf_DestinationLabel=Destination
@@ -21,6 +22,7 @@
rwf_NoVMSelected=No VM selected
rwf_jre6NotFound=No Java 6 runtime environment found
rwf_noValidJRE=No valid JREs found for execution environment "{0}"
+rwf_DefaultJREForExecEnv=Default JRE for {0}
J2EEModuleExportOperation_could_not_export_module=Could not export module {1} to {0}.
J2EEModuleExportOperation_ErrorExportingArchive=Error Exporting Archive: {0}
JBAS_version=JBoss Application Server {0}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-07-18 14:15:36 UTC (rev 33018)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-07-18 14:33:16 UTC (rev 33019)
@@ -740,7 +740,7 @@
size = size+1;
int index = 0;
jreNames = new String[size];
- jreNames[index++] = "Default JRE for " + getRuntime().getExecutionEnvironment().getId(); //$NON-NLS-1$
+ jreNames[index++] = NLS.bind(Messages.rwf_DefaultJREForExecEnv, getRuntime().getExecutionEnvironment().getId());
for (int i = 0; i < installedJREs.size(); i++) {
IVMInstall vmInstall = installedJREs.get(i);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2011-07-18 14:15:36 UTC (rev 33018)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2011-07-18 14:33:16 UTC (rev 33019)
@@ -1,23 +1,13 @@
-/*
- * Copyright 2006, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ui.wizards;
@@ -26,6 +16,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
@@ -48,6 +39,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
import org.jboss.ide.eclipse.as.ui.editor.ServerModeSectionComposite;
@@ -60,8 +52,8 @@
private IWizardHandle handle;
private Label serverExplanationLabel,
runtimeExplanationLabel;
- private Label homeDirLabel, installedJRELabel, configLabel;
- private Label homeValLabel, jreValLabel, configValLabel, configLocValLabel;
+ private Label homeDirLabel, execEnvironmentLabel, installedJRELabel, configLabel;
+ private Label homeValLabel, execEnvironmentValLabel, jreValLabel, configValLabel, configLocValLabel;
private Group runtimeGroup;
@@ -120,10 +112,7 @@
runtimeGroup = new Group(main, SWT.NONE);
runtimeGroup.setText(Messages.swf_RuntimeInformation);
- FormData groupData = new FormData();
- groupData.left = new FormAttachment(0,5);
- groupData.right = new FormAttachment(100, -5);
- groupData.top = new FormAttachment(serverExplanationLabel, 5);
+ FormData groupData = UIUtil.createFormData2(serverExplanationLabel, 5, null, 0, 0,5,100,-5);
runtimeGroup.setLayoutData(groupData);
runtimeGroup.setLayout(new GridLayout(2, false));
@@ -141,6 +130,11 @@
homeDirLabel.setText(Messages.wf_HomeDirLabel);
homeValLabel = new Label(runtimeGroup, SWT.NONE);
homeValLabel.setLayoutData(d);
+ execEnvironmentLabel = new Label(runtimeGroup, SWT.NONE);
+ execEnvironmentLabel.setText(Messages.wf_ExecEnvironmentLabel);
+ execEnvironmentValLabel= new Label(runtimeGroup, SWT.NONE);
+ d = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
+ execEnvironmentValLabel.setLayoutData(d);
installedJRELabel = new Label(runtimeGroup, SWT.NONE);
installedJRELabel.setText(Messages.wf_JRELabel);
@@ -208,7 +202,11 @@
IJBossServerRuntime srt = getRuntime();
homeValLabel.setText(srt.getRuntime().getLocation().toOSString());
configValLabel.setText(srt.getJBossConfiguration());
- jreValLabel.setText(srt.getVM().getInstallLocation().getAbsolutePath() + " (" + srt.getVM().getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
+ execEnvironmentValLabel.setText(srt.getExecutionEnvironment().getDescription());
+ IVMInstall vm = srt.getHardVM();
+ String jreVal = vm == null ? NLS.bind(Messages.rwf_DefaultJREForExecEnv, getRuntime().getExecutionEnvironment().getId()) :
+ vm.getInstallLocation().getAbsolutePath() + " (" + vm.getName() + ")";//$NON-NLS-1$ //$NON-NLS-2$
+ jreValLabel.setText(jreVal);
configLocValLabel.setText(srt.getConfigLocation());
runtimeGroup.layout();
updateErrorMessage();
14 years, 9 months
JBoss Tools SVN: r33018 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-07-18 10:15:36 -0400 (Mon, 18 Jul 2011)
New Revision: 33018
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java
Log:
swtbot ext: example test passes (is not tested) when it was not found in tree
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2011-07-18 14:04:48 UTC (rev 33017)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2011-07-18 14:15:36 UTC (rev 33018)
@@ -51,33 +51,46 @@
/**
* main test method, all steps can be overriden
* <ol>
- * <li>{@link ESBExampleTest#importExamples()}</li>
+ * <li>{@link ESBExampleTest#importExample()}</li>
* <li>{@link ESBExampleTest#postImport()}</li>
* <li>{@link ESBExampleTest#executeExample()}</li>
* </ol>
*/
@Test
public void exampleTest() {
- importExamples();
- postImport();
- executeExample();
+ SWTBot wiz;
+ // consider test as passed if example is not found
+ if ((wiz = existsExample()) != null) {
+ importExample(wiz);
+ postImport();
+ executeExample();
+ }
}
- /**
- * runs Project Examples dialog, downloads and imports example's projects to workspace
- */
- protected void importExamples() {
+ private SWTBot existsExample() {
SWTBot wiz = open.newObject(JBossToolsProjectExamples.LABEL);
// wait for progress shell (downloading & parsing example xml)
SWTBotShell shell = bot.shell("Progress Information");
shell.activate();
bot.waitUntil(shellCloses(shell),Timing.time100S());
- open.selectTreeNode(wiz,ActionItem.create(getExampleCategory(),getExampleName()));
+ try {
+ open.selectTreeNode(wiz,ActionItem.create(getExampleCategory(),getExampleName()));
+ return wiz;
+ }
+ catch (Exception ex) {
+ log.warn(String.format("Project example %s under category %s was not found",getExampleName(),getExampleCategory()));
+ return null;
+ }
+ }
+ /**
+ * runs Project Examples dialog, downloads and imports example's projects to workspace
+ */
+ protected void importExample(SWTBot wiz) {
String hasProjName = wiz.textWithLabel(JBossToolsProjectExamples.TEXT_PROJECT_NAME).getText();
assertTrue(String.format("Example project name changed, have '%s', expected '%s'",hasProjName,getProjectNames()[0]),hasProjName.equals(getProjectNames()[0]));
int projSize = getProjectSize(wiz.textWithLabel(JBossToolsProjectExamples.TEXT_PROJECT_SIZE).getText());
wiz.checkBox("Show the Quick Fix dialog").deselect();
wiz.button(IDELabel.Button.FINISH).click();
- shell = bot.shell("Downloading...");
+ SWTBotShell shell = bot.shell("Downloading...");
shell.activate();
bot.waitUntil(shellCloses(shell),Timing.time(projSize*20*1000));
util.waitForNonIgnoredJobs(Timing.time20S());
14 years, 9 months
JBoss Tools SVN: r33017 - 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-07-18 10:04:48 -0400 (Mon, 18 Jul 2011)
New Revision: 33017
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
Log:
[JBIDE-9358] extracted alerting event log to its own method
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-07-18 13:51:35 UTC (rev 33016)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-07-18 14:04:48 UTC (rev 33017)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal;
-import java.util.Date;
-
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
@@ -95,14 +93,16 @@
int maxWait = getTimeout();
alertEventLogStarting();
- long startTime = new Date().getTime();
+ long startTime = System.currentTimeMillis();
boolean done = false;
try {
poller.beginPolling(getServer(), expectedState);
// begin the loop; ask the poller every so often
- while (!stateStartedOrStopped && !abort && !done
- && (new Date().getTime() < startTime + maxWait) || maxWait < 0) {
+ while (!stateStartedOrStopped
+ && !abort
+ && !done
+ && !timeoutReached(startTime, maxWait)) {
try {
Thread.sleep(100);
} catch (InterruptedException ie) {
@@ -193,6 +193,10 @@
}
}
+ private boolean timeoutReached(long startTime, int maxWait) {
+ return System.currentTimeMillis() >= (startTime + maxWait);
+ }
+
protected boolean checkServerState() {
int state = behavior.getServer().getServerState();
if (state == IServer.STATE_STARTED)
14 years, 9 months
JBoss Tools SVN: r33016 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-18 09:51:35 -0400 (Mon, 18 Jul 2011)
New Revision: 33016
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
[JBIDE-8960] remove jboss as7 specific launch config
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-18 13:46:19 UTC (rev 33015)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-18 13:51:35 UTC (rev 33016)
@@ -119,7 +119,7 @@
hasConfiguration="false"
id="org.jboss.ide.eclipse.as.70"
initialState="stopped"
- launchConfigId="org.jboss.ide.eclipse.as.core.server.JBoss7StartupConfiguration"
+ launchConfigId="org.jboss.ide.eclipse.as.core.server.startupConfiguration"
launchModes="run,debug,profile"
name="%jboss.version.70.name"
runtime="true"
@@ -630,15 +630,6 @@
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
sourcePathComputerId="org.eclipse.jst.server.generic.core.sourcePathComputer"/>
<launchConfigurationType
- category="JBoss"
- delegate="org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration"
- id="org.jboss.ide.eclipse.as.core.server.JBoss7StartupConfiguration"
- modes="run,debug,profile"
- name="JBoss Application Server Startup Configuration"
- public="true"
- sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
- sourcePathComputerId="org.eclipse.jst.server.generic.core.sourcePathComputer"/>
- <launchConfigurationType
delegate="org.jboss.ide.eclipse.as.core.server.internal.launch.TwiddleLaunchConfiguration"
id="org.jboss.ide.eclipse.as.core.server.twiddleConfiguration"
modes="run"
14 years, 9 months
JBoss Tools SVN: r33015 - 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-07-18 09:46:19 -0400 (Mon, 18 Jul 2011)
New Revision: 33015
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
Log:
[JBIDE-9358] extracted alerting event log to its own method
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-07-18 13:44:23 UTC (rev 33014)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-07-18 13:46:19 UTC (rev 33015)
@@ -187,12 +187,7 @@
// we're up (failed to shutdown)
// all other cases, we're down.
currentState = (expectedState == (behavior == IServerStatePoller.TIMEOUT_BEHAVIOR_SUCCEED));
- finalAlert = false;
alertBehavior(currentState);
- if (finalAlert) {
- alertEventLog(currentState);
- }
-
}
}
}
14 years, 9 months
JBoss Tools SVN: r33014 - trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-07-18 09:44:23 -0400 (Mon, 18 Jul 2011)
New Revision: 33014
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
Log:
JBIDE-8969 : Fixed disabling a profile on multiple selection
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-07-18 13:25:04 UTC (rev 33013)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-07-18 13:44:23 UTC (rev 33014)
@@ -121,8 +121,8 @@
} else {
//Value was displayed and is consistent
if (Boolean.TRUE.equals(selection.getSelected())) {
- id = st.getId();
- isDisabled = st.getActivationState().equals(ProfileState.Disabled);
+ id = selection.getId();
+ isDisabled = selection.getActivationState().equals(ProfileState.Disabled);
}
}
}
14 years, 9 months
JBoss Tools SVN: r33013 - 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-07-18 09:25:04 -0400 (Mon, 18 Jul 2011)
New Revision: 33013
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
Log:
[JBIDE-9358] extracted alerting event log to its own method
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-07-18 13:19:38 UTC (rev 33012)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-07-18 13:25:04 UTC (rev 33013)
@@ -55,18 +55,17 @@
private String pollerId;
public PollThread(boolean expectedState, IServerStatePoller poller, DelegatingServerBehavior behavior) {
- super(getThreadName(behavior));
+ super(getThreadName(behavior.getServer()));
this.expectedState = expectedState;
- this.abort = false;
- this.abortMessage = null;
this.behavior = behavior;
this.poller = poller;
+ this.abort = false;
}
- private static String getThreadName(DelegatingServerBehavior behavior) {
- return NLS.bind(Messages.ServerPollerThreadName, behavior.getServer().getName());
+ private static String getThreadName(IServer server) {
+ return NLS.bind(Messages.ServerPollerThreadName, server.getName());
}
-
+
public void cancel() {
cancel(null);
}
@@ -89,7 +88,7 @@
if (poller == null) {
alertEventLogStarting();
alertPollerNotFound();
- alertBehavior(!expectedState, false);
+ alertBehavior(!expectedState);
return;
}
@@ -116,7 +115,7 @@
poller.cancel(IServerStatePoller.CANCEL);
poller.cleanup();
alertEventLogPollerException(e);
- alertBehavior(!expectedState, false);
+ alertBehavior(!expectedState);
return;
} catch (RequiresInfoException rie) {
// This way each request for new info is checked only once.
@@ -160,13 +159,16 @@
try {
currentState = poller.getState();
poller.cleanup();
- alertBehavior(currentState, finalAlert);
+ alertBehavior(currentState);
+ if (finalAlert) {
+ alertEventLog(currentState);
+ }
} catch (PollingException pe) {
// abort and put the message in event log
poller.cancel(IServerStatePoller.CANCEL);
poller.cleanup();
alertEventLogPollerException(pe);
- alertBehavior(!expectedState, false);
+ alertBehavior(!expectedState);
return;
} catch (RequiresInfoException rie) {
// You don't have an answer... liar!
@@ -186,7 +188,11 @@
// all other cases, we're down.
currentState = (expectedState == (behavior == IServerStatePoller.TIMEOUT_BEHAVIOR_SUCCEED));
finalAlert = false;
- alertBehavior(currentState, finalAlert);
+ alertBehavior(currentState);
+ if (finalAlert) {
+ alertEventLog(currentState);
+ }
+
}
}
}
@@ -201,20 +207,23 @@
return false;
}
- protected void alertBehavior(boolean currentState, boolean finalAlert) {
+ protected void alertEventLog(boolean currentState) {
if (currentState != expectedState) {
+ alertEventLogFailure();
+ } else {
+ alertEventLogSuccess(currentState);
+ }
+ }
+
+ protected void alertBehavior(boolean currentState) {
+ if (currentState != expectedState) {
// it didnt work... cancel all processes! force stop
behavior.stop(true);
- if (finalAlert)
- alertEventLogFailure();
} else {
if (currentState == IServerStatePoller.SERVER_UP)
behavior.setServerStarted();
else
behavior.stop(true);
-
- if (finalAlert)
- alertEventLogSuccess(currentState);
}
}
14 years, 9 months
JBoss Tools SVN: r33012 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-18 09:19:38 -0400 (Mon, 18 Jul 2011)
New Revision: 33012
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
[JBIDE-8960] corrected missing adjustement in plugin.xml (was: could not launch as7 any more)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-18 13:15:17 UTC (rev 33011)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-07-18 13:19:38 UTC (rev 33012)
@@ -631,7 +631,7 @@
sourcePathComputerId="org.eclipse.jst.server.generic.core.sourcePathComputer"/>
<launchConfigurationType
category="JBoss"
- delegate="org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7StartLaunchConfiguration"
+ delegate="org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration"
id="org.jboss.ide.eclipse.as.core.server.JBoss7StartupConfiguration"
modes="run,debug,profile"
name="JBoss Application Server Startup Configuration"
14 years, 9 months