JBoss Tools SVN: r33445 - trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-08-02 06:17:58 -0400 (Tue, 02 Aug 2011)
New Revision: 33445
Modified:
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java
Log:
Update references to Seam 2 wizards
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-08-02 10:01:01 UTC (rev 33444)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/CreateMavenizedSeamProjectTest.java 2011-08-02 10:17:58 UTC (rev 33445)
@@ -408,9 +408,9 @@
public static void createNewSeamWebProjectWizard(String projectName, String deployType) throws Exception {
waitForIdle();
- bot.menu("File").menu("New").menu("Seam Web Project").click();
+ bot.menu("File").menu("New").menu("Seam 2 Web Project").click();
- SWTBotShell mainShell = bot.shell("New Seam Project");
+ SWTBotShell mainShell = bot.shell("New Seam 2 Project");
mainShell.activate();
bot.textWithLabel("Project name:").setText(projectName);
14 years, 4 months
JBoss Tools SVN: r33444 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-02 06:01:01 -0400 (Tue, 02 Aug 2011)
New Revision: 33444
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
Log:
JBIDE-9377 - disable debug option when using RSE (for now)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-08-02 09:55:33 UTC (rev 33443)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-08-02 10:01:01 UTC (rev 33444)
@@ -30,7 +30,7 @@
@Override
public IStatus canChangeState(String launchMode) {
- if( launchMode.equals("debug"))
+ if( "debug".equals(launchMode))
return Status.CANCEL_STATUS;
return Status.OK_STATUS;
}
14 years, 4 months
JBoss Tools SVN: r33443 - trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-02 05:55:33 -0400 (Tue, 02 Aug 2011)
New Revision: 33443
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java
Log:
astools - Some classpath filesets were not correct
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java 2011-08-02 09:21:51 UTC (rev 33442)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/CustomRuntimeClasspathModel.java 2011-08-02 09:55:33 UTC (rev 33443)
@@ -140,11 +140,11 @@
sets.add(new PathProviderFileset(configPath + "/" + LIB));
sets.add(new PathProviderFileset(deployPath + "/" + JBOSSWEB_SAR + "/" + JSF_LIB));
- sets.add(new PathProviderFileset(deployPath + "/" + JBOSSWEB_SAR + "/" + JBOSS_WEB_SERVICE_JAR));
- sets.add(new PathProviderFileset(deployPath + "/" + JBOSSWEB_SAR + "/" + JSTL_JAR));
+ sets.add(new PathProviderFileset("", deployPath + "/" + JBOSSWEB_SAR, JBOSS_WEB_SERVICE_JAR, ""));
+ sets.add(new PathProviderFileset("", deployPath + "/" + JBOSSWEB_SAR, JSTL_JAR, ""));
sets.add(new PathProviderFileset(deployerPath + "/" + AS5_AOP_DEPLOYER));
sets.add(new PathProviderFileset(deployerPath + "/" + EJB3_DEPLOYER));
- sets.add(new PathProviderFileset(deployerPath + "/" + WEBBEANS_DEPLOYER + "/" +JSR299_API_JAR));
+ sets.add(new PathProviderFileset("", deployerPath + "/" + WEBBEANS_DEPLOYER,JSR299_API_JAR, ""));
sets.add(new PathProviderFileset(CLIENT));
return sets.toArray(new PathProviderFileset[sets.size()]);
}
14 years, 4 months
JBoss Tools SVN: r33442 - trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-08-02 05:21:51 -0400 (Tue, 02 Aug 2011)
New Revision: 33442
Modified:
trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml
Log:
temporarily removing maven.ui.bot.test from bottest update site
Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml
===================================================================
--- trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-08-02 08:44:37 UTC (rev 33441)
+++ trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-08-02 09:21:51 UTC (rev 33442)
@@ -45,7 +45,7 @@
<plugin id="org.jboss.tools.jbpm.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.jsf.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.jst.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
- <plugin id="org.jboss.tools.maven.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
+<!-- <plugin id="org.jboss.tools.maven.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> -->
<plugin id="org.jboss.tools.modeshape.rest.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.seam.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.smooks.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
14 years, 4 months
JBoss Tools SVN: r33441 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-02 04:44:37 -0400 (Tue, 02 Aug 2011)
New Revision: 33441
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
Log:
JBIDE-9076 - no alpha chars for port numbers
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2011-08-02 08:32:36 UTC (rev 33440)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2011-08-02 08:44:37 UTC (rev 33441)
@@ -23,6 +23,8 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.events.VerifyListener;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
@@ -208,7 +210,7 @@
data = new FormData();
data.right = new FormAttachment(detect, -5);
- data.left = new FormAttachment(0, 100);
+ data.left = new FormAttachment(0, 75);
data.top = new FormAttachment(0,5);
text.setLayoutData(data);
@@ -220,6 +222,20 @@
label.setText(labelText);
detect.setText(Messages.EditorAutomaticallyDetectPort);
link.setText("<a href=\"\">" + Messages.Configure + "</a>"); //$NON-NLS-1$ //$NON-NLS-2$
+
+ text.addVerifyListener(new VerifyListener() {
+ public void verifyText(VerifyEvent e) {
+ if( e.text == null || e.text.equals(""))
+ return;
+ try {
+ Integer i = Integer.parseInt(e.text);
+ } catch( NumberFormatException nfe ) {
+ e.doit = false;
+ }
+ }
+ });
+
+
return child;
}
protected void initialize() {
14 years, 4 months
JBoss Tools SVN: r33440 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-02 04:32:36 -0400 (Tue, 02 Aug 2011)
New Revision: 33440
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java
Log:
JBIDE-9277 - disable pollers when server is in 'ignore launch' mode.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2011-08-02 07:29:54 UTC (rev 33439)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2011-08-02 08:32:36 UTC (rev 33440)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.ui.editor;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -31,6 +34,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.ui.Messages;
/**
@@ -38,7 +42,7 @@
* @author rob Stryker (rob.stryker(a)redhat.com)
*
*/
-public class PollerSection extends ServerEditorSection {
+public class PollerSection extends ServerEditorSection implements PropertyChangeListener {
private Combo startPollerCombo, stopPollerCombo;
private Composite pollers;
private String[] startupTypesStrings, shutdownTypesStrings;
@@ -50,6 +54,7 @@
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
helper = new ServerAttributeHelper(server.getOriginal(), server);
+ server.addPropertyChangeListener(this);
}
public void createSection(Composite parent) {
@@ -57,6 +62,10 @@
findPossiblePollers();
createUI(parent);
addListeners();
+ String ignoreLaunch = server.getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
+ Boolean b = new Boolean(ignoreLaunch);
+ startPollerCombo.setEnabled(!b.booleanValue());
+ stopPollerCombo.setEnabled(!b.booleanValue());
}
protected void createUI(Composite parent) {
@@ -185,4 +194,22 @@
}
}
+ /**
+ * Disposes of the section.
+ */
+ public void dispose() {
+ server.removePropertyChangeListener(this);
+ }
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ String propertyName = evt.getPropertyName();
+ if( propertyName.equals(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS)) {
+ Object val = evt.getNewValue();
+ Boolean b = new Boolean((String)val);
+ startPollerCombo.setEnabled(!b.booleanValue());
+ stopPollerCombo.setEnabled(!b.booleanValue());
+ }
+ }
+
}
14 years, 4 months
JBoss Tools SVN: r33439 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2011-08-02 03:29:54 -0400 (Tue, 02 Aug 2011)
New Revision: 33439
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties
Log:
JBIDE-9044: display a warning when the selected element is not bpel content folder
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java 2011-08-02 07:13:31 UTC (rev 33438)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/Messages.java 2011-08-02 07:29:54 UTC (rev 33439)
@@ -59,6 +59,8 @@
public static String NewFileWizardPage2_Name;
// https://issues.jboss.org/browse/JBIDE-8591
public static String NewFileWizard_Not_A_Faceted_Project;
+
+ public static String NewFileWizard_Not_A_BPELContent_Folder;
public static String NewFileWizard_WSDLCustomPage_Name;
public static String NewFileWizard_WSDLCustomPage_Title;
public static String NewFileWizard_WSDLCustomPage_Description;
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2011-08-02 07:13:31 UTC (rev 33438)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizard.java 2011-08-02 07:29:54 UTC (rev 33439)
@@ -17,13 +17,11 @@
import org.eclipse.bpel.ui.BPELUIPlugin;
import org.eclipse.bpel.ui.Templates.Template;
-import org.eclipse.core.internal.resources.Folder;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Display;
@@ -33,7 +31,6 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.internal.Workbench;
import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
@@ -214,12 +211,10 @@
*/
IContainer getBPELContainer(Object obj) {
-
- IContainer bpelContent = null;
-
if (obj == null) {
return null;
}
+ IContainer bpelContainer = null;
IProject project = null;
if (obj instanceof IFile) {
IFile file = (IFile) obj;
@@ -229,6 +224,20 @@
IContainer container = (IContainer) obj;
project = container.getProject();
}
+ bpelContainer = getBPELContentFolder(project);
+ if (bpelContainer == null) {
+ // https://issues.jboss.org/browse/JBIDE-8591
+ // use folder or project
+ if (obj instanceof IContainer)
+ bpelContainer = (IContainer)obj;
+ else
+ bpelContainer = project;
+ }
+ return bpelContainer;
+ }
+
+ public static IContainer getBPELContentFolder(IProject project) {
+ IContainer bpelContent = null;
if (project != null) {
// https://issues.jboss.org/browse/JBIDE-8591
// if not a faceted project, still allow resources to be created
@@ -237,31 +246,24 @@
bpelContent = project.getFolder(rootPath);
}
}
- if (bpelContent == null) {
- // https://issues.jboss.org/browse/JBIDE-8591
- // use folder or project
- if (obj instanceof IContainer)
- bpelContent = (IContainer)obj;
- else
- bpelContent = project;
- }
return bpelContent;
}
+
- static IPath getWebContentRootPath(IProject project) {
- if (project == null)
- return null;
-
- if (!ModuleCoreNature.isFlexibleProject(project))
- return null;
-
- IPath path = null;
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null && component.exists()) {
- path = component.getRootFolder().getProjectRelativePath();
- }
- return path;
- }
+ public static IPath getWebContentRootPath(IProject project) {
+ if (project == null)
+ return null;
+
+ if (!ModuleCoreNature.isFlexibleProject(project))
+ return null;
+
+ IPath path = null;
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if (component != null && component.exists()) {
+ path = component.getRootFolder().getProjectRelativePath();
+ }
+ return path;
+ }
// https://issues.jboss.org/browse/JBIDE-8591
// added to allow first and last page access to resource container
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-08-02 07:13:31 UTC (rev 33438)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage2.java 2011-08-02 07:29:54 UTC (rev 33439)
@@ -86,16 +86,23 @@
if (resource instanceof IContainer) {
IContainer container = (IContainer)resource;
// https://issues.jboss.org/browse/JBIDE-8591
- setMessage(null);
- if (!ModuleCoreNature.isFlexibleProject(resource.getProject())) {
- setMessage(Messages.NewFileWizard_Not_A_Faceted_Project, WizardPage.WARNING);
-// return false;
- }
if ( container.findMember(processName +".bpel") != null ) { //$NON-NLS-1$
setMessage(Messages.NewFileWizardPage1_12, WizardPage.ERROR);
return false;
}
+
+ if (!ModuleCoreNature.isFlexibleProject(resource.getProject())) {
+ setMessage(Messages.NewFileWizard_Not_A_Faceted_Project, WizardPage.WARNING);
+ return true;
+ }
+
+ if (!container.equals(NewFileWizard.getBPELContentFolder(container.getProject()))) {
+ setMessage(Messages.NewFileWizard_Not_A_BPELContent_Folder, WizardPage.WARNING);
+ return true;
+ }
+
+ setMessage(null);
return true;
}
return false;
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties 2011-08-02 07:13:31 UTC (rev 33438)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/messages.properties 2011-08-02 07:29:54 UTC (rev 33439)
@@ -25,6 +25,7 @@
NewFileWizard_WSDLCustomPage_AddressLabel=Service Address
NewFileWizard_WSDLCustomPage_BindingLabel=Binding Protocol
NewFileWizard_Not_A_Faceted_Project=The selected location is not a faceted project.
+NewFileWizard_Not_A_BPELContent_Folder=The selected location is not a BPEL Content folder.
Error_NewFileWizard_WSDLCustomPage_Name_Empty=Specify a {0} for the BPEL process in the WSDL file.
Error_NewFileWizard_WSDLCustomPage_Name_Space={0} must not include a space.
Error_NewFileWizard_WSDLCustomPage_Protocol=The Binding Protocol must be 'SOAP' or 'HTTP'.
14 years, 4 months
JBoss Tools SVN: r33438 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-02 03:13:31 -0400 (Tue, 02 Aug 2011)
New Revision: 33438
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
Log:
JBIDE-9377 - disable debug option when using RSE (for now)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-08-02 07:07:04 UTC (rev 33437)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-08-02 07:13:31 UTC (rev 33438)
@@ -29,6 +29,14 @@
public class RSEBehaviourDelegate extends AbstractRSEBehaviourDelegate {
@Override
+ public IStatus canChangeState(String launchMode) {
+ if( launchMode.equals("debug"))
+ return Status.CANCEL_STATUS;
+ return Status.OK_STATUS;
+ }
+
+
+ @Override
protected String getShutdownCommand(IServer server) throws CoreException {
String defaultCommand = ServerUtil.checkedGetBehaviorDelegate(server).getDefaultStopArguments();
ILaunchConfiguration config = getServer().getLaunchConfiguration(false, new NullProgressMonitor());
@@ -57,14 +65,4 @@
shell.writeToShell("exit");
}
}
-
- @Override
- public void onServerStarting() {
- pollServer(IServerStatePoller.SERVER_UP);
- }
-
- @Override
- public void onServerStopping() {
- pollServer(IServerStatePoller.SERVER_DOWN);
- }
}
14 years, 4 months
JBoss Tools SVN: r33437 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-02 03:07:04 -0400 (Tue, 02 Aug 2011)
New Revision: 33437
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
Log:
Nesting rse7 behaviour under generic rse behaviour
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-08-02 06:16:44 UTC (rev 33436)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-08-02 07:07:04 UTC (rev 33437)
@@ -14,43 +14,21 @@
import java.text.MessageFormat;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
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.IJBoss7ManagerService;
-import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerUtil;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.core.util.ServerUtil;
-public class RSEJBoss7BehaviourDelegate extends AbstractRSEBehaviourDelegate {
+public class RSEJBoss7BehaviourDelegate extends RSEBehaviourDelegate {
private IJBoss7ManagerService service;
-
- @Override
- protected String getShutdownCommand(IServer server) throws CoreException {
- String defaultCommand = ServerUtil.checkedGetBehaviorDelegate(server).getDefaultStopArguments();
- ILaunchConfiguration config = getServer().getLaunchConfiguration(false, new NullProgressMonitor());
- return RSELaunchConfigProperties.getShutdownCommand(config, defaultCommand);
- }
@Override
- public void onServerStarting() {
- pollServer(IServerStatePoller.SERVER_UP);
- }
-
- @Override
- public void onServerStopping() {
- pollServer(IServerStatePoller.SERVER_DOWN);
- }
-
- @Override
protected IStatus gracefullStop() {
IServer server = getServer();
try {
14 years, 4 months
JBoss Tools SVN: r33436 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-02 02:16:44 -0400 (Tue, 02 Aug 2011)
New Revision: 33436
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java
Log:
JBIDE-9439 - snjezana's patch
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java 2011-08-02 02:36:55 UTC (rev 33435)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java 2011-08-02 06:16:44 UTC (rev 33436)
@@ -11,10 +11,13 @@
package org.jboss.ide.eclipse.as.core.server.internal.launch.configuration;
import java.net.MalformedURLException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
+import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
@@ -50,6 +53,16 @@
String runJarEntry = LaunchConfigUtils.getRunJarRuntimeCPEntry(server.getServer()).getMemento();
currentClasspath.add(runJarEntry);
}
+ IVMInstall vmInstall = runtime.getVM();
+ List<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
+ LaunchConfigUtils.addJREEntry(vmInstall, classpath);
+ List<String> runtimeClassPaths = LaunchConfigUtils.toStrings(classpath);
+ if (runtimeClassPaths != null && runtimeClassPaths.size() == 1) {
+ String jreEntry = runtimeClassPaths.get(0);
+ if (!currentClasspath.contains(jreEntry)) {
+ currentClasspath.add(jreEntry);
+ }
+ }
return currentClasspath;
} catch (CoreException ce) {
return currentClasspath;
14 years, 4 months