JBoss Tools SVN: r32396 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal/v7 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-28 06:59:30 -0400 (Tue, 28 Jun 2011)
New Revision: 32396
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java
Log:
[JBIDE-9267] removed CoreServerAS7Messages.java, moved messsages to Messages.java
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-06-28 10:49:28 UTC (rev 32395)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-06-28 10:59:30 UTC (rev 32396)
@@ -87,6 +87,9 @@
public static String CannotSaveServersStartArgs;
public static String ExtensionManager_could_not_load_publishers;
public static String PublishRenameFailure;
+
+ public static String JBoss7ServerState_noEnumForString;
+
static {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-06-28 10:49:28 UTC (rev 32395)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-06-28 10:59:30 UTC (rev 32396)
@@ -66,3 +66,5 @@
JMXScannerCanceled=JBossTools was unable to contact the JBoss deployment scanner in a reasonable amount of time. This step has been skipped.
ConnectingToServerViaJMX=Connecting to {0} via JMX
ExtensionManager_could_not_load_publishers=Could not load publishers
+
+JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}"
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java 2011-06-28 10:49:28 UTC (rev 32395)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.java 2011-06-28 10:59:30 UTC (rev 32396)
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * 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.core.server.internal.v7;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CoreServerAS7Messages extends NLS {
- public static String JBoss7ServerState_noEnumForString;
-
- static {
- NLS.initializeMessages("org.jboss.ide.eclipse.as.core.server.internal.v7.CoreServerAS7Messages", //$NON-NLS-1$
- CoreServerAS7Messages.class);
- }
-
-}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties 2011-06-28 10:49:28 UTC (rev 32395)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/CoreServerAS7Messages.properties 2011-06-28 10:59:30 UTC (rev 32396)
@@ -1 +0,0 @@
-JBoss7ServerState_noEnumForString="No JBoss7ServerState enum for string {0}"
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java 2011-06-28 10:49:28 UTC (rev 32395)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerState.java 2011-06-28 10:59:30 UTC (rev 32396)
@@ -12,6 +12,8 @@
import java.text.MessageFormat;
+import org.jboss.ide.eclipse.as.core.Messages;
+
/**
* @author André Dietisheim
*/
@@ -30,7 +32,7 @@
}
if (matchingState == null) {
throw new IllegalArgumentException(MessageFormat.format(
- CoreServerAS7Messages.JBoss7ServerState_noEnumForString,
+ Messages.JBoss7ServerState_noEnumForString,
stateString));
}
14 years, 9 months
JBoss Tools SVN: r32395 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-28 06:49:28 -0400 (Tue, 28 Jun 2011)
New Revision: 32395
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigBuilder.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
Log:
[JBIDE-9215] removed unneeded class and static constant
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigBuilder.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigBuilder.java 2011-06-28 10:26:05 UTC (rev 32394)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigBuilder.java 2011-06-28 10:49:28 UTC (rev 32395)
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.core.server.internal.v7;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.wst.server.core.IRuntime;
-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.launch.AbstractJBossLaunchConfigType;
-import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
-import org.jboss.ide.eclipse.as.core.util.JBoss7RuntimeClasspathUtil;
-
-public class JBoss7RuntimeLaunchConfigBuilder {
-
- private ILaunchConfigurationWorkingCopy launchConfig;
- private IJBossServerRuntime jbossRuntime;
-
- public JBoss7RuntimeLaunchConfigBuilder(ILaunchConfigurationWorkingCopy launchConfig, IJBossServerRuntime runtime) {
- this.launchConfig = launchConfig;
- this.jbossRuntime = runtime;
- }
-
- public JBoss7RuntimeLaunchConfigBuilder setVmContainer() {
- IVMInstall vmInstall = jbossRuntime.getVM();
- if (vmInstall != null) {
- setVmContainer(JavaRuntime.newJREContainerPath(vmInstall).toPortableString());
- }
- return this;
- }
-
- public JBoss7RuntimeLaunchConfigBuilder setVmContainer(String vmPath) {
- launchConfig.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, vmPath);
- return this;
- }
-
- public JBoss7RuntimeLaunchConfigBuilder setDefaultArguments() {
- launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
- jbossRuntime.getDefaultRunArgs());
- launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,
- jbossRuntime.getDefaultRunVMArgs());
- return this;
- }
-
- public JBoss7RuntimeLaunchConfigBuilder setClassPath(IServer server) throws CoreException {
- return setClassPath(JBoss7RuntimeClasspathUtil.getClasspath(server, jbossRuntime.getVM()));
- }
-
- public JBoss7RuntimeLaunchConfigBuilder setClassPath(List<String> entries) throws CoreException {
- launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH_PROVIDER,
- JBoss7ServerBehavior.DEFAULT_CP_PROVIDER_ID);
- launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, entries);
- launchConfig.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false);
- return this;
- }
-
- public JBoss7RuntimeLaunchConfigBuilder setMainType(String mainType) {
- launchConfig.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, mainType);
- return this;
- }
-
- public JBoss7RuntimeLaunchConfigBuilder setWorkingDirectory(IRuntime runtime) {
- setWorkingDirectory(runtime.getLocation().append(IJBossRuntimeResourceConstants.BIN).toString());
- return this;
- }
-
- public JBoss7RuntimeLaunchConfigBuilder setWorkingDirectory(String directory) {
- launchConfig.setAttribute(
- IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, directory);
- return this;
- }
-
- public void setServerId(IServer server) {
- launchConfig.setAttribute(AbstractJBossLaunchConfigType.SERVER_ID, server.getId());
- }
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-28 10:26:05 UTC (rev 32394)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-28 10:49:28 UTC (rev 32395)
@@ -49,8 +49,6 @@
private IDebugEventSetListener serverProcessListener;
private PollThread pollThread;
- public static final String DEFAULT_CP_PROVIDER_ID = "org.jboss.ide.eclipse.as.core.server.internal.launch.serverClasspathProvider"; //$NON-NLS-1$
-
private static HashMap<String, Class> delegateClassMap;
static {
delegateClassMap = new HashMap<String, Class>();
14 years, 9 months
JBoss Tools SVN: r32394 - branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-06-28 06:26:05 -0400 (Tue, 28 Jun 2011)
New Revision: 32394
Modified:
branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java
Log:
https://issues.jboss.org/browse/JBIDE-9095 , NPE fixed in 3.2.x branch.
Modified: branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java
===================================================================
--- branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2011-06-28 10:04:04 UTC (rev 32393)
+++ branches/jbosstools-3.2.x/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2011-06-28 10:26:05 UTC (rev 32394)
@@ -114,7 +114,7 @@
if (editor.getEditorInput() instanceof IFileEditorInput) {
IProject project = ((IFileEditorInput)editor.getEditorInput()).getFile().getProject();
IResource[] src = EclipseUtil.getJavaSourceRoots(project);
- if (src.length > 0) {
+ if ((src != null) && (src.length > 0)) {
containerFullPath = src[0].getFullPath();
}
} else if (editor.getEditorInput() instanceof IStorageEditorInput) {
14 years, 9 months
JBoss Tools SVN: r32393 - in branches/jbosstools-3.2.x/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: 2011-06-28 06:04:04 -0400 (Tue, 28 Jun 2011)
New Revision: 32393
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java
Log:
JBIDE-9062 - wrong suffix for static web
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-06-28 10:03:57 UTC (rev 32392)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-06-28 10:04:04 UTC (rev 32393)
@@ -248,7 +248,7 @@
String suffix = null;
if( IJBossServerConstants.FACET_EAR.equals(type))
suffix = IJBossServerConstants.EXT_EAR;
- else if( IJBossServerConstants.FACET_WEB.equals(type))
+ else if( IJBossServerConstants.FACET_WEB.equals(type) || IJBossServerConstants.FACET_STATIC_WEB.equals(type))
suffix = IJBossServerConstants.EXT_WAR;
else if( IJBossServerConstants.FACET_CONNECTOR.equals(type))
suffix = IJBossServerConstants.EXT_RAR;
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java 2011-06-28 10:03:57 UTC (rev 32392)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java 2011-06-28 10:04:04 UTC (rev 32393)
@@ -15,6 +15,7 @@
@Deprecated // DO NOT USE THIS
public static final String FACET_JST_JAVA = "jst.java"; //$NON-NLS-1$
public static final String FACET_WEB = "jst.web";//$NON-NLS-1$
+ public static final String FACET_STATIC_WEB = "wst.web";//$NON-NLS-1$
public static final String FACET_EJB = "jst.ejb";//$NON-NLS-1$
public static final String FACET_EAR = "jst.ear";//$NON-NLS-1$
public static final String FACET_UTILITY = "jst.utility";//$NON-NLS-1$
14 years, 9 months
JBoss Tools SVN: r32392 - 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: 2011-06-28 06:03:57 -0400 (Tue, 28 Jun 2011)
New Revision: 32392
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java
Log:
JBIDE-9062 - incorrect suffix for static web projects
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-06-28 09:51:26 UTC (rev 32391)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-06-28 10:03:57 UTC (rev 32392)
@@ -247,7 +247,7 @@
String suffix = null;
if( IWTPConstants.FACET_EAR.equals(type))
suffix = IWTPConstants.EXT_EAR;
- else if( IWTPConstants.FACET_WEB.equals(type))
+ else if( IWTPConstants.FACET_WEB.equals(type) || IWTPConstants.FACET_STATIC_WEB.equals(type))
suffix = IWTPConstants.EXT_WAR;
else if( IWTPConstants.FACET_CONNECTOR.equals(type))
suffix = IWTPConstants.EXT_RAR;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java 2011-06-28 09:51:26 UTC (rev 32391)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IWTPConstants.java 2011-06-28 10:03:57 UTC (rev 32392)
@@ -15,6 +15,7 @@
@Deprecated // DO NOT USE THIS
public static final String FACET_JST_JAVA = "jst.java"; //$NON-NLS-1$
public static final String FACET_WEB = "jst.web";//$NON-NLS-1$
+ public static final String FACET_STATIC_WEB = "wst.web";//$NON-NLS-1$
public static final String FACET_EJB = "jst.ejb";//$NON-NLS-1$
public static final String FACET_EAR = "jst.ear";//$NON-NLS-1$
public static final String FACET_UTILITY = "jst.utility";//$NON-NLS-1$
14 years, 9 months
JBoss Tools SVN: r32391 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-06-28 05:51:26 -0400 (Tue, 28 Jun 2011)
New Revision: 32391
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java
Log:
https://issues.jboss.org/browse/JBIDE-9095 , NPE fixed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2011-06-28 08:19:09 UTC (rev 32390)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2011-06-28 09:51:26 UTC (rev 32391)
@@ -343,7 +343,7 @@
IProject project = ExternalizeStringsUtils.getProject(editor);
if (project != null) {
IResource[] src = EclipseUtil.getJavaSourceRoots(project);
- if (src.length > 0) {
+ if ((src != null) && (src.length > 0)) {
containerFullPath = src[0].getFullPath();
}
} else if (editor.getEditorInput() instanceof IStorageEditorInput) {
14 years, 9 months
JBoss Tools SVN: r32390 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-06-28 04:19:09 -0400 (Tue, 28 Jun 2011)
New Revision: 32390
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
Log:
Fix expected text for displayed JSF page
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-06-28 07:54:14 UTC (rev 32389)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/AddRemoveJSFCapabilitiesTest.java 2011-06-28 08:19:09 UTC (rev 32390)
@@ -96,7 +96,7 @@
SWTJBTExt.stopApplicationServer(bot, 0);
SWTJBTExt.deleteApplicationServer(bot, 0);
assertTrue("Displayed HTML page has wrong content",
- (browserText!= null) && (browserText.indexOf("<TITLE>Input User Name Page</TITLE>") > - 1));
+ (browserText!= null) && (browserText.toLowerCase().indexOf("<title>input user name page</title>") > - 1));
setException(null);
}
else{
14 years, 9 months
JBoss Tools SVN: r32389 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-28 03:54:14 -0400 (Tue, 28 Jun 2011)
New Revision: 32389
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java
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.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
Log:
[JBIDE-9263] removed duplicated code that gets the "ignore launch command" setting from preferences
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartLaunchDelegate.java 2011-06-28 07:38:09 UTC (rev 32388)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartLaunchDelegate.java 2011-06-28 07:54:14 UTC (rev 32389)
@@ -34,6 +34,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration.StartLaunchDelegate;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
+import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
/**
@@ -62,10 +63,7 @@
JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
if (!jbsBehavior.canStart(mode).isOK())
throw new CoreException(jbsBehavior.canStart(mode));
- String ignore = jbsBehavior.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS,
- (String) null);
- Boolean ignoreB = ignore == null ? new Boolean(false) : new Boolean(ignore);
- if (ignoreB.booleanValue()) {
+ if (LaunchCommandPreferences.ignoreLaunchCommand(jbsBehavior.getServer())) {
jbsBehavior.setServerStarting();
jbsBehavior.setServerStarted();
return false;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-28 07:38:09 UTC (rev 32388)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-28 07:54:14 UTC (rev 32389)
@@ -37,6 +37,7 @@
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
+import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
/**
@@ -107,10 +108,7 @@
JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
if (!jbsBehavior.canStart(mode).isOK())
throw new CoreException(jbsBehavior.canStart(mode));
- String ignore = jbsBehavior.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS,
- (String) null);
- Boolean ignoreB = ignore == null ? new Boolean(false) : new Boolean(ignore);
- if (ignoreB.booleanValue()) {
+ if (LaunchCommandPreferences.ignoreLaunchCommand(jbsBehavior.getServer())) {
jbsBehavior.setServerStarting();
jbsBehavior.setServerStarted();
return false;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-28 07:38:09 UTC (rev 32388)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-28 07:54:14 UTC (rev 32389)
@@ -37,6 +37,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class JBoss7ServerBehavior extends JBossServerBehavior {
@@ -145,9 +146,7 @@
}
public void stop(boolean force) {
- String tmp = getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
- Boolean b = tmp == null ? new Boolean(false) : new Boolean(tmp);
- if( b.booleanValue()) {
+ if( LaunchCommandPreferences.ignoreLaunchCommand(getServer())) {
super.setServerStopped();
return;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-06-28 07:38:09 UTC (rev 32388)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-06-28 07:54:14 UTC (rev 32389)
@@ -22,6 +22,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
+import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
/**
* @author Rob Stryker
@@ -36,9 +37,7 @@
public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
throws CoreException {
JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
- String tmp = jbsBehavior.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
- Boolean b = tmp == null ? new Boolean(false) : new Boolean(tmp);
- if( b.booleanValue()) {
+ if( LaunchCommandPreferences.ignoreLaunchCommand(jbsBehavior.getServer())) {
jbsBehavior.setServerStarting();
jbsBehavior.setServerStarted();
return false;
Added: 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 (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java 2011-06-28 07:54:14 UTC (rev 32389)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * 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.core.util;
+
+import org.eclipse.wst.server.core.IServerAttributes;
+
+public class LaunchCommandPreferences {
+
+ public static boolean ignoreLaunchCommand(IServerAttributes server) {
+ String ignoreCommand = server.getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String) null);
+ return Boolean.valueOf(ignoreCommand);
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchCommandPreferences.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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 2011-06-28 07:38:09 UTC (rev 32388)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-06-28 07:54:14 UTC (rev 32389)
@@ -46,6 +46,7 @@
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
+import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
@@ -62,9 +63,7 @@
ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
JBossServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
- String ignore = beh.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
- Boolean ignoreB = ignore == null ? new Boolean(false) : new Boolean(ignore);
- if( ignoreB.booleanValue()) {
+ if(LaunchCommandPreferences.ignoreLaunchCommand(beh.getServer())) {
beh.setServerStarting();
beh.setServerStarted();
return;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-06-28 07:38:09 UTC (rev 32388)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-06-28 07:54:14 UTC (rev 32389)
@@ -35,6 +35,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.ui.FormUtils;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -63,10 +64,7 @@
FormData fd = UIUtil.createFormData2(0, 5, null, 0, 0, 5, null, 0);
executeShellScripts.setLayoutData(fd);
top = executeShellScripts;
- String tmp = callback.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
- Boolean b = tmp == null ? new Boolean(false) : new Boolean(tmp);
- executeShellScripts.setSelection(b.booleanValue());
-
+ executeShellScripts.setSelection(LaunchCommandPreferences.ignoreLaunchCommand(callback.getServer()));
executeShellScripts.addSelectionListener(new SelectionListener(){
public void widgetSelected(SelectionEvent e) {
executeShellToggled();
14 years, 9 months
JBoss Tools SVN: r32388 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-28 03:38:09 -0400 (Tue, 28 Jun 2011)
New Revision: 32388
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
Log:
[JBIDE-9054] added generic jboss server conversion util method (there are tons of specific ones, need to clean them up at some point)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-28 07:27:04 UTC (rev 32387)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-28 07:38:09 UTC (rev 32388)
@@ -20,7 +20,6 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.debug.core.DebugEvent;
@@ -38,6 +37,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class JBoss7ServerBehavior extends JBossServerBehavior {
@@ -63,10 +63,6 @@
protected HashMap<String, Class> getDelegateMap() {
return delegateClassMap;
}
-
- private JBoss7Server getJBoss7Server() {
- return (JBoss7Server)getServer().loadAdapter(JBoss7Server.class, new NullProgressMonitor());
- }
public boolean shouldSuspendScanner() {
return false;
@@ -161,10 +157,13 @@
serverProcess.terminate();
} else {
serverStopping();
+ String host = getServer().getHost();
+ JBoss7Server server = ServerConverter.checkedLoadAdapter(getServer(), JBoss7Server.class);
+ int mgmtPort = server.getManagementPort();
// TODO: for now only local, implement for remote afterwards
- if (isServerRunning(getServer().getHost(), getJBoss7Server().getManagementPort())) {
+ if (isServerRunning(host, mgmtPort)) {
// The service and Poller will make sure the server is down
- getService().stop(getServer().getHost(), getJBoss7Server().getManagementPort());
+ getService().stop(host, mgmtPort);
return;
} else {
if( serverProcess != null && !serverProcess.isTerminated()) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-28 07:27:04 UTC (rev 32387)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-28 07:38:09 UTC (rev 32388)
@@ -46,6 +46,21 @@
return getJBossServer(s);
}
+ @SuppressWarnings("unchecked")
+ public static <SERVER> SERVER checkedLoadAdapter(IServer server, Class<SERVER> serverClass) throws CoreException {
+ if (server == null) {
+ return null;
+ }
+ SERVER adaptedServer = (SERVER) server.loadAdapter(serverClass, new NullProgressMonitor());
+ if (adaptedServer == null) {
+ throw new CoreException(
+ new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ NLS.bind(Messages.CannotSetUpImproperServer, server.getName())));
+
+ }
+ return adaptedServer;
+ }
+
public static JBossServer getJBossServer(IServer server) {
if (server == null) {
return null;
14 years, 9 months
JBoss Tools SVN: r32387 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-28 03:27:04 -0400 (Tue, 28 Jun 2011)
New Revision: 32387
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/UIUtil.java
Log:
[JBIDE-9247] added copyright headers where missing in the tests
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/UIUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/UIUtil.java 2011-06-28 07:24:53 UTC (rev 32386)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/UIUtil.java 2011-06-28 07:27:04 UTC (rev 32387)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * 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;
import org.eclipse.swt.layout.FormAttachment;
14 years, 9 months