JBoss Tools SVN: r32840 - 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-12 08:21:17 -0400 (Tue, 12 Jul 2011)
New Revision: 32840
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java
Log:
[JBIDE-9215] added #checkedGetServer
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java 2011-07-12 12:20:43 UTC (rev 32839)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java 2011-07-12 12:21:17 UTC (rev 32840)
@@ -157,4 +157,10 @@
String launchName = launchManager.generateLaunchConfigurationName(name);
return launchConfigType.newInstance(null, launchName);
}
+
+ public static IServer checkedGetServer(ILaunchConfiguration launchConfig) throws CoreException {
+ String serverId = JBossLaunchConfigProperties.getServerId(launchConfig);
+ JBossServer server = ServerConverter.checkedFindJBossServer(serverId);
+ return server.getServer();
+ }
}
14 years, 9 months
JBoss Tools SVN: r32839 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-07-12 08:20:43 -0400 (Tue, 12 Jul 2011)
New Revision: 32839
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java
Log:
[JBIDE-9215] added IJBoss7ManagerService#isRunning
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java 2011-07-12 09:01:26 UTC (rev 32838)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBoss7ManagerService.java 2011-07-12 12:20:43 UTC (rev 32839)
@@ -129,7 +129,18 @@
* @throws Exception
*/
public JBoss7ServerState getServerState(String host, int port) throws Exception;
-
+
+ /**
+ * Returns <code>true</code> if the server is running, <code>false</code>
+ * otherwise.
+ *
+ * @param host the server to to query
+ * @param port the port to communicate on
+ * @return true if it's running, false otherwise
+ * @throws Exception
+ */
+ public boolean isRunning(String host, int port) throws Exception;
+
@Deprecated
public JBoss7ServerState getServerState(String host) throws Exception;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-12 09:01:26 UTC (rev 32838)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-12 12:20:43 UTC (rev 32839)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal;
+import java.text.MessageFormat;
import java.util.HashMap;
import org.eclipse.core.runtime.CoreException;
@@ -21,6 +22,8 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IModule;
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.publishers.AbstractServerToolsPublisher;
import org.jboss.ide.eclipse.as.core.publishers.JSTPublisherXMLToucher;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
@@ -29,6 +32,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
@@ -84,6 +88,10 @@
}
public void stop(boolean force) {
+ if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
+ super.setServerStopped();
+ return;
+ }
getDelegate().stop(force);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-07-12 09:01:26 UTC (rev 32838)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/deployment/JBoss7ManagerService.java 2011-07-12 12:20:43 UTC (rev 32839)
@@ -62,6 +62,14 @@
return manager.getServerState();
}
+ public boolean isRunning(String host, int port) {
+ try {
+ return getServerState(host, port) == JBoss7ServerState.RUNNING;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
@Deprecated
public void stop(String host) throws Exception {
stop(host, AS7Manager.MGMT_PORT);
14 years, 9 months
JBoss Tools SVN: r32838 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-12 05:01:26 -0400 (Tue, 12 Jul 2011)
New Revision: 32838
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties
Log:
Fileset data not included (for ever??)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties 2011-07-12 08:40:54 UTC (rev 32837)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/build.properties 2011-07-12 09:01:26 UTC (rev 32838)
@@ -3,7 +3,8 @@
icons/,\
plugin.properties,\
about.html,\
- .
+ .,\
+ filesetdata/
jars.compile.order = .
source.. = src/
output.. = bin/
14 years, 9 months
JBoss Tools SVN: r32837 - 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-12 04:40:54 -0400 (Tue, 12 Jul 2011)
New Revision: 32837
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java
Log:
[JBIDE-9215] added null-check for server
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java 2011-07-12 08:30:01 UTC (rev 32836)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java 2011-07-12 08:40:54 UTC (rev 32837)
@@ -23,6 +23,9 @@
}
public static boolean isIgnoreLaunchCommand(IServerAttributes server, boolean defaultValue) {
+ if (server == null) {
+ return false;
+ }
String ignoreCommand = server.getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, Boolean.toString(defaultValue));
return Boolean.valueOf(ignoreCommand);
}
14 years, 9 months
JBoss Tools SVN: r32836 - 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-12 04:30:01 -0400 (Tue, 12 Jul 2011)
New Revision: 32836
Modified:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java
Log:
JBIDE-8969 : removed useless code, potentially causing NPEs
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-12 04:41:29 UTC (rev 32835)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/profiles/ProfileSelectionHandler.java 2011-07-12 08:30:01 UTC (rev 32836)
@@ -39,13 +39,13 @@
public Object execute(ExecutionEvent event) throws ExecutionException {
IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
final IMavenProjectFacade facade = getSelectedMavenProject(event);
- if (facade != null) {
+ if (facade != null ) {
final IProfileManager profileManager = MavenCoreActivator.getDefault().getProfileManager();
Map<Profile, Boolean> availableProfiles;
Map<Profile, Boolean> availableSettingsProfiles;
- facade.getMavenProject().getActiveProfiles();
+
try {
availableProfiles = profileManager.getAvailableProfiles(facade);
14 years, 9 months
JBoss Tools SVN: r32835 - 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-07-12 00:41:29 -0400 (Tue, 12 Jul 2011)
New Revision: 32835
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-9328 - missing VM args
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-07-11 23:16:00 UTC (rev 32834)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/LocalJBossStartLaunchConfigurator.java 2011-07-12 04:41:29 UTC (rev 32835)
@@ -105,7 +105,6 @@
@Override
protected String getDefaultVMArguments(IJBossServerRuntime runtime) {
- // not needed
- return null;
+ return runtime.getDefaultRunVMArgs();
}
}
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r32834 - trunk/ws/docs/reference.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-11 19:16:00 -0400 (Mon, 11 Jul 2011)
New Revision: 32834
Modified:
trunk/ws/docs/reference/
Log:
updated to remove ignore setting
Property changes on: trunk/ws/docs/reference
___________________________________________________________________
Modified: svn:ignore
- publican.cfg
+
14 years, 9 months
JBoss Tools SVN: r32833 - trunk/ws/docs/reference.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-11 19:02:04 -0400 (Mon, 11 Jul 2011)
New Revision: 32833
Modified:
trunk/ws/docs/reference/publican.cfg
Log:
remove testing
Modified: trunk/ws/docs/reference/publican.cfg
===================================================================
--- trunk/ws/docs/reference/publican.cfg 2011-07-11 23:00:59 UTC (rev 32832)
+++ trunk/ws/docs/reference/publican.cfg 2011-07-11 23:02:04 UTC (rev 32833)
@@ -4,5 +4,3 @@
xml_lang: en-US
type: Book
brand: JBoss
-
-#test
14 years, 9 months
JBoss Tools SVN: r32832 - trunk/ws/docs/reference.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-11 19:00:59 -0400 (Mon, 11 Jul 2011)
New Revision: 32832
Modified:
trunk/ws/docs/reference/publican.cfg
Log:
testing update
Modified: trunk/ws/docs/reference/publican.cfg
===================================================================
--- trunk/ws/docs/reference/publican.cfg 2011-07-11 22:54:14 UTC (rev 32831)
+++ trunk/ws/docs/reference/publican.cfg 2011-07-11 23:00:59 UTC (rev 32832)
@@ -4,3 +4,5 @@
xml_lang: en-US
type: Book
brand: JBoss
+
+#test
14 years, 9 months
JBoss Tools SVN: r32831 - trunk/ws/docs/reference.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-07-11 18:54:14 -0400 (Mon, 11 Jul 2011)
New Revision: 32831
Modified:
trunk/ws/docs/reference/publican.cfg
Log:
remove test
Modified: trunk/ws/docs/reference/publican.cfg
===================================================================
--- trunk/ws/docs/reference/publican.cfg 2011-07-11 22:53:17 UTC (rev 32830)
+++ trunk/ws/docs/reference/publican.cfg 2011-07-11 22:54:14 UTC (rev 32831)
@@ -4,5 +4,3 @@
xml_lang: en-US
type: Book
brand: JBoss
-
-test
14 years, 9 months