JBoss Tools SVN: r43958 - in trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test: smoke and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-24 07:48:50 -0400 (Mon, 24 Sep 2012)
New Revision: 43958
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/RunStrutsProjectOnServer.java
Log:
fixing struts bot test - cleaning the server to properly display html content
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java 2012-09-24 10:42:54 UTC (rev 43957)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java 2012-09-24 11:48:50 UTC (rev 43958)
@@ -23,36 +23,19 @@
/**
*
- * This is struts swtbot testcase for JBoss Tools.
- *
- * System properties:
- * -Dswtbot.test.properties.file=$PATH
- * -Dusage_reporting_enabled=$BOOLEAN
- *
- * Format of swtbot.properties file:
- * SERVER=EAP|JBOSS_AS,<server version>,<jre version to run with>|default,<server home>
- *
- * Sample swtbot.properties file:
- *
- * SERVER=JBOSS_AS,6.0,default,/home/lukas/latest/jboss-6.0.0.Final
- * JAVA=1.6,/space/java/sdk/jdk1.6.0_22
- *
- *
- * Suite duration: aprox. 10min
- *
* @author Vladimir Pakan
* @author Lukas Jungmann
- *
+ * @author Jaroslav Jankovic
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
- TutorialTest.class,
CreateNewStrutsProjectTest.class,
RunStrutsProjectOnServer.class,
AddRemoveStrutsCapabilities.class,
ImportStrutsProjectTest.class,
RenameStrutsConfigXmlFile.class,
- RenameTldFile.class
+ RenameTldFile.class,
+ TutorialTest.class,
})
public class StrutsAllBotTests {
public static final String STRUTS_PROJECT_NAME = "strutsTest";
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/RunStrutsProjectOnServer.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/RunStrutsProjectOnServer.java 2012-09-24 10:42:54 UTC (rev 43957)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/smoke/RunStrutsProjectOnServer.java 2012-09-24 11:48:50 UTC (rev 43958)
@@ -13,7 +13,11 @@
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.jboss.tools.ui.bot.ext.helper.WidgetFinderHelper;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
import org.junit.Test;
import org.jboss.tools.struts.ui.bot.test.StrutsAllBotTests;
@@ -24,6 +28,10 @@
* @author Lukas Jungmann
*
*/
+@Require(
+ clearProjects=false,
+ clearWorkspace=false,
+ server = @Server(state = ServerState.NotRunning), perspective = "Web Development")
public class RunStrutsProjectOnServer extends SWTTestExt {
private SWTJBTExt swtJbtExt = null;
@@ -42,16 +50,23 @@
configuredState.getServer().isRunning = true;
}
swtJbtExt.runProjectOnServer(StrutsAllBotTests.STRUTS_PROJECT_NAME);
+
+ ServersView serversView = new ServersView();
+ serversView.cleanServer(configuredState.getServer().name);
+ serversView.openInWebBrowser(configuredState.getServer().name,
+ StrutsAllBotTests.STRUTS_PROJECT_NAME);
+
// Check Browser Content
String browserText = WidgetFinderHelper.browserInEditorText(bot,
"KickStart: Input name", true);
+
+ // stop server, remove application from it and remove server as well
swtJbtExt.stopApplicationServer(0);
swtJbtExt.removeProjectFromServers(StrutsAllBotTests.STRUTS_PROJECT_NAME);
- SWTJBTExt.deleteApplicationServer(bot, 0);
- assertTrue("Displayed HTML page has wrong content. Application was not" +
- " deployed by struts tools - known issue JBIDE-11306",
+
+ assertTrue("Displayed HTML page has wrong content.",
(browserText != null)
- && (browserText.indexOf("<TITLE>KickStart: Input name</TITLE>") > -1));
+ && (browserText.indexOf("KickStart: Input name") > -1));
}
}
13 years, 6 months
JBoss Tools SVN: r43957 - branches/jbosstools-4.0.0.Alpha2/maven/plugins/org.jboss.tools.maven.project.examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-09-24 06:42:54 -0400 (Mon, 24 Sep 2012)
New Revision: 43957
Modified:
branches/jbosstools-4.0.0.Alpha2/maven/plugins/org.jboss.tools.maven.project.examples/build.properties
Log:
JBIDE-12472 add stacks-client to build.properties
Modified: branches/jbosstools-4.0.0.Alpha2/maven/plugins/org.jboss.tools.maven.project.examples/build.properties
===================================================================
--- branches/jbosstools-4.0.0.Alpha2/maven/plugins/org.jboss.tools.maven.project.examples/build.properties 2012-09-24 10:32:24 UTC (rev 43956)
+++ branches/jbosstools-4.0.0.Alpha2/maven/plugins/org.jboss.tools.maven.project.examples/build.properties 2012-09-24 10:42:54 UTC (rev 43957)
@@ -15,5 +15,6 @@
lib/httpclient-4.0.1.jar,\
lib/httpcore-4.0.1.jar,\
lib/jboss-logging-3.1.2.GA.jar,\
- lib/snakeyaml-1.10.jar
+ lib/snakeyaml-1.10.jar,\
+ lib/stacks-client-1.0.0.CR2.jar
src.includes = src/
13 years, 6 months
JBoss Tools SVN: r43956 - trunk/maven/plugins/org.jboss.tools.maven.project.examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-09-24 06:32:24 -0400 (Mon, 24 Sep 2012)
New Revision: 43956
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties
Log:
JBIDE-12472 add stacks-client to build.properties
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties 2012-09-24 09:56:10 UTC (rev 43955)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/build.properties 2012-09-24 10:32:24 UTC (rev 43956)
@@ -15,5 +15,6 @@
lib/httpclient-4.0.1.jar,\
lib/httpcore-4.0.1.jar,\
lib/jboss-logging-3.1.2.GA.jar,\
- lib/snakeyaml-1.10.jar
+ lib/snakeyaml-1.10.jar,\
+ lib/stacks-client-1.0.0.CR2.jar
src.includes = src/
13 years, 6 months
JBoss Tools SVN: r43955 - in trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test: explorer and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-24 05:56:10 -0400 (Mon, 24 Sep 2012)
New Revision: 43955
Added:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesSupportTest.java
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java
Log:
new archive swtbot test (JBQA-6991) implemented
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java 2012-09-24 09:38:55 UTC (rev 43954)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java 2012-09-24 09:56:10 UTC (rev 43955)
@@ -26,6 +26,7 @@
FolderTest.class,
FilesetTest.class,
UserLibrariesFilesetTest.class,
+ ArchivesSupportTest.class,
BuildingArchiveNode.class,
BuildingProjectTest.class,
BuildingArchiveTest.class,
Added: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesSupportTest.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesSupportTest.java (rev 0)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesSupportTest.java 2012-09-24 09:56:10 UTC (rev 43955)
@@ -0,0 +1,60 @@
+package org.jboss.tools.archives.ui.bot.test;
+
+import org.jboss.tools.archives.ui.bot.test.explorer.ProjectArchivesExplorer;
+import org.jboss.tools.ui.bot.ext.entity.JavaProjectEntity;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ * @author jjankovi
+ *
+ */
+public class ArchivesSupportTest extends ArchivesTestBase {
+
+ private static final String project = "prj";
+
+ @BeforeClass
+ public static void setup() {
+ JavaProjectEntity jpe = new JavaProjectEntity();
+ jpe.setProjectName(project);
+ eclipse.createJavaProject(jpe);
+ }
+
+ @Test
+ public void testAddArchiveSupport() {
+
+ addArchivesSupport(project);
+
+ assertTrue("Project archives support was not set on project '" + project + "'",
+ archiveExplorerExists(project));
+ }
+
+ @Test
+ public void testRemoveArchiveSupport() {
+
+ removeArchivesSupport(project);
+
+ assertFalse("Project archives support is still set on project '" + project + "'",
+ archiveExplorerExists(project));
+
+ }
+
+ @Test
+ public void testReAddingArchiveSupport() {
+
+ String project = "pr2";
+
+ /* prepare project with existing archive in it */
+ importProjectWithoutRuntime(project);
+ ProjectArchivesExplorer explorer = explorerForProject(project);
+ assertItemExistsInExplorer(explorer, project + ".jar" + " [/" + project + "]");
+
+ /* re-add archive support into project */
+ removeArchivesSupport(project);
+ addArchivesSupport(project);
+
+ assertItemExistsInExplorer(explorer, project + ".jar" + " [/" + project + "]");
+ }
+
+}
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java 2012-09-24 09:38:55 UTC (rev 43954)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesTestBase.java 2012-09-24 09:56:10 UTC (rev 43955)
@@ -10,14 +10,22 @@
******************************************************************************/
package org.jboss.tools.archives.ui.bot.test;
+import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.archives.ui.bot.test.explorer.ProjectArchivesExplorer;
import org.jboss.tools.archives.ui.bot.test.view.ProjectArchivesView;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.condition.ProgressInformationShellIsActiveCondition;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.helper.ImportHelper;
+import org.jboss.tools.ui.bot.ext.helper.TreeHelper;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.view.ErrorLogView;
import org.jboss.tools.ui.bot.ext.view.ServersView;
import org.junit.runner.RunWith;
@@ -148,6 +156,41 @@
ImportHelper.importProject(projectLocation, dir, Activator.PLUGIN_ID);
}
+ protected void addArchivesSupport(String projectName) {
+ addRemoveArchivesSupport(projectName, true);
+ }
+
+ protected void removeArchivesSupport(String projectName) {
+ addRemoveArchivesSupport(projectName, false);
+ }
+
+ protected boolean archiveExplorerExists(String projectName) {
+ SWTBot bot = projectExplorer.bot();
+ try {
+ TreeHelper.expandNode(bot, projectName, "Project Archives");
+ return true;
+ } catch (WidgetNotFoundException exc) {
+ return false;
+ }
+ }
+
+ private void addRemoveArchivesSupport(String projectName, boolean add) {
+ projectExplorer.selectProject(projectName);
+ SWTBotTree tree = projectExplorer.bot().tree();
+ SWTBotTreeItem item = tree.getTreeItem(projectName);
+ item.expand();
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree, item);
+ SWTBotMenu menu = new SWTBotMenu(
+ ContextMenuHelper.getContextMenu(
+ tree, IDELabel.Menu.PACKAGE_EXPLORER_CONFIGURE, false));
+ if (add) {
+ menu.menu(IDELabel.Menu.ADD_ARCHIVE_SUPPORT).click();
+ } else {
+ menu.menu(IDELabel.Menu.REMOVE_ARCHIVE_SUPPORT).click();
+ }
+ bot.waitWhile(new ProgressInformationShellIsActiveCondition(), TaskDuration.LONG.getTimeout());
+ }
+
private int countOfArchivesErrors() {
ErrorLogView errorLog = new ErrorLogView();
int archivesErrorsCount = 0;
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-09-24 09:38:55 UTC (rev 43954)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/explorer/ProjectArchivesExplorer.java 2012-09-24 09:56:10 UTC (rev 43955)
@@ -11,7 +11,6 @@
package org.jboss.tools.archives.ui.bot.test.explorer;
import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.archives.ui.bot.test.context.ArchiveContextMenu;
import org.jboss.tools.archives.ui.bot.test.dialog.ArchivePublishSettingsDialog;
@@ -103,7 +102,7 @@
ti = ti.getNode(pathItem);
}
return true;
- } catch (WidgetNotFoundException exc) {
+ } catch (Exception exc) {
return false;
}
}
13 years, 6 months
JBoss Tools SVN: r43954 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-24 05:38:55 -0400 (Mon, 24 Sep 2012)
New Revision: 43954
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java
Log:
JBIDE-12695
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2012-09-24 08:12:04 UTC (rev 43953)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractLocalJBossServerRuntime.java 2012-09-24 09:38:55 UTC (rev 43954)
@@ -77,9 +77,19 @@
if( getExecutionEnvironment() != null ) {
IVMInstall[] installs = getExecutionEnvironment().getCompatibleVMs();
+ // IF your execution env has a default vm:
if( getExecutionEnvironment().getDefaultVM() != null )
return getExecutionEnvironment().getDefaultVM();
- if( installs != null && installs.length > 0 && installs[0] != null )
+ // Check if the workspace default vm is in the list
+ IVMInstall workspaceDefault = JavaRuntime.getDefaultVMInstall();
+
+ if( installs != null && workspaceDefault != null ) {
+ for( int i = 0; i < installs.length; i++) {
+ if( workspaceDefault.equals(installs[i]))
+ return workspaceDefault;
+ }
+ }
+ if( installs != null && installs.length > 0 && installs[0] != null)
return installs[0];
}
// not found, return default vm
@@ -106,7 +116,8 @@
}
protected IVMInstall getDefaultVMInstall() {
- return getExecutionEnvironment().getDefaultVM();
+ IVMInstall i = getExecutionEnvironment().getDefaultVM();
+ return i == null ? JavaRuntime.getDefaultVMInstall() : i;
}
public IVMInstall[] getValidJREs(IRuntimeType type) {
13 years, 6 months
JBoss Tools SVN: r43953 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test: resources/projects/httpAnnot and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-24 04:12:04 -0400 (Mon, 24 Sep 2012)
New Revision: 43953
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.classpath
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.project
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/.jsdtscope
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.common.component
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.jboss.ide.eclipse.as.core.prefs
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/WebContent/
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/WebContent/META-INF/
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/WebContent/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/WebContent/WEB-INF/
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/WebContent/WEB-INF/lib/
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/build/
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/src/
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/src/test/
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/src/test/MyAnnot.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/HTTPMethodAnnotationQuickFixTest.java
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
Log:
JBQA-6997 implemented
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.classpath
===================================================================
(Binary files differ)
Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.classpath
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.project
===================================================================
(Binary files differ)
Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.project
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/.jsdtscope
===================================================================
(Binary files differ)
Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/.jsdtscope
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.common.component
===================================================================
(Binary files differ)
Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.common.component
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
(Binary files differ)
Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-09-24 08:12:04 UTC (rev 43953)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-09-24 08:12:04 UTC (rev 43953)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.jboss.ide.eclipse.as.core.prefs
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.jboss.ide.eclipse.as.core.prefs (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/.settings/org.jboss.ide.eclipse.as.core.prefs 2012-09-24 08:12:04 UTC (rev 43953)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.jboss.ide.eclipse.as.core.singledeployable.deployableList=
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/WebContent/META-INF/MANIFEST.MF 2012-09-24 08:12:04 UTC (rev 43953)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/src/test/MyAnnot.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/src/test/MyAnnot.java (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/projects/httpAnnot/src/test/MyAnnot.java 2012-09-24 08:12:04 UTC (rev 43953)
@@ -0,0 +1,8 @@
+package test;
+
+import javax.ws.rs.HttpMethod;
+
+@HttpMethod(value = "METHOD")
+public @interface MyAnnot {
+
+}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-09-24 06:16:26 UTC (rev 43952)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-09-24 08:12:04 UTC (rev 43953)
@@ -11,6 +11,7 @@
package org.jboss.tools.ws.ui.bot.test;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ws.ui.bot.test.annotation.HTTPMethodAnnotationQuickFixTest;
import org.jboss.tools.ws.ui.bot.test.integration.JAXRSToolingIntegrationTest;
import org.jboss.tools.ws.ui.bot.test.integration.SOAPWSToolingIntegrationTest;
import org.jboss.tools.ws.ui.bot.test.rest.DefaultValueAnnotationSupportTest;
@@ -59,6 +60,7 @@
// WSTesterPromptValuesSupportTest.class, // not implemented yet
ApplicationPathAnnotationTest.class,
JaxRsValidatorTest.class,
+ HTTPMethodAnnotationQuickFixTest.class,
BottomUpWSTest.class,
TopDownWSTest.class,
WsClientTest.class,
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/HTTPMethodAnnotationQuickFixTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/HTTPMethodAnnotationQuickFixTest.java (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/annotation/HTTPMethodAnnotationQuickFixTest.java 2012-09-24 08:12:04 UTC (rev 43953)
@@ -0,0 +1,85 @@
+package org.jboss.tools.ws.ui.bot.test.annotation;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.parts.QuickFixBot;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
+import org.jboss.tools.ui.bot.ext.view.ProblemsView;
+import org.jboss.tools.ws.ui.bot.test.WSTestBase;
+import org.junit.Test;
+
+/**
+ *
+ * @author jjankovi
+ *
+ */
+@Require(server = @Server(state = ServerState.NotRunning), perspective = "Java EE")
+public class HTTPMethodAnnotationQuickFixTest extends WSTestBase {
+
+ @Override
+ protected String getWsProjectName() {
+ return "httpAnnot";
+ }
+
+ @Override
+ public void setup() {
+ importWSTestProject(getWsProjectName());
+ }
+
+ @Override
+ public void cleanup() {
+ projectExplorer.deleteAllProjects();
+ }
+
+ @Test
+ public void testQuickFixes() {
+
+ /* workaround for JBIDE-12690 */
+ jbide12680Workaround(getWsProjectName(), "src", "test", "MyAnnot.java");
+
+ /* assert that there are two JAX-RS errors */
+ assertThat(errorsByType("JAX-RS Problem").length, equalTo(2));
+
+ /* get quickfix bot for MyAnnot annotation */
+ QuickFixBot bot = quickFixBot();
+
+ /* check that there are quick fixes for both required annotations */
+ bot.checkQuickFix("Add @Target annotation on type MyAnnot", false);
+ bot.checkQuickFix("Add @Retention annotation on type MyAnnot", false);
+
+ }
+
+ private void jbide12680Workaround(String projectName, String... path) {
+ SWTBotEditor editor = packageExplorer.openFile(projectName, path);
+ SWTBotEclipseEditor eclipseEditor = editor.toTextEditor();
+ eclipseEditor.insertText(" ");
+ eclipseEditor.save();
+ }
+
+ private QuickFixBot quickFixBot() {
+ SWTBotEditorExt editor = new SWTBotEditorExt(bot.activeEditor().getReference(), bot);
+ SWTBotEclipseEditor eclipseEditor = editor.toTextEditor();
+ int lineIndex = 0;
+ for (String line : eclipseEditor.getLines()) {
+ if (line.contains("@Http")) {
+ break;
+ }
+ lineIndex++;
+ }
+ eclipseEditor.navigateTo(lineIndex, 0);
+ return new QuickFixBot(editor);
+ }
+
+ private SWTBotTreeItem[] errorsByType(String problemType) {
+ return ProblemsView.
+ getFilteredErrorsTreeItems(bot, null, null, null, problemType);
+ }
+
+}
13 years, 6 months
JBoss Tools SVN: r43952 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-24 02:16:26 -0400 (Mon, 24 Sep 2012)
New Revision: 43952
Added:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/MacSpecifics.java
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
Log:
Extracted Mac specific setup. Added selection of default JDK.
Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/MacSpecifics.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/MacSpecifics.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/MacSpecifics.java 2012-09-24 06:16:26 UTC (rev 43952)
@@ -0,0 +1,55 @@
+package org.jboss.tools.ui.bot.ext;
+
+import org.apache.log4j.Logger;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+
+public class MacSpecifics {
+
+ private static final Logger log = Logger.getLogger(MacSpecifics.class);
+
+ public static final void setupToolkit(){
+ if (SWTJBTExt.isRunningOnMacOs()){
+ setupToolkitInternal();
+ }
+ }
+
+ public static final void setupJava(){
+ if (SWTJBTExt.isRunningOnMacOs()){
+ setupJavaInternal();
+ }
+ }
+
+ private static final void setupToolkitInternal(){
+ String javaVersion = System.getProperty("java.specification.version");
+ log.info("Is running on MacOS: " + SWTJBTExt.isRunningOnMacOs());
+ log.info("Java version: " + javaVersion);
+ if ("1.7".equals(javaVersion)){
+ log.info("default AWT toolkit: " + System.getProperty("awt.toolkit"));
+ System.setProperty("awt.toolkit", "sun.lwawt.macosx.LWCToolkit");
+ log.info("AWT toolkit changed to: " + System.getProperty("awt.toolkit"));
+ }
+ }
+
+ public static final void setupJavaInternal(){
+ SWTBot bot = SWTBotFactory.getOpen().preferenceOpen(ActionItem.Preference.JavaInstalledJREs.LABEL);
+ setDefaultJava(bot);
+ SWTBotFactory.getOpen().finish(bot, IDELabel.Button.OK);
+ }
+
+ private static void setDefaultJava(SWTBot bot) {
+ String javaLocation = System.getProperty("java.home");
+ SWTBotTable table = bot.table();
+
+ for (int i = 0; i < table.rowCount(); i++){
+ if (javaLocation.equals(table.cell(i, 1))){
+ table.getTableItem(i).check();
+ return;
+ }
+ }
+
+ throw new IllegalStateException("No java with required location " + javaLocation + " is defined");
+ }
+}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2012-09-24 06:09:40 UTC (rev 43951)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2012-09-24 06:16:26 UTC (rev 43952)
@@ -198,19 +198,15 @@
RequirementAwareSuite.startScreenRecorder(getTestClass().getJavaClass().getSimpleName());
}
- String javaVersion = System.getProperty("java.specification.version");
- log.info("Is running on MacOS: " + SWTJBTExt.isRunningOnMacOs());
- log.info("Java version: " + javaVersion);
- if (SWTJBTExt.isRunningOnMacOs() && "1.7".equals(javaVersion)){
- log.info("default AWT toolkit: " + System.getProperty("awt.toolkit"));
- System.setProperty("awt.toolkit", "sun.lwawt.macosx.LWCToolkit");
- log.info("AWT toolkit changed to: " + System.getProperty("awt.toolkit"));
- }
+ MacSpecifics.setupToolkit();
if (RequirementAwareSuite.runManageBlockingWindow){
SWTJBTExt.manageBlockingWidows(false, false);
RequirementAwareSuite.runManageBlockingWindow = false;
}
+
+ MacSpecifics.setupJava();
+
if (!this.config.equals(TestConfigurator.currentConfig)) {
TestConfigurator.currentConfig = this.config;
}
13 years, 6 months
JBoss Tools SVN: r43951 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: rest/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-24 02:09:40 -0400 (Mon, 24 Sep 2012)
New Revision: 43951
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/JaxRsValidatorTest.java
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java
Log:
JBQA-6998 test implemented
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-09-24 03:48:10 UTC (rev 43950)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-09-24 06:09:40 UTC (rev 43951)
@@ -20,6 +20,7 @@
import org.jboss.tools.ws.ui.bot.test.rest.completion.RESTfulCompletionTest;
import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest;
import org.jboss.tools.ws.ui.bot.test.rest.validation.ApplicationPathAnnotationTest;
+import org.jboss.tools.ws.ui.bot.test.rest.validation.JaxRsValidatorTest;
import org.jboss.tools.ws.ui.bot.test.rest.validation.RESTfulValidationTest;
import org.jboss.tools.ws.ui.bot.test.sample.test.SampleRESTWebServiceTest;
import org.jboss.tools.ws.ui.bot.test.sample.test.SampleSoapWebServiceTest;
@@ -57,6 +58,7 @@
SOAPWSToolingIntegrationTest.class,
// WSTesterPromptValuesSupportTest.class, // not implemented yet
ApplicationPathAnnotationTest.class,
+ JaxRsValidatorTest.class,
BottomUpWSTest.class,
TopDownWSTest.class,
WsClientTest.class,
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/JaxRsValidatorTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/JaxRsValidatorTest.java (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/JaxRsValidatorTest.java 2012-09-24 06:09:40 UTC (rev 43951)
@@ -0,0 +1,86 @@
+package org.jboss.tools.ws.ui.bot.test.rest.validation;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.jboss.tools.ui.bot.ext.gen.IPreference;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ws.ui.bot.test.rest.RESTfulTestBase;
+import org.junit.Test;
+
+/**
+ *
+ * @author jjankovi
+ *
+ */
+public class JaxRsValidatorTest extends RESTfulTestBase {
+
+ @Override
+ public String getWsProjectName() {
+ return "restValidation2";
+ }
+
+ @Override
+ public void cleanup() {
+
+ }
+
+ @Test
+ public void testValidatorInPreferences() {
+
+ /* try to open JAX-RS Validator in Preferences */
+ SWTBot bot = openJaxRsValidator();
+ closeJaxRsValidator(bot);
+
+ }
+
+ @Test
+ public void testValidatorEnabled() {
+
+ /* enable restful validation */
+ restfulHelper.enableRESTValidation();
+
+ /* test count of validation errors */
+ assertCountOfPathAnnotationValidationErrors(getWsProjectName(), 1);
+
+
+ }
+
+ @Test
+ public void testValidatorDisabled() {
+
+ /* disable restful validation */
+ restfulHelper.disableRESTValidation();
+
+ /* test count of validation errors */
+ assertCountOfPathAnnotationValidationErrors(getWsProjectName(), 0);
+ }
+
+ private SWTBot openJaxRsValidator() {
+
+ try {
+ return open.preferenceOpen(new IPreference() {
+ @Override
+ public String getName() {
+ return "JAX-RS Validator";
+
+ }
+
+ @Override
+ public List<String> getGroupPath() {
+ return Arrays.asList("JBoss Tools", "JAX-RS");
+ }
+ });
+ } catch(WidgetNotFoundException exc) {
+ fail("JAX-RS Validator is not located in Preferences");
+ }
+ return null;
+ }
+
+ private void closeJaxRsValidator(SWTBot bot) {
+ bot.button(IDELabel.Button.CANCEL).click();
+ }
+
+}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-09-24 03:48:10 UTC (rev 43950)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-09-24 06:09:40 UTC (rev 43951)
@@ -89,27 +89,5 @@
/* test count of validation errors */
assertCountOfPathAnnotationValidationErrors(getWsProjectName(), 0);
}
-
- @Test
- public void testJaxRsValidator() {
-
- /* disable restful validation */
- restfulHelper.disableRESTValidation();
-
- /* prepare project */
- prepareRestfulResource(editorForClass(getWsProjectName(), "src",
- "org.rest.test", "RestService.java"), SIMPLE_REST_WS_RESOURCE,
- "org.rest.test", "RestService",
- GET_METHOD_PATH, BAD_PATH_PARAM);
-
- /* test count of validation errors */
- assertCountOfPathAnnotationValidationErrors(getWsProjectName(), 0);
-
- /* enable restful validation */
- restfulHelper.enableRESTValidation();
-
- /* test count of validation errors */
- assertCountOfPathAnnotationValidationErrors(getWsProjectName(), 1);
- }
}
13 years, 6 months
JBoss Tools SVN: r43949 - in trunk: runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-09-23 05:06:48 -0400 (Sun, 23 Sep 2012)
New Revision: 43949
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java
Log:
JBIDE-12665 - org.jboss.ide.eclipse.as.management.as7.tests: An unexpected error occured (return code 13)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2012-09-22 14:15:24 UTC (rev 43948)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2012-09-23 09:06:48 UTC (rev 43949)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.ui.IDecoratorManager;
import org.eclipse.ui.IStartup;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.server.core.ServerCore;
@@ -94,7 +95,9 @@
ServerCore.removeServerLifecycleListener(selectionProvider);
UnitedServerListenerManager.getDefault().removeListener(ShowConsoleServerStateListener.getDefault());
UnitedServerListenerManager.getDefault().removeListener(as7ScannerAssist);
- JBossServerUISharedImages.instance().cleanup();
+ if (PlatformUI.isWorkbenchRunning()) {
+ JBossServerUISharedImages.instance().cleanup();
+ }
super.stop(context);
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java 2012-09-22 14:15:24 UTC (rev 43948)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java 2012-09-23 09:06:48 UTC (rev 43949)
@@ -12,6 +12,9 @@
public class RuntimeWorkbenchUtils {
public static void refreshServersView() {
// https://jira.jboss.org/jira/browse/JBDS-1091
+ if (!PlatformUI.isWorkbenchRunning()) {
+ return;
+ }
Display.getDefault().asyncExec(new Runnable() {
public void run() {
IViewPart view = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView("org.eclipse.wst.server.ui.ServersView");
13 years, 6 months
JBoss Tools SVN: r43948 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-22 10:15:24 -0400 (Sat, 22 Sep 2012)
New Revision: 43948
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
add notes to swimlanes doc to define the new job workflows we'll need to implement
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-09-22 03:10:00 UTC (rev 43947)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-09-22 14:15:24 UTC (rev 43948)
@@ -1,6 +1,6 @@
Revised swimlanes, as implemented for 3.2.x, 3.3.x, 4.0.x jobs
-Last updated 2012/09/19
+Last updated 2012/09/22
See also https://svn.jboss.org/repos/jbosstools/trunk/build/ -> pom*.xml
@@ -10,9 +10,10 @@
New component hierarchy/organization (after migration to git):
-https://issues.jboss.org/secure/attachment/12356737/Components-Final%20.png
+https://issues.jboss.org/secure/attachment/12356997/Components-And-Groups-Final.png
+ (Note: maven/examples/central to be combined into a single job)
-* migration to git: https://issues.jboss.org/browse/JBIDE-12475?
+* migration to git: https://issues.jboss.org/browse/JBIDE-12475
* deltacloud [removed]
@@ -22,6 +23,17 @@
* Flow/jbpm4/jpdl4 removed. See https://issues.jboss.org/browse/JBIDE-12631
+After migration, job flows will be:
+
+1. CME {central/maven/examples} -> JavaEE {portlet/seam/jsf/vpe/jst, cdi/jst, struts/vpe/jst} -> xulrunner, Base
+2. Persistence {birt/hibernate}, Server, gwt, forge, freemarker, -> Base
+ (Persistence, Server, gwt, forge, and freemarker all depend on Base)
+ (Persistence is composed of birt depending on hibernate)
+3. ws, openshift -> Server {as/archives, as/jmx} -> Base {common, runtime, tests, usage}
+ (both ws and openshift depend on Server, which depends on Base)
+ (Server is composed of as depending on archives and on jmx)
+ (Base is composed of common, runtime, tests, and usage)
+
------------------------
New in 3.3 (Core):
13 years, 6 months