JBoss Tools SVN: r25082 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-09-22 06:54:39 -0400 (Wed, 22 Sep 2010)
New Revision: 25082
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java
Log:
JBIDE-7121 - updating launch config UI to more fit user expectations
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2010-09-22 10:37:35 UTC (rev 25081)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2010-09-22 10:54:39 UTC (rev 25082)
@@ -36,6 +36,7 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.AbstractJBossLaunchConfigType;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.IStartLaunchSetupParticipant;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate;
@@ -49,7 +50,10 @@
public static final String RSE_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.STARTUP_COMMAND";
public static final String RSE_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.SHUTDOWN_COMMAND";
+ public static final String DETECT_STARTUP_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DETECT_STARTUP_COMMAND";
+ public static final String DETECT_SHUTDOWN_COMMAND = "org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate.DETECT_SHUTDOWN_COMMAND";
+
public void actualLaunch(
JBossServerStartupLaunchConfiguration launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
@@ -195,46 +199,18 @@
public void setupLaunchConfiguration(
ILaunchConfigurationWorkingCopy workingCopy, IServer server)
throws CoreException {
- String rseHome = server.getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, "");
+ boolean detectStartupCommand, detectShutdownCommand;
+ detectStartupCommand = workingCopy.getAttribute(DETECT_STARTUP_COMMAND, true);
+ detectShutdownCommand = workingCopy.getAttribute(DETECT_SHUTDOWN_COMMAND, true);
+
String currentStartupCmd = workingCopy.getAttribute(RSELaunchDelegate.RSE_STARTUP_COMMAND, (String)null);
- if( currentStartupCmd == null || "".equals(currentStartupCmd)) {
- // initialize startup command to something reasonable
- String currentArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
- String currentVMArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
-
- currentVMArgs= ArgsUtil.setArg(currentVMArgs, null,
- IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS,
- new Path(rseHome).append(
- IJBossRuntimeResourceConstants.LIB).append(
- IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true);
-
- String libPath = new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN)
- .append(IJBossRuntimeResourceConstants.NATIVE).toOSString();
- currentVMArgs= ArgsUtil.setArg(currentVMArgs, null,
- IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JAVA_LIB_PATH,
- libPath, true);
-
-
- String cmd = "java " + currentVMArgs + "-classpath " +
- new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN).append(
- IJBossRuntimeResourceConstants.START_JAR).toString() + IJBossRuntimeConstants.SPACE +
- IJBossRuntimeConstants.START_MAIN_TYPE + IJBossRuntimeConstants.SPACE + currentArgs + "&";
- workingCopy.setAttribute(RSELaunchDelegate.RSE_STARTUP_COMMAND, cmd);
+ if( detectStartupCommand || currentStartupCmd == null || "".equals(currentStartupCmd)) {
+ workingCopy.setAttribute(RSELaunchDelegate.RSE_STARTUP_COMMAND, getDefaultLaunchCommand(workingCopy));
}
String currentStopCmd = workingCopy.getAttribute(RSELaunchDelegate.RSE_SHUTDOWN_COMMAND, (String)null);
- if( currentStopCmd == null || "".equals(currentStopCmd)) {
- JBossServer jbs = ServerConverter.getJBossServer(server);
- // initialize stop command to something reasonable
- String username = jbs.getUsername();
- String pass = jbs.getPassword();
-
- String stop = new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN).append(IJBossRuntimeResourceConstants.SHUTDOWN_SH).toString() +
- IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.SHUTDOWN_STOP_ARG + IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.SHUTDOWN_SERVER_ARG +
- IJBossRuntimeConstants.SPACE + server.getHost() + IJBossRuntimeConstants.SPACE +
- IJBossRuntimeConstants.SHUTDOWN_USER_ARG + IJBossRuntimeConstants.SPACE +
- username + IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.SHUTDOWN_PASS_ARG + IJBossRuntimeConstants.SPACE + pass;
- workingCopy.setAttribute(RSELaunchDelegate.RSE_SHUTDOWN_COMMAND, stop);
+ if( detectShutdownCommand || currentStopCmd == null || "".equals(currentStopCmd)) {
+ workingCopy.setAttribute(RSELaunchDelegate.RSE_SHUTDOWN_COMMAND, getDefaultStopCommand(server));
}
/*
* /usr/lib/jvm/jre/bin/java -Dprogram.name=run.sh -server -Xms1530M -Xmx1530M
@@ -251,6 +227,54 @@
*/
}
+ public static String getDefaultStopCommand(IServer server) {
+ String rseHome = server.getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, "");
+ JBossServer jbs = ServerConverter.getJBossServer(server);
+ // initialize stop command to something reasonable
+ String username = jbs.getUsername();
+ String pass = jbs.getPassword();
+
+ String stop = new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN).append(IJBossRuntimeResourceConstants.SHUTDOWN_SH).toString() +
+ IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.SHUTDOWN_STOP_ARG + IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.SHUTDOWN_SERVER_ARG +
+ IJBossRuntimeConstants.SPACE + server.getHost() + IJBossRuntimeConstants.SPACE +
+ IJBossRuntimeConstants.SHUTDOWN_USER_ARG + IJBossRuntimeConstants.SPACE +
+ username + IJBossRuntimeConstants.SPACE + IJBossRuntimeConstants.SHUTDOWN_PASS_ARG + IJBossRuntimeConstants.SPACE + pass;
+ return stop;
+ }
+
+ public static IServer findServer(ILaunchConfiguration config) throws CoreException {
+ String serverId = config.getAttribute("server-id", (String)null);
+ JBossServer jbs = AbstractJBossLaunchConfigType.findJBossServer(serverId);
+ return jbs.getServer();
+ }
+
+ public static String getDefaultLaunchCommand(ILaunchConfiguration config) throws CoreException {
+ IServer server = findServer(config);
+ String rseHome = server.getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, "");
+ // initialize startup command to something reasonable
+ String currentArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
+ String currentVMArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); //$NON-NLS-1$
+
+ currentVMArgs= ArgsUtil.setArg(currentVMArgs, null,
+ IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.ENDORSED_DIRS,
+ new Path(rseHome).append(
+ IJBossRuntimeResourceConstants.LIB).append(
+ IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true);
+
+ String libPath = new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN)
+ .append(IJBossRuntimeResourceConstants.NATIVE).toOSString();
+ currentVMArgs= ArgsUtil.setArg(currentVMArgs, null,
+ IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JAVA_LIB_PATH,
+ libPath, true);
+
+
+ String cmd = "java " + currentVMArgs + "-classpath " +
+ new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN).append(
+ IJBossRuntimeResourceConstants.START_JAR).toString() + IJBossRuntimeConstants.SPACE +
+ IJBossRuntimeConstants.START_MAIN_TYPE + IJBossRuntimeConstants.SPACE + currentArgs + "&";
+ return cmd;
+ }
+
protected static IShellService findShellService(JBossServerBehavior behaviour) throws CoreException {
String connectionName = RSEUtils.getRSEConnectionName(behaviour.getServer());
IHost host = RSEUtils.findHost(connectionName);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java 2010-09-22 10:37:35 UTC (rev 25081)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSELaunchTabProvider.java 2010-09-22 10:54:39 UTC (rev 25082)
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.rse.ui;
import org.eclipse.core.runtime.CoreException;
@@ -7,14 +18,14 @@
import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
import org.eclipse.debug.ui.ILaunchConfigurationTab;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.jboss.ide.eclipse.as.rse.core.RSELaunchDelegate;
import org.jboss.ide.eclipse.as.ui.UIUtil;
@@ -31,49 +42,99 @@
public static class RSERemoteLaunchTab extends AbstractLaunchConfigurationTab {
- private Text startText;
- private Text stopText;
+ private Text startText,stopText;
+ private Button autoStartArgs, autoStopArgs;
+ private ILaunchConfiguration initialConfig;
+
public void createControl(Composite parent) {
createUI(parent);
addListeners();
}
public void createUI(Composite parent) {
- Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_HORIZONTAL);
+ Composite comp = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_HORIZONTAL| GridData.FILL_VERTICAL);
setControl(comp);
comp.setLayout(new FormLayout());
Group startGroup = new Group(comp, SWT.NONE);
startGroup.setText("Start Command");
- FormData data = UIUtil.createFormData2(0, 5, 0, 75, 0, 5, 100, -5);
+ FormData data = UIUtil.createFormData2(0, 5, 0, 150, 0, 5, 100, -5);
startGroup.setLayoutData(data);
startGroup.setLayout(new FormLayout());
+
+ autoStartArgs = new Button(startGroup, SWT.CHECK);
+ autoStartArgs.setText("Automatically calculate");
+ data = UIUtil.createFormData2(null, 0, 100, -5, 0, 5, 100, -5);
+ autoStartArgs.setLayoutData(data);
+
startText = new Text(startGroup, SWT.BORDER | SWT.MULTI | SWT.WRAP);
- data = UIUtil.createFormData2(0, 5, 100, -5, 0, 5, 100, -5);
+ data = UIUtil.createFormData2(0, 5, autoStartArgs, -5, 0, 5, 100, -5);
startText.setLayoutData(data);
-
+
+ // start stop group
Group stopGroup = new Group(comp, SWT.NONE);
stopGroup.setText("Stop Command");
- data = UIUtil.createFormData2(startGroup, 5, startGroup, 150, 0, 5, 100, -5);
+ data = UIUtil.createFormData2(startGroup, 5, startGroup, 300, 0, 5, 100, -5);
stopGroup.setLayoutData(data);
stopGroup.setLayout(new FormLayout());
+
+ autoStopArgs = new Button(stopGroup, SWT.CHECK);
+ autoStopArgs.setText("Automatically calculate");
+ data = UIUtil.createFormData2(null, 0, 100, -5, 0, 5, 100, -5);
+ autoStopArgs.setLayoutData(data);
+
+
stopText = new Text(stopGroup, SWT.BORDER | SWT.MULTI | SWT.WRAP);
- data = UIUtil.createFormData2(0, 5, 100, -5, 0, 5, 100, -5);
+ data = UIUtil.createFormData2(0, 5, autoStopArgs, -5, 0, 5, 100, -5);
stopText.setLayoutData(data);
}
protected void addListeners() {
+ autoStartArgs.addSelectionListener(new SelectionListener(){
+ public void widgetSelected(SelectionEvent e) {
+ startText.setEditable(!autoStartArgs.getSelection());
+ startText.setEnabled(!autoStartArgs.getSelection());
+ if( autoStartArgs.getSelection()) {
+ String command = null;
+ try {
+ command = RSELaunchDelegate.getDefaultLaunchCommand(initialConfig);
+ startText.setText(command);
+ } catch(CoreException ce) {
+ // TODO
+ }
+ }
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }});
+ autoStopArgs.addSelectionListener(new SelectionListener(){
+ public void widgetSelected(SelectionEvent e) {
+ stopText.setEditable(!autoStopArgs.getSelection());
+ stopText.setEnabled(!autoStopArgs.getSelection());
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }});
}
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
}
public void initializeFrom(ILaunchConfiguration configuration) {
+ this.initialConfig = configuration;
+
try {
String startCommand = configuration.getAttribute(RSELaunchDelegate.RSE_STARTUP_COMMAND, "");
startText.setText(startCommand);
+ boolean detectStartCommand = configuration.getAttribute(RSELaunchDelegate.DETECT_STARTUP_COMMAND, true);
+ autoStartArgs.setSelection(detectStartCommand);
+ startText.setEditable(!detectStartCommand);
+ startText.setEnabled(!detectStartCommand);
String stopCommand = configuration.getAttribute(RSELaunchDelegate.RSE_SHUTDOWN_COMMAND, "");
stopText.setText(stopCommand);
+ boolean detectStopCommand = configuration.getAttribute(RSELaunchDelegate.DETECT_SHUTDOWN_COMMAND, true);
+ autoStopArgs.setSelection(detectStopCommand);
+ stopText.setEditable(!detectStopCommand);
+ stopText.setEnabled(!detectStopCommand);
+
} catch( CoreException ce) {
// TODO
}
@@ -81,6 +142,8 @@
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
configuration.setAttribute(RSELaunchDelegate.RSE_STARTUP_COMMAND, startText.getText());
configuration.setAttribute(RSELaunchDelegate.RSE_SHUTDOWN_COMMAND, stopText.getText());
+ configuration.setAttribute(RSELaunchDelegate.DETECT_STARTUP_COMMAND, autoStartArgs.getSelection());
+ configuration.setAttribute(RSELaunchDelegate.DETECT_SHUTDOWN_COMMAND, autoStopArgs.getSelection());
}
public String getName() {
return "RSE Remote Launch";
15 years, 7 months
JBoss Tools SVN: r25081 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-09-22 06:37:35 -0400 (Wed, 22 Sep 2010)
New Revision: 25081
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
Log:
JBIDE-7061 : Code completion for EL inserts unnecessary #{}
Issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2010-09-22 08:42:53 UTC (rev 25080)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/FaceletsELCompletionProposalComputer.java 2010-09-22 10:37:35 UTC (rev 25081)
@@ -26,6 +26,7 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
+import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants;
import org.jboss.tools.common.el.core.ca.ELTextProposal;
import org.jboss.tools.common.el.core.resolver.ELContext;
import org.jboss.tools.common.text.TextProposal;
@@ -151,11 +152,11 @@
// Need to check if an EL Expression is opened here.
// If it is true we don't need to start any new tag proposals
TextRegion prefix = getELPrefix(contentAssistRequest);
- if (prefix != null && !prefix.isELStarted()) {
- return;
+ if (prefix != null && prefix.isELStarted()) {
+ addTextELProposals(contentAssistRequest, context);
+ } else {
+ addELPredicateProposals(contentAssistRequest, /*TextProposal.R_TAG_INSERTION*/ XMLRelevanceConstants.R_STRICTLY_VALID_TAG_INSERTION, true);
}
-
- addELPredicateProposals(contentAssistRequest, TextProposal.R_TAG_INSERTION, true);
}
@Override
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2010-09-22 08:42:53 UTC (rev 25080)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2010-09-22 10:37:35 UTC (rev 25081)
@@ -119,10 +119,10 @@
// If it is true we don't need to start any new tag proposals
TextRegion prefix = getELPrefix(contentAssistRequest);
if (prefix != null && prefix.isELStarted()) {
- return;
+ addTextELProposals(contentAssistRequest, context);
+ } else {
+ addELPredicateProposals(contentAssistRequest, TextProposal.R_TAG_INSERTION, true);
}
-
- addELPredicateProposals(contentAssistRequest, TextProposal.R_TAG_INSERTION, true);
}
@Override
@@ -839,8 +839,18 @@
if (matchString == null)
return null;
+ ELParser p = ELParserUtil.getJbossFactory().createParser();
+ ELModel model = p.parse(text);
+
+ ELInstance is = ELUtil.findInstance(model, inValueOffset);// ELInstance
+ ELInvocationExpression ie = ELUtil.findExpression(model, inValueOffset);// ELExpression
+
+ boolean isELStarted = (model != null && is != null && (model.toString().startsWith("#{") || //$NON-NLS-1$
+ model.toString().startsWith("${"))); //$NON-NLS-1$
+ boolean isELClosed = (model != null && is != null && model.toString().endsWith("}")); //$NON-NLS-1$
+
TextRegion tr = new TextRegion(startOffset, getOffset() - matchString.length() - startOffset,
- matchString.length(), matchString, false, false,
+ matchString.length(), matchString, isELStarted, isELClosed,
isAttributeValue, hasOpenQuote, hasCloseQuote, quoteChar);
return tr;
15 years, 7 months
JBoss Tools SVN: r25080 - 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: 2010-09-22 04:42:53 -0400 (Wed, 22 Sep 2010)
New Revision: 25080
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
Log:
JBIDE-7119 - sets lib path properly to bin/native
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2010-09-22 08:26:09 UTC (rev 25079)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2010-09-22 08:42:53 UTC (rev 25080)
@@ -208,6 +208,12 @@
IJBossRuntimeResourceConstants.LIB).append(
IJBossRuntimeResourceConstants.ENDORSED).toOSString(), true);
+ String libPath = new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN)
+ .append(IJBossRuntimeResourceConstants.NATIVE).toOSString();
+ currentVMArgs= ArgsUtil.setArg(currentVMArgs, null,
+ IJBossRuntimeConstants.SYSPROP + IJBossRuntimeConstants.JAVA_LIB_PATH,
+ libPath, true);
+
String cmd = "java " + currentVMArgs + "-classpath " +
new Path(rseHome).append(IJBossRuntimeResourceConstants.BIN).append(
15 years, 7 months
JBoss Tools SVN: r25079 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-09-22 04:26:09 -0400 (Wed, 22 Sep 2010)
New Revision: 25079
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
Log:
rename "Server Polling" section to "Server State Detectors"
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 2010-09-22 08:14:56 UTC (rev 25078)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2010-09-22 08:26:09 UTC (rev 25079)
@@ -68,7 +68,7 @@
FullPublishModuleText=Full Publish
IncrementalPublishModuleText=Incremental Publish
DeleteModuleDescription=Remove this module from the server.
-PollerSection_ServerPollingSection=Server Polling
+PollerSection_ServerPollingSection=Server State Detectors
PublishModuleDescription=Force a republish action on this module.
DeleteModuleConfirm=Are you sure you want to remove the module from the server?
15 years, 7 months
JBoss Tools SVN: r25078 - 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: rob.stryker(a)jboss.com
Date: 2010-09-22 04:14:56 -0400 (Wed, 22 Sep 2010)
New Revision: 25078
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
Log:
JBIDE-7040 - setting web port poller as the better default
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2010-09-22 08:03:29 UTC (rev 25077)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2010-09-22 08:14:56 UTC (rev 25078)
@@ -17,6 +17,7 @@
public class WebPortPoller implements IServerStatePoller {
+ public static final String WEB_POLLER_ID = "org.jboss.ide.eclipse.as.core.runtime.server.WebPoller"; //$NON-NLS-1$
private IServer server;
private ServerStatePollerType type;
private boolean canceled, done;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2010-09-22 08:03:29 UTC (rev 25077)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2010-09-22 08:14:56 UTC (rev 25078)
@@ -12,6 +12,8 @@
import org.eclipse.core.runtime.IPath;
import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.extensions.polling.ProcessTerminatedPoller;
+import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
public interface IJBossToolingConstants {
/* Server runtime types */
@@ -67,8 +69,8 @@
public static final String DEFAULT_PROPS_EAP_50 = "jboss.eap.50.default.ports.properties"; //$NON-NLS-1$
// Poller constants
- public static final String DEFAULT_STARTUP_POLLER = "org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller"; //$NON-NLS-1$
- public static final String DEFAULT_SHUTDOWN_POLLER = "org.jboss.ide.eclipse.as.core.runtime.server.processTerminatedPoller"; //$NON-NLS-1$
+ public static final String DEFAULT_STARTUP_POLLER = WebPortPoller.WEB_POLLER_ID;
+ public static final String DEFAULT_SHUTDOWN_POLLER = ProcessTerminatedPoller.POLLER_ID;
/*
* Property keys stored in the server object
15 years, 7 months
JBoss Tools SVN: r25077 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-09-22 04:03:29 -0400 (Wed, 22 Sep 2010)
New Revision: 25077
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
Log:
JBIDE-7108
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 2010-09-22 04:17:14 UTC (rev 25076)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2010-09-22 08:03:29 UTC (rev 25077)
@@ -34,8 +34,8 @@
swf_Explanation=A JBoss Server manages starting and stopping instances of JBoss. \nIt manages command line arguments and keeps track of which modules have been deployed.
swf_Explanation2=If the runtime information below is incorrect, please press back, Installed Runtimes..., \nand then Add to create a new runtime from a different location.
swf_ConfigurationLocation=Configuration Location
-swf_AuthorizationDescription=Set the login and password for your server.\nThis will ensure it starts and stops properly.
-swf_AuthenticationGroup=Login Credentials
+swf_AuthorizationDescription=Set the JMX login and password for your server.\nThis is used by all JMX commands, and during server shutdown.
+swf_AuthenticationGroup=JMX Login Credentials
swf_Username=User Name
swf_Password=Password
swf_BaseName=JBoss _VERSION_ Server
15 years, 7 months
JBoss Tools SVN: r25076 - trunk/as/docs/reference/en-US/images/runtimes_servers.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-09-22 00:17:14 -0400 (Wed, 22 Sep 2010)
New Revision: 25076
Modified:
trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-export_runtime_1.png
trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-import_runtime_1.png
Log:
updated images for pdf
Modified: trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-export_runtime_1.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-import_runtime_1.png
===================================================================
(Binary files differ)
15 years, 7 months
JBoss Tools SVN: r25075 - trunk/as/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-09-22 00:07:03 -0400 (Wed, 22 Sep 2010)
New Revision: 25075
Modified:
trunk/as/docs/reference/en-US/runtimes_servers.xml
Log:
updated with export and import runtimes
Modified: trunk/as/docs/reference/en-US/runtimes_servers.xml
===================================================================
--- trunk/as/docs/reference/en-US/runtimes_servers.xml 2010-09-22 03:59:47 UTC (rev 25074)
+++ trunk/as/docs/reference/en-US/runtimes_servers.xml 2010-09-22 04:07:03 UTC (rev 25075)
@@ -65,6 +65,31 @@
</imageobject>
</mediaobject>
</figure>
+ <para>
+ The <guibutton>Export</guibutton> button opens the <guilabel>Export Preferences</guilabel> dialog. The <guilabel>Export all</guilabel> box will automatically be selected, however you can choose to only export specific preference settings (such as only those related to your JBoss runtime) by selecting individual entries from the displayed list.
+ </para>
+ <figure>
+ <title>JBoss Runtime search results</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/runtimes_servers/runtimes_servers-export_runtime_1.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>
+ To export the preference settings you must specify a preference file that the information will be written to. This file, once exported, can be used to reapply your settings by clicking on the <guilabel>Import</guilabel> button.
+ </para>
+ <para>
+ The <guibutton>Import</guibutton> button opens the <guilabel>Import Preferences</guilabel> dialog. The <guilabel>Import all</guilabel> box will automatically be selected, however you can choose to only import specific preference settings (such as only those related to your JBoss runtime) by selecting individual entries from the list that displays after using the <guibutton>Browse</guibutton> button to select your exported preference file (for example: preference_file.epf).
+ </para>
+ <figure>
+ <title>JBoss Runtime search results</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/runtimes_servers/runtimes_servers-import_runtime_1.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
</section>
<section id="InstNewRuntime">
15 years, 7 months
JBoss Tools SVN: r25074 - trunk/as/docs/reference/en-US/images/runtimes_servers.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-09-21 23:59:47 -0400 (Tue, 21 Sep 2010)
New Revision: 25074
Modified:
trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-import_runtime_1.png
Log:
updated image
Modified: trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-import_runtime_1.png
===================================================================
(Binary files differ)
15 years, 7 months
JBoss Tools SVN: r25073 - trunk/as/docs/reference/en-US/images/runtimes_servers.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-09-21 19:30:20 -0400 (Tue, 21 Sep 2010)
New Revision: 25073
Added:
trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-export_runtime_1.png
trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-import_runtime_1.png
Log:
adding new images for next sub-sections
Added: trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-export_runtime_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-export_runtime_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-import_runtime_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/as/docs/reference/en-US/images/runtimes_servers/runtimes_servers-import_runtime_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 7 months