JBoss Tools SVN: r40713 - in trunk/common/plugins: org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-05-02 08:19:15 -0400 (Wed, 02 May 2012)
New Revision: 40713
Modified:
trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java
trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java
trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java
Log:
JBIDE-11723 : fix library materialization to project root
Modified: trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java 2012-05-02 11:24:30 UTC (rev 40712)
+++ trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java 2012-05-02 12:19:15 UTC (rev 40713)
@@ -39,7 +39,7 @@
public class MaterializeLibraryJob extends WorkspaceJob {
- private final IFolder libFolder;
+ private final IContainer libFolder;
private final IJavaProject javaProject;
private final Map<IPath, String> jars;
private final IClasspathContainer containerToRemove;
@@ -48,7 +48,7 @@
public MaterializeLibraryJob(IJavaProject javaProject,
IClasspathContainer containerToMaterialize,
Map<IPath, String> jars,
- IFolder libFolder,
+ IContainer libFolder,
boolean keepSourceAttachments) {
super(Messages.Materialize_Library);
if (javaProject == null || javaProject.getProject() == null) {
@@ -114,7 +114,9 @@
monitor.beginTask(Messages.Materialize_Library, jarSize);
- mkdirs(libFolder, monitor);
+ if (libFolder instanceof IFolder) {
+ mkdirs((IFolder)libFolder, monitor);
+ }
IPath destination = libFolder.getLocation();
@@ -235,6 +237,5 @@
x = x.getParent();
}
}
-
}
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java 2012-05-02 11:24:30 UTC (rev 40712)
+++ trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java 2012-05-02 12:19:15 UTC (rev 40713)
@@ -16,10 +16,11 @@
import java.util.Map;
import java.util.Set;
-import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
@@ -71,7 +72,7 @@
private static final String FILENAME_PROPERTY = "FILENAME_PROPERTY";
- private IFolder libFolder;
+ private IContainer libFolder;
private Map<IClasspathEntry, String> classpathEntryPaths;
private Map<IPath, String> selectedClasspathEntryPaths;
private IClasspathContainer containerToMaterialize;
@@ -298,7 +299,7 @@
return selectedClasspathEntryPaths;
}
- public IFolder getLibFolder() {
+ public IContainer getLibFolder() {
return libFolder;
}
@@ -306,10 +307,16 @@
return keepSources;
}
- private static IFolder getLibFolderFromText(String text) {
+ private static IContainer getLibFolderFromText(String text) {
String portablePath = text.replaceAll("\\\\", "/");
+ IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
IPath path = new Path(portablePath);
- return ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
+ if (path.segmentCount() == 1) {
+ return workspaceRoot.getProject(path.segment(0));
+ } if (path.segmentCount() > 1) {
+ return ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
+ }
+ return null;
}
@Override
@@ -343,10 +350,15 @@
}
private boolean validateLibFolder() {
- IFolder folder = getLibFolderFromText(libfolderText.getText());
+ IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
+
+ IContainer folder = getLibFolderFromText(libfolderText.getText());
+ if (folder == null || workspaceRoot.equals(folder)) {
+ setErrorMessage("You must select a project destination to copy classpath entries");
+ return false;
+ }
String ancestorPath = folder.getFullPath().segment(0);
- IResource ancestor = ResourcesPlugin.getWorkspace().getRoot()
- .findMember(ancestorPath);
+ IResource ancestor = workspaceRoot.findMember(ancestorPath);
if (ancestor == null || !ancestor.exists()) {
setErrorMessage(ancestorPath + " does not exist ");
return false;
@@ -354,12 +366,12 @@
return true;
}
+ @SuppressWarnings("unchecked")
private boolean validateEntries() {
Object[] selection = classpathEntriesViewer.getCheckedElements();
selectedClasspathEntryPaths = new LinkedHashMap<IPath, String>(
selection.length);
for (Object o : selection) {
- @SuppressWarnings("unchecked")
Map.Entry<IClasspathEntry, String> entry = (Map.Entry<IClasspathEntry, String>) o;
if (entry.getKey().getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
String name = entry.getValue();
Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java 2012-05-02 11:24:30 UTC (rev 40712)
+++ trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java 2012-05-02 12:19:15 UTC (rev 40713)
@@ -15,7 +15,7 @@
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResourceRuleFactory;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -85,7 +85,7 @@
if(dialog.open() == Dialog.OK) {
Map<IPath, String> jarsToMaterialize = dialog.getSelectedClasspathEntryPaths();
- IFolder libFolder = dialog.getLibFolder();
+ IContainer libFolder = dialog.getLibFolder();
Job job = new MaterializeLibraryJob(javaProject,
containerToMaterialize,
13 years, 11 months
JBoss Tools SVN: r40712 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-05-02 07:24:30 -0400 (Wed, 02 May 2012)
New Revision: 40712
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/JPASuite.java
Log:
All tests included in HB JPASuite
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/JPASuite.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/JPASuite.java 2012-05-02 11:23:47 UTC (rev 40711)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/JPASuite.java 2012-05-02 11:24:30 UTC (rev 40712)
@@ -1,6 +1,8 @@
package org.jboss.tools.hb.ui.bot.suite;
import org.jboss.tools.hb.ui.bot.test.jpa.CreateJPAEntityTest;
+import org.jboss.tools.hb.ui.bot.test.jpa.CreateJPAProjectTest;
+import org.jboss.tools.hb.ui.bot.test.jpa.EditPersistenceXMLTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@@ -8,7 +10,8 @@
@RunWith(RequirementAwareSuite.class)
//(a)SuiteClasses({CreateJPAProjectTest.class})
//(a)SuiteClasses({EditPersistenceXMLTest.class})
-(a)SuiteClasses({CreateJPAEntityTest.class})
+//(a)SuiteClasses({CreateJPAEntityTest.class})
+(a)SuiteClasses({CreateJPAProjectTest.class,CreateJPAEntityTest.class,EditPersistenceXMLTest.class})
public class JPASuite {
}
13 years, 11 months
JBoss Tools SVN: r40711 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-05-02 07:23:47 -0400 (Wed, 02 May 2012)
New Revision: 40711
Added:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/ConsoleConfiguration.launch
Removed:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/ConsoleConfiguration.launch
Log:
ConsoleConfiguration launcher added into HB ui bot test
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/ConsoleConfiguration.launch
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/ConsoleConfiguration.launch 2012-05-02 11:12:13 UTC (rev 40710)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/ConsoleConfiguration.launch 2012-05-02 11:23:47 UTC (rev 40711)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/ConsoleConfigurationSuite.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DISPLAY" value=":1"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.hb.ui.bot.suite.ConsoleConfigurationSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.hibernate.ui.bot.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx512m -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M -Dusage_reporting_enabled=false -Dtest.configurations.dir=/home/jpeterka/etc/hb"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/ConsoleConfiguration.launch
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/ConsoleConfiguration.launch (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/ConsoleConfiguration.launch 2012-05-02 11:23:47 UTC (rev 40711)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/ConsoleConfigurationSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":1"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.hb.ui.bot.suite.ConsoleConfigurationSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.hibernate.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx512m -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M -Dusage_reporting_enabled=false -Dtest.configurations.dir=/home/jpeterka/etc/hb"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/ConsoleConfiguration.launch
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 11 months
JBoss Tools SVN: r40710 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-05-02 07:12:13 -0400 (Wed, 02 May 2012)
New Revision: 40710
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java
Log:
CriteriaEditorTest in ui bot test assuming not empty table
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java 2012-05-02 11:07:07 UTC (rev 40709)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java 2012-05-02 11:12:13 UTC (rev 40710)
@@ -55,7 +55,7 @@
private void checkCriteriaQueryResult() {
SWTBotView qr = open.viewOpen(ActionItem.View.HibernateHibernateQueryResult.LABEL);
SWTBotTable table = qr.bot().table();
- assertTrue(table.rowCount() == 0);
+ assertTrue(table.rowCount() != 0);
}
}
13 years, 11 months
JBoss Tools SVN: r40709 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-05-02 07:07:07 -0400 (Wed, 02 May 2012)
New Revision: 40709
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java
Log:
fixed failing focus issue in CreateConsoleConfiguration HB ui bot test
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java 2012-05-02 09:35:16 UTC (rev 40708)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java 2012-05-02 11:07:07 UTC (rev 40709)
@@ -76,17 +76,17 @@
}
private void createClasspathTab(SWTBotShell shell) {
- shell.activate();
+ shell.setFocus();
bot.cTabItem(IDELabel.HBConsoleWizard.CLASSPATH_TAB).activate();
}
private void createMappingsTab(SWTBotShell shell) {
- shell.activate();
+ shell.setFocus();
bot.cTabItem(IDELabel.HBConsoleWizard.MAPPINGS_TAB).activate();
}
private void createCommonTab(SWTBotShell shell) {
- shell.activate();
+ shell.setFocus();
bot.cTabItem(IDELabel.HBConsoleWizard.COMMON_TAB).activate();
}
13 years, 11 months
JBoss Tools SVN: r40708 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-05-02 05:35:16 -0400 (Wed, 02 May 2012)
New Revision: 40708
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/EditPersistenceXMLTest.java
Log:
fixed EditPersistenceXMLTest method name
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/EditPersistenceXMLTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/EditPersistenceXMLTest.java 2012-05-02 09:28:10 UTC (rev 40707)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/EditPersistenceXMLTest.java 2012-05-02 09:35:16 UTC (rev 40708)
@@ -28,7 +28,7 @@
final String prj = "jpatest35";
@Test
- public void createJPAProject() {
+ public void editPersistenceXMLTest() {
importTestProject("/resources/prj/" + prj);
openPersistenceXML();
editPersistenceXMLHibernatePage();
13 years, 11 months
JBoss Tools SVN: r40707 - branches/jbosstools-3.3.0.Beta3/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-02 05:28:10 -0400 (Wed, 02 May 2012)
New Revision: 40707
Modified:
branches/jbosstools-3.3.0.Beta3/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
Log:
JBIDE-11722 - tiny patch for using existing project
Modified: branches/jbosstools-3.3.0.Beta3/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- branches/jbosstools-3.3.0.Beta3/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-05-02 08:22:58 UTC (rev 40706)
+++ branches/jbosstools-3.3.0.Beta3/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-05-02 09:28:10 UTC (rev 40707)
@@ -144,6 +144,7 @@
, getRemoteName()
, getUser())
.execute(monitor);
+ addSettingsFiles(importedProjects);
createServerAdapter(monitor, importedProjects);
}
13 years, 11 months
JBoss Tools SVN: r40706 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-05-02 04:22:58 -0400 (Wed, 02 May 2012)
New Revision: 40706
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Changed Label for New Openshift Application
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-05-02 07:18:43 UTC (rev 40705)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-05-02 08:22:58 UTC (rev 40706)
@@ -839,7 +839,7 @@
public static final String NEW_DYNAMIC_WEB_PROJECT = "New Dynamic Web Project";
public static final String PROJECT_EXAMPLE = "New Project Example";
public static final String NEW_JBOSS_PROJECT = "New JBoss Project";
- public static final String OPENSHIFT_APP_WIZARD = "New OpenShift Express Application";
+ public static final String OPENSHIFT_APP_WIZARD = "New OpenShift Application";
}
public static class NewViewDialog{
13 years, 11 months
JBoss Tools SVN: r40705 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test: src/org/jboss/tools/cdi/bot/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-05-02 03:18:43 -0400 (Wed, 02 May 2012)
New Revision: 40705
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/launchers/CDIAllBotTests.launch
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
Log:
reordering test execution to resolve some failing tests
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/launchers/CDIAllBotTests.launch
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/launchers/CDIAllBotTests.launch 2012-05-02 06:41:36 UTC (rev 40704)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/launchers/CDIAllBotTests.launch 2012-05-02 07:18:43 UTC (rev 40705)
@@ -45,10 +45,9 @@
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<stringAttribute key="testApplication" value="com.jboss.jbds.product.application"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
</launchConfiguration>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2012-05-02 06:41:36 UTC (rev 40704)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2012-05-02 07:18:43 UTC (rev 40705)
@@ -75,14 +75,14 @@
BeansEditorTest.class,
NamedRefactoringTest.class,
NamedComponentsSearchingTest.class,
- BeansXMLValidationTest.class,
- BeansXMLCompletionTest.class,
+ BeansXMLValidationTest.class,
+ BeansXMLCompletionTest.class,
+ BeansXMLValidationQuickFixTest.class,
DecoratorFromWebBeanTest.class,
- ProblemEligibleInjectionTest.class,
+ ProblemEligibleInjectionTest.class,
AllAssignableDialogTest.class,
AssignableDialogFilterTest.class,
QuickFixProposalsDescriptionTest.class,
- BeansXMLValidationQuickFixTest.class,
StereotypeValidationQuickFixTest.class,
QualifierValidationQuickFixTest.class,
ScopeValidationQuickFixTest.class,
13 years, 11 months
JBoss Tools SVN: r40704 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-02 02:41:36 -0400 (Wed, 02 May 2012)
New Revision: 40704
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
JBIDE-11725 use in-wizard job
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-02 06:18:30 UTC (rev 40703)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-02 06:41:36 UTC (rev 40704)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard;
+import java.lang.reflect.InvocationTargetException;
import java.net.SocketTimeoutException;
import java.util.Collection;
import java.util.Set;
@@ -213,16 +214,27 @@
if (result == IDialogConstants.OK_ID) {
final IApplication selectedApplication = appSelectionDialog.getSelectedApplication();
if (selectedApplication != null) {
+ // This setter may be long-running
+ Job j = new Job("Setting Application") {
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ pageModel.setExistingApplicationName(selectedApplication.getName());
+ } catch (OpenShiftException ex) {
+ OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "Could not get embedded cartridges for application {0}",
+ selectedApplication.getName()), ex));
+ } catch (SocketTimeoutException ex) {
+ OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "Could not get embedded cartridges for application {0}",
+ selectedApplication.getName()), ex));
+ }
+ return Status.OK_STATUS;
+ }
+ };
try {
- pageModel.setExistingApplicationName(selectedApplication.getName());
- } catch (OpenShiftException ex) {
- OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind(
- "Could not get embedded cartridges for application {0}",
- selectedApplication.getName()), ex));
- } catch (SocketTimeoutException ex) {
- OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind(
- "Could not get embedded cartridges for application {0}",
- selectedApplication.getName()), ex));
+ WizardUtils.runInWizard(j, getContainer());
+ } catch(InvocationTargetException ite) {
+ } catch(InterruptedException ie) {
}
}
}
13 years, 11 months