JBoss Tools SVN: r26587 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-11-15 15:36:05 -0500 (Mon, 15 Nov 2010)
New Revision: 26587
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/JEEClasspathContainerTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared
as.tests condition adjusted from 1 to 21, because it seems to be expected behavior
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/JEEClasspathContainerTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/JEEClasspathContainerTest.java 2010-11-15 20:12:28 UTC (rev 26586)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/classpath/JEEClasspathContainerTest.java 2010-11-15 20:36:05 UTC (rev 26587)
@@ -71,7 +71,7 @@
}
public void testJEE50ClasspathContainer() {
- testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.javaee-5.0", 1);
+ testGenericClasspathContainer("org.jboss.ide.eclipse.as.classpath.core.javaee-5.0", 21);
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26586 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-11-15 15:12:28 -0500 (Mon, 15 Nov 2010)
New Revision: 26586
Modified:
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared
fix for junit test errors. filtering of .svn folders restored because of tycho behavior. It returns local source folder as bundle location in tests and thus projects imported from file system with .svn files.
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-11-15 19:47:48 UTC (rev 26585)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-11-15 20:12:28 UTC (rev 26586)
@@ -272,9 +272,16 @@
.getFullPath(), source, zipStrProvider , overwrite);
importOp.setFilesToImport(zipStrProvider.getChildren(source));
} else {
+ ImportProvider importProvider = new ImportProvider();
+
+ // need to remove from imported project "svn" files
+ List<String> unimportedFiles = new ArrayList<String>();
+ unimportedFiles.add(".svn"); //$NON-NLS-1$
+
+ importProvider.setUnimportedFiles(unimportedFiles);
// create import operation
importOp = new ImportOperation(project
- .getFullPath(), new File(path), FileSystemStructureProvider.INSTANCE, overwrite);
+ .getFullPath(), new File(path), importProvider, overwrite);
}
// import files just to project folder ( without old structure )
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26585 - trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-11-15 14:47:48 -0500 (Mon, 15 Nov 2010)
New Revision: 26585
Modified:
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant/SimpleAntTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared
fix for junit test error:
testOne(org.jboss.ide.eclipse.archives.test.core.ant.SimpleAntTest)
Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant/SimpleAntTest.java
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant/SimpleAntTest.java 2010-11-15 19:41:34 UTC (rev 26584)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant/SimpleAntTest.java 2010-11-15 19:47:48 UTC (rev 26585)
@@ -18,6 +18,7 @@
import junit.framework.TestCase;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
@@ -107,10 +108,7 @@
if( !done || !success )
fail("The ant task did not successfully complete. " + errorString);
- assertTrue(outputFolder.toFile().list().length == 1);
- File out = outputFolder.toFile().listFiles()[0];
- assertTrue(out.exists());
-
+ assertTrue(outputFolder.append("SimpleAntTest.jar").toFile().exists());
}
public void out(String text) {
if( "BUILD SUCCESSFUL\n".equals(text)) //$NON-NLS-1$
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26584 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/console and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-11-15 14:41:34 -0500 (Mon, 15 Nov 2010)
New Revision: 26584
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
Log:
https://jira.jboss.org/browse/JBIDE-7604 - fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-11-15 19:39:14 UTC (rev 26583)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-11-15 19:41:34 UTC (rev 26584)
@@ -43,6 +43,7 @@
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.datatools.connectivity.drivers.DriverInstance;
+import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants;
import org.eclipse.osgi.util.NLS;
import org.hibernate.HibernateException;
import org.hibernate.MappingException;
@@ -63,6 +64,8 @@
public class ConfigurationFactory {
+ public static final String FAKE_TM_LOOKUP = "org.hibernate.console.FakeTransactionManagerLookup"; //$NON-NLS-1$
+
private ConsoleConfigurationPreferences prefs;
private Map<String, FakeDelegatingDriver> fakeDrivers;
@@ -82,11 +85,9 @@
if (properties != null) {
// in case the transaction manager is empty then we need to inject a faketm since
// hibernate will still try and instantiate it.
- String str = properties.getProperty("hibernate.transaction.manager_lookup_class"); //$NON-NLS-1$
+ String str = properties.getProperty(Environment.TRANSACTION_MANAGER_STRATEGY);
if (str != null && StringHelper.isEmpty(str)) {
- properties
- .setProperty(
- "hibernate.transaction.manager_lookup_class", "org.hibernate.console.FakeTransactionManagerLookup"); //$NON-NLS-1$ //$NON-NLS-2$
+ properties.setProperty(Environment.TRANSACTION_MANAGER_STRATEGY, FAKE_TM_LOOKUP);
// properties.setProperty( "hibernate.transaction.factory_class", "");
}
}
@@ -382,22 +383,22 @@
localCfg.setProperties(invokeProperties);
// seems we should not setup dialect here
// String dialect =
- // "org.hibernate.dialect.HSQLDialect";//cpProperties.getProperty("org.eclipse.datatools.connectivity.db.driverClass");
+ // "org.hibernate.dialect.HSQLDialect";//cpProperties.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID);
// invoke.setProperty(Environment.DIALECT, dialect);
String driverClass = driverInstance != null ?
- driverInstance.getProperty("org.eclipse.datatools.connectivity.db.driverClass") : ""; //$NON-NLS-1$ //$NON-NLS-2$
+ driverInstance.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID) : ""; //$NON-NLS-1$
localCfg.setProperty(Environment.DRIVER, driverClass);
//String driverJarPath = driverInstance != null ?
// driverInstance.getJarList() : ""; //$NON-NLS-1$
- String url = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.URL"); //$NON-NLS-1$
+ String url = cpProperties.getProperty(IJDBCDriverDefinitionConstants.URL_PROP_ID);
// url += "/";// +
- // cpProperties.getProperty("org.eclipse.datatools.connectivity.db.databaseName");
+ // cpProperties.getProperty(IJDBCDriverDefinitionConstants.DATABASE_NAME_PROP_ID);
localCfg.setProperty(Environment.URL, url);
- String user = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.username"); //$NON-NLS-1$
+ String user = cpProperties.getProperty(IJDBCDriverDefinitionConstants.USERNAME_PROP_ID);
if (null != user && user.length() > 0) {
localCfg.setProperty(Environment.USER, user);
}
- String pass = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.password"); //$NON-NLS-1$
+ String pass = cpProperties.getProperty(IJDBCDriverDefinitionConstants.PASSWORD_PROP_ID);
if (null != pass && pass.length() > 0) {
localCfg.setProperty(Environment.PASS, pass);
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2010-11-15 19:39:14 UTC (rev 26583)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2010-11-15 19:41:34 UTC (rev 26584)
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
+import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.jpt.core.JpaDataSource;
@@ -208,10 +209,10 @@
public String getDialectName() {
String dialect = getAttribute( IConsoleConfigurationLaunchConstants.DIALECT, null );
// determine dialect when connection profile is used
- if (dialect == null && getConnectionProfileName() != null && getConnectionProfileName() != null) {
+ if (dialect == null && getConnectionProfileName() != null) {
IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName());
if (profile == null) return null;
- String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass"); //$NON-NLS-1$
+ String driver = profile.getProperties(profile.getProviderId()).getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID);
dialect = new DriverClassHelpers().getDialect(driver);
}
return dialect;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-11-15 19:39:14 UTC (rev 26583)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-11-15 19:41:34 UTC (rev 26584)
@@ -34,8 +34,10 @@
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.datatools.connectivity.drivers.DriverInstance;
+import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.hibernate.cfg.Environment;
+import org.hibernate.console.ConfigurationFactory;
import org.hibernate.console.ConfigurationXMLStrings;
import org.hibernate.console.ConfigurationXMLFactory;
import org.hibernate.console.ConnectionProfileUtil;
@@ -166,19 +168,19 @@
String connProfileName = consoleConfigPrefs == null ? null :
consoleConfigPrefs.getConnectionProfileName();
IConnectionProfile profile = getConnectionProfile(connProfileName);
- if (profile != null) {
- StringBuilder propFileContent = new StringBuilder();
- String driverClass = getDriverClass(connProfileName);
- final Properties cpProperties = profile.getProperties(profile.getProviderId());
- //
- String url = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.URL"); //$NON-NLS-1$
- //
- String user = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.username"); //$NON-NLS-1$
- //
- String pass = cpProperties.getProperty("org.eclipse.datatools.connectivity.db.password"); //$NON-NLS-1$
- //
- String dialectName = consoleConfigPrefs.getDialectName();
- //
+ boolean bPropFile = profile != null;
+ // update property with fake tm
+ Properties propsTmp = null;
+ if (consoleConfigPrefs != null && consoleConfigPrefs.getPropertyFile() != null) {
+ propsTmp = consoleConfigPrefs.getProperties();
+ String tmStrategy = propsTmp.getProperty(Environment.TRANSACTION_MANAGER_STRATEGY);
+ if (tmStrategy != null && StringHelper.isEmpty(tmStrategy)) {
+ propsTmp.setProperty(Environment.TRANSACTION_MANAGER_STRATEGY,
+ ConfigurationFactory.FAKE_TM_LOOKUP);
+ bPropFile = true;
+ }
+ }
+ if (bPropFile) {
Set<String> specialProps = new TreeSet<String>();
specialProps.add(Environment.DRIVER);
specialProps.add(Environment.URL);
@@ -186,19 +188,29 @@
specialProps.add(Environment.PASS);
specialProps.add(Environment.DIALECT);
//
- Properties propsTmp = null;
- if (consoleConfigPrefs.getPropertyFile() != null) {
- propsTmp = consoleConfigPrefs.getProperties();
- }
if (propsTmp == null) {
propsTmp = new Properties();
}
- propsTmp.setProperty(Environment.DRIVER, driverClass);
- propsTmp.setProperty(Environment.URL, url);
- propsTmp.setProperty(Environment.USER, user);
- propsTmp.setProperty(Environment.PASS, pass);
- if (StringHelper.isNotEmpty(dialectName)) {
- propsTmp.setProperty(Environment.DIALECT, dialectName);
+ StringBuilder propFileContent = new StringBuilder();
+ String driverClass = getDriverClass(connProfileName);
+ if (profile != null) {
+ final Properties cpProperties = profile.getProperties(profile.getProviderId());
+ //
+ String url = cpProperties.getProperty(IJDBCDriverDefinitionConstants.URL_PROP_ID);
+ //
+ String user = cpProperties.getProperty(IJDBCDriverDefinitionConstants.USERNAME_PROP_ID);
+ //
+ String pass = cpProperties.getProperty(IJDBCDriverDefinitionConstants.PASSWORD_PROP_ID);
+ //
+ String dialectName = consoleConfigPrefs.getDialectName();
+ //
+ propsTmp.setProperty(Environment.DRIVER, driverClass);
+ propsTmp.setProperty(Environment.URL, url);
+ propsTmp.setProperty(Environment.USER, user);
+ propsTmp.setProperty(Environment.PASS, pass);
+ if (StringHelper.isNotEmpty(dialectName)) {
+ propsTmp.setProperty(Environment.DIALECT, dialectName);
+ }
}
// output keys in sort order
Object[] keys = propsTmp.keySet().toArray();
@@ -415,7 +427,7 @@
public String getDriverClass(String connProfileName) {
DriverInstance driverInstance = getDriverInstance(connProfileName);
String driverClass = driverInstance != null ?
- driverInstance.getProperty("org.eclipse.datatools.connectivity.db.driverClass") : ""; //$NON-NLS-1$ //$NON-NLS-2$
+ driverInstance.getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID) : ""; //$NON-NLS-1$
return driverClass;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2010-11-15 19:39:14 UTC (rev 26583)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2010-11-15 19:41:34 UTC (rev 26584)
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
+import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.jdt.core.IPackageFragmentRoot;
@@ -340,7 +341,7 @@
}
if (!selectMethod.getSelection()){
IConnectionProfile profile = ProfileManager.getInstance().getProfileByName(getConnectionProfileName());
- String driver = profile.getProperties(profile.getProviderId()).getProperty("org.eclipse.datatools.connectivity.db.driverClass"); //$NON-NLS-1$
+ String driver = profile.getProperties(profile.getProviderId()).getProperty(IJDBCDriverDefinitionConstants.DRIVER_CLASS_PROP_ID);
return helper.getDialect(driver);
}
return null;
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26583 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/commands and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-15 14:39:14 -0500 (Mon, 15 Nov 2010)
New Revision: 26583
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java
Log:
[JBIDE-7603] added error dialogs and removed duplicate code
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-15 19:35:05 UTC (rev 26582)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-15 19:39:14 UTC (rev 26583)
@@ -1,5 +1,7 @@
2010-11-15 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java (launchRemoteSystemExplorer):
+ [JBIDE-7603] added error dialogs and removed duplicate code
* plugin.xml:
[JBIDE-7599] corrected refresh handler activation to remove conflicts between the 3 refresh handlers
(cloud-, image-, instance-)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java 2010-11-15 19:35:05 UTC (rev 26582)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java 2010-11-15 19:39:14 UTC (rev 26583)
@@ -14,6 +14,7 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -66,6 +67,8 @@
private void launchRemoteSystemExplorer(final DeltaCloudInstance instance, final Shell shell) throws Exception {
String hostname = instance.getHostName();
IRSESystemType sshType = getRSESystemType();
+ // TODO: internationalize string
+ Assert.isTrue(sshType != null, "Remote System Explorer could not initialize SSH subsystem: ssh type not found");
String connectionName = instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
ISystemRegistry registry = SystemStartHere.getSystemRegistry();
IHost host = registry.createHost(sshType, connectionName, hostname, null);
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26582 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-15 14:35:05 -0500 (Mon, 15 Nov 2010)
New Revision: 26582
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java
Log:
[JBIDE-7603] added error dialogs and cleaned code
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java 2010-11-15 19:16:39 UTC (rev 26581)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java 2010-11-15 19:35:05 UTC (rev 26582)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.IRSECoreRegistry;
@@ -28,9 +29,11 @@
import org.eclipse.rse.core.model.SystemStartHere;
import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.handlers.HandlerUtil;
+import org.jboss.tools.common.log.StatusFactory;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
@@ -49,70 +52,46 @@
ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof IStructuredSelection) {
DeltaCloudInstance instance = UIUtils.getFirstAdaptedElement(selection, DeltaCloudInstance.class);
- launchRemoteSystemExplorer(instance);
+ Shell shell = HandlerUtil.getActiveShell(event);
+ try {
+ launchRemoteSystemExplorer(instance, shell);
+ } catch (Exception e) {
+ return showCannotLaunchRSEErrorDialog(instance, shell, e);
+ }
}
return Status.OK_STATUS;
}
- private void launchRemoteSystemExplorer(DeltaCloudInstance instance) {
+ private void launchRemoteSystemExplorer(final DeltaCloudInstance instance, final Shell shell) throws Exception {
String hostname = instance.getHostName();
IRSESystemType sshType = getRSESystemType();
String connectionName = instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
- try {
- ISystemRegistry registry = SystemStartHere.getSystemRegistry();
- IHost host = registry.createHost(sshType, connectionName, hostname, null);
- if (host != null) {
- host.setDefaultUserId("root"); //$NON-NLS-1$
- IConnectorService[] services = host.getConnectorServices();
- if (services.length > 0) {
- final IConnectorService service = services[0];
- Job connect = new Job(CVMessages.getFormattedString(RSE_CONNECTING_MSG, connectionName)) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- service.connect(monitor);
- Display.getDefault().asyncExec(new Runnable() {
- @Override
- public void run() {
- try {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage()
- .showView(VIEW_REMOTESYSEXPLORER_ID);
- } catch (PartInitException e) {
- // TODO Auto-generated catch
- // block
- Activator.log(e);
- }
- }
- });
- return Status.OK_STATUS;
- } catch (Exception e) {
- return Status.CANCEL_STATUS;
- }
- }
- };
- connect.setUser(true);
- connect.schedule();
- }
- } else {
- // Assume failure is due to name already in use
- Display.getDefault().asyncExec(new Runnable() {
-
+ ISystemRegistry registry = SystemStartHere.getSystemRegistry();
+ IHost host = registry.createHost(sshType, connectionName, hostname, null);
+ if (host != null) {
+ host.setDefaultUserId("root"); //$NON-NLS-1$
+ IConnectorService[] services = host.getConnectorServices();
+ if (services.length > 0) {
+ final IConnectorService service = services[0];
+ Job connect = new Job(CVMessages.getFormattedString(RSE_CONNECTING_MSG, connectionName)) {
@Override
- public void run() {
+ protected IStatus run(IProgressMonitor monitor) {
try {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .showView(VIEW_REMOTESYSEXPLORER_ID);
- } catch (PartInitException e) {
- Activator.log(e);
+ service.connect(monitor);
+ Display.getDefault().asyncExec(showRSEViewRunnable(instance, shell));
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
}
}
-
- });
+ };
+ connect.setUser(true);
+ connect.schedule();
}
- } catch (Exception e) {
- Activator.log(e);
+ } else {
+ // Assume failure is due to name already in use
+ shell.getDisplay().asyncExec(showRSEViewRunnable(instance, shell));
}
}
@@ -127,4 +106,32 @@
}
return sshType;
}
+
+ private IStatus showCannotLaunchRSEErrorDialog(final DeltaCloudInstance instance, final Shell shell,
+ Exception e) {
+ IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
+ // TODO: internationalize strings
+ ErrorDialog.openError(shell,
+ "Error",
+ "Could not launch remote system explorer for instance \"" + instance.getName() + "\"",
+ status);
+ return status;
+ }
+
+ private Runnable showRSEViewRunnable(final DeltaCloudInstance instance, final Shell shell) {
+
+ return new Runnable() {
+ @Override
+ public void run() {
+ try {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getActivePage()
+ .showView(VIEW_REMOTESYSEXPLORER_ID);
+ } catch (PartInitException e) {
+ showCannotLaunchRSEErrorDialog(instance, shell, e);
+ }
+ }
+ };
+ }
+
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26581 - in trunk/hibernatetools/tests/org.hibernate.eclipse.console.test: res and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-11-15 14:16:39 -0500 (Mon, 15 Nov 2010)
New Revision: 26581
Added:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/LaunchConfigTestProject2.launch
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/hibernate-console.properties
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/lib/
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/lib/ejb3-persistence.jar
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/lib/hsqldb.jar
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/META-INF/
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/META-INF/persistence.xml
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/Booking.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/Hotel.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/User.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/ConfigurableTestProject.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/SimpleTestProject.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java
Log:
https://jira.jboss.org/browse/JBIDE-7602 - fixed, test for codegen created
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2010-11-15 18:32:33 UTC (rev 26580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/META-INF/MANIFEST.MF 2010-11-15 19:16:39 UTC (rev 26581)
@@ -41,6 +41,7 @@
Require-Bundle: org.junit,
org.eclipse.jdt.core,
org.eclipse.jdt.launching,
+ org.eclipse.core.externaltools,
org.eclipse.ui,
org.eclipse.jdt.ui,
org.eclipse.core.runtime,
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/LaunchConfigTestProject2.launch
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/LaunchConfigTestProject2.launch (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/LaunchConfigTestProject2.launch 2010-11-15 19:16:39 UTC (rev 26581)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Hibernate Console launch configuration -->
+<launchConfiguration type="org.hibernate.eclipse.launch.ConsoleConfigurationLaunchConfigurationType">
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="LaunchConfigTestProject2"/>
+<stringAttribute key="org.hibernate.eclipse.launch.PROPERTY_FILE" value="/LaunchConfigTestProject2/hibernate-console.properties"/>
+<stringAttribute key="org.hibernate.eclipse.launch.CONFIGURATION_FACTORY" value="JPA"/>
+</launchConfiguration>
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/hibernate-console.properties
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/hibernate-console.properties (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/hibernate-console.properties 2010-11-15 19:16:39 UTC (rev 26581)
@@ -0,0 +1,10 @@
+#File used by hibernate tools to override <datasource> and other container specific settings in persistence.xml
+hibernate.connection.password=
+hibernate.connection.username=sa
+hibernate.connection.driver_class=org.hsqldb.jdbcDriver
+hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.connection.url=jdbc:hsqldb:.
+
+hibernate.connection.provider_class=org.hibernate.connection.DriverManagerConnectionProvider
+hibernate.datasource=
+hibernate.transaction.manager_lookup_class=
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/lib/ejb3-persistence.jar
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/lib/ejb3-persistence.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/lib/hsqldb.jar
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/lib/hsqldb.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/META-INF/persistence.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/META-INF/persistence.xml (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/META-INF/persistence.xml 2010-11-15 19:16:39 UTC (rev 26581)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+ <persistence-unit name="bookingDatabase">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <jta-data-source>java:/LaunchConfigTestProject2Datasource</jta-data-source>
+ <properties>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ <property name="hibernate.show_sql" value="true"/>
+ <!-- These are the default for JBoss EJB3, but not for HEM: -->
+ <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
+ <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+ </properties>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/Booking.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/Booking.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/Booking.java 2010-11-15 19:16:39 UTC (rev 26581)
@@ -0,0 +1,188 @@
+//$Id: Booking.java 5579 2007-06-27 00:06:49Z gavin $
+package org.jboss.seam.example.booking;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.Date;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.NotNull;
+import org.hibernate.validator.Pattern;
+
+@Entity
+public class Booking implements Serializable
+{
+ private Long id;
+ private User user;
+ private Hotel hotel;
+ private Date checkinDate;
+ private Date checkoutDate;
+ private String creditCard;
+ private String creditCardName;
+ private int creditCardExpiryMonth;
+ private int creditCardExpiryYear;
+ private boolean smoking;
+ private int beds;
+
+ public Booking() {}
+
+ public Booking(Hotel hotel, User user)
+ {
+ this.hotel = hotel;
+ this.user = user;
+ }
+
+ @Transient
+ public BigDecimal getTotal()
+ {
+ return hotel.getPrice().multiply( new BigDecimal( getNights() ) );
+ }
+
+ @Transient
+ public int getNights()
+ {
+ return (int) ( checkoutDate.getTime() - checkinDate.getTime() ) / 1000 / 60 / 60 / 24;
+ }
+
+ @Id @GeneratedValue
+ public Long getId()
+ {
+ return id;
+ }
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ @NotNull
+ @Basic @Temporal(TemporalType.DATE)
+ public Date getCheckinDate()
+ {
+ return checkinDate;
+ }
+ public void setCheckinDate(Date datetime)
+ {
+ this.checkinDate = datetime;
+ }
+
+ @ManyToOne @NotNull
+ public Hotel getHotel()
+ {
+ return hotel;
+ }
+ public void setHotel(Hotel hotel)
+ {
+ this.hotel = hotel;
+ }
+
+ @ManyToOne @NotNull
+ public User getUser()
+ {
+ return user;
+ }
+ public void setUser(User user)
+ {
+ this.user = user;
+ }
+
+ @Basic @Temporal(TemporalType.DATE)
+ @NotNull
+ public Date getCheckoutDate()
+ {
+ return checkoutDate;
+ }
+ public void setCheckoutDate(Date checkoutDate)
+ {
+ this.checkoutDate = checkoutDate;
+ }
+
+ @NotNull(message="Credit card number is required")
+ @Length(min=16, max=16, message="Credit card number must 16 digits long")
+ @Pattern(regex="^\\d*$", message="Credit card number must be numeric")
+ public String getCreditCard()
+ {
+ return creditCard;
+ }
+
+ public void setCreditCard(String creditCard)
+ {
+ this.creditCard = creditCard;
+ }
+
+ @Transient
+ public String getDescription()
+ {
+ DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM);
+ return hotel==null ? null : hotel.getName() +
+ ", " + df.format( getCheckinDate() ) +
+ " to " + df.format( getCheckoutDate() );
+ }
+
+ public boolean isSmoking()
+ {
+ return smoking;
+ }
+
+ public void setSmoking(boolean smoking)
+ {
+ this.smoking = smoking;
+ }
+
+ public int getBeds()
+ {
+ return beds;
+ }
+
+ public void setBeds(int beds)
+ {
+ this.beds = beds;
+ }
+ @NotNull(message="Credit card name is required")
+ @Length(min=3, max=70, message="Credit card name is required")
+ public String getCreditCardName()
+ {
+ return creditCardName;
+ }
+
+ public void setCreditCardName(String creditCardName)
+ {
+ this.creditCardName = creditCardName;
+ }
+
+ public int getCreditCardExpiryMonth()
+ {
+ return creditCardExpiryMonth;
+ }
+
+ public void setCreditCardExpiryMonth(int creditCardExpiryMonth)
+ {
+ this.creditCardExpiryMonth = creditCardExpiryMonth;
+ }
+
+ public int getCreditCardExpiryYear()
+ {
+ return creditCardExpiryYear;
+ }
+
+ public void setCreditCardExpiryYear(int creditCardExpiryYear)
+ {
+ this.creditCardExpiryYear = creditCardExpiryYear;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Booking(" + user + ","+ hotel + ")";
+ }
+
+}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/Hotel.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/Hotel.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/Hotel.java 2010-11-15 19:16:39 UTC (rev 26581)
@@ -0,0 +1,112 @@
+//$Id: Hotel.java 5579 2007-06-27 00:06:49Z gavin $
+package org.jboss.seam.example.booking;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.NotNull;
+
+@Entity
+public class Hotel implements Serializable
+{
+ private Long id;
+ private String name;
+ private String address;
+ private String city;
+ private String state;
+ private String zip;
+ private String country;
+ private BigDecimal price;
+
+ @Id @GeneratedValue
+ public Long getId()
+ {
+ return id;
+ }
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ @Length(max=50) @NotNull
+ public String getName()
+ {
+ return name;
+ }
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @Length(max=100) @NotNull
+ public String getAddress()
+ {
+ return address;
+ }
+ public void setAddress(String address)
+ {
+ this.address = address;
+ }
+
+ @Length(max=40) @NotNull
+ public String getCity()
+ {
+ return city;
+ }
+ public void setCity(String city)
+ {
+ this.city = city;
+ }
+
+ @Length(min=4, max=6) @NotNull
+ public String getZip()
+ {
+ return zip;
+ }
+ public void setZip(String zip)
+ {
+ this.zip = zip;
+ }
+
+ @Length(min=2, max=10) @NotNull
+ public String getState()
+ {
+ return state;
+ }
+ public void setState(String state)
+ {
+ this.state = state;
+ }
+
+ @Length(min=2, max=40) @NotNull
+ public String getCountry()
+ {
+ return country;
+ }
+ public void setCountry(String country)
+ {
+ this.country = country;
+ }
+
+ @Column(precision=6, scale=2)
+ public BigDecimal getPrice()
+ {
+ return price;
+ }
+ public void setPrice(BigDecimal price)
+ {
+ this.price = price;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "Hotel(" + name + "," + address + "," + city + "," + zip + ")";
+ }
+}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/User.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/User.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/src/org/jboss/seam/example/booking/User.java 2010-11-15 19:16:39 UTC (rev 26581)
@@ -0,0 +1,70 @@
+//$Id: User.java 5579 2007-06-27 00:06:49Z gavin $
+package org.jboss.seam.example.booking;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.NotNull;
+import org.hibernate.validator.Pattern;
+
+@Entity
+@Table(name="Customer")
+public class User implements Serializable
+{
+ private String username;
+ private String password;
+ private String name;
+
+ public User(String name, String password, String username)
+ {
+ this.name = name;
+ this.password = password;
+ this.username = username;
+ }
+
+ public User() {}
+
+ @NotNull
+ @Length(max=100)
+ public String getName()
+ {
+ return name;
+ }
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @NotNull
+ @Length(min=5, max=15)
+ public String getPassword()
+ {
+ return password;
+ }
+ public void setPassword(String password)
+ {
+ this.password = password;
+ }
+
+ @Id
+ @Length(min=4, max=15)
+ @Pattern(regex="^\\w*$", message="not a valid username")
+ public String getUsername()
+ {
+ return username;
+ }
+ public void setUsername(String username)
+ {
+ this.username = username;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "User(" + username + ")";
+ }
+}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch 2010-11-15 19:16:39 UTC (rev 26581)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType">
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/>
+<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/>
+<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/>
+<listAttribute key="org.hibernate.tools.exporters">
+<listEntry value="org.hibernate.tools.hbm2java"/>
+<listEntry value="org.hibernate.tools.hbm2hbmxml"/>
+<listEntry value="org.hibernate.tools.hbm2dao"/>
+<listEntry value="org.hibernate.tools.hbmtemplate"/>
+<listEntry value="org.hibernate.tools.hbm2cfgxml"/>
+<listEntry value="org.hibernate.tools.hbm2doc"/>
+<listEntry value="org.hibernate.tools.hbm2ddl"/>
+<listEntry value="org.hibernate.tools.query"/>
+</listAttribute>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/>
+<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties">
+<mapEntry key="outputFileName" value="asdf.txt"/>
+<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/>
+<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/>
+</mapAttribute>
+<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/>
+<stringAttribute key="org.hibernate.tools.package" value="hsql"/>
+<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/>
+<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/>
+<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/>
+<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-15 19:16:39 UTC (rev 26581)
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.console.test;
+
+import org.eclipse.core.externaltools.internal.IExternalToolConstants;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.internal.core.LaunchManager;
+import org.eclipse.debug.internal.ui.DebugUIPlugin;
+import org.hibernate.console.ConsoleConfiguration;
+import org.hibernate.console.KnownConfigurations;
+import org.hibernate.eclipse.console.EclipseLaunchConsoleConfigurationPreferences;
+import org.hibernate.eclipse.console.test.project.LaunchConfigTestProject2;
+
+import junit.framework.TestCase;
+
+/**
+ * Execute codegeneration launch configuration in external process,
+ * to check the generation is successful.
+ *
+ * @author Vitali Yemialyanchyk
+ */
+@SuppressWarnings("restriction")
+public class CodeGenExternalProcessExecutionTest extends TestCase {
+
+ private ConsoleConfiguration consoleCfg;
+ private LaunchConfigTestProject2 project;
+ private LaunchManager launchManager = new LaunchManager();
+
+ public CodeGenExternalProcessExecutionTest(String name) {
+ super(name);
+ }
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ this.project = new LaunchConfigTestProject2();
+
+ final String fileNameConsoleConfig = LaunchConfigTestProject2.LAUNCH_CONSOLE_CONFIG_TEST_FILE;
+ ILaunchConfiguration launchConfig = loadLaunchConfigFromFile(fileNameConsoleConfig);
+ final EclipseLaunchConsoleConfigurationPreferences cfgprefs =
+ new EclipseLaunchConsoleConfigurationPreferences(launchConfig);
+ consoleCfg = new ConsoleConfiguration(cfgprefs);
+ KnownConfigurations.getInstance().addConfiguration(consoleCfg, true);
+ }
+
+ protected void tearDown() throws Exception {
+ this.project.deleteIProject();
+ this.project = null;
+
+ KnownConfigurations.getInstance().removeAllConfigurations();
+ consoleCfg = null;
+ }
+
+ public void testExecuteExternalLaunchConfig() {
+ IFolder testFolder = project.getTestFolder();
+ int nTest = -1;
+ try {
+ nTest = testFolder.members().length;
+ } catch (CoreException e) {
+ }
+ assertEquals(0, nTest);
+ final String fileNameCodeGen = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE;
+ ILaunchConfiguration launchConfig = loadLaunchConfigFromFile(fileNameCodeGen);
+ ILaunchConfigurationWorkingCopy launchConfigWC = null;
+ try {
+ launchConfigWC = launchConfig.getWorkingCopy();
+ } catch (CoreException e) {
+ }
+ assertNotNull(launchConfigWC);
+ launchConfigWC.setAttribute(IExternalToolConstants.ATTR_LAUNCH_IN_BACKGROUND, false);
+ DebugUIPlugin.launchInForeground(launchConfigWC, ILaunchManager.RUN_MODE);
+ nTest = -1;
+ try {
+ nTest = testFolder.members().length;
+ } catch (CoreException e) {
+ }
+ assertTrue(nTest > 0);
+ }
+
+ protected LaunchConfigTestProject2 getProject() {
+ return this.project;
+ }
+
+ public ILaunchConfiguration loadLaunchConfigFromFile(String fileName) {
+ IPath path = new Path(fileName);
+ IFile ifile = getProject().getIProject().getFile(path);
+ ILaunchConfiguration launchConfig = launchManager.getLaunchConfiguration((IFile) ifile);
+ return launchConfig;
+ }
+}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-11-15 18:32:33 UTC (rev 26580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-11-15 19:16:39 UTC (rev 26581)
@@ -26,6 +26,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.datatools.connectivity.IConnectionProfile;
+import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants;
import org.eclipse.datatools.connectivity.internal.ConnectionProfile;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.hibernate.console.preferences.ConsoleConfigurationPreferences;
@@ -216,9 +217,9 @@
IConnectionProfile profile = new ConnectionProfile("testName", null, null) { //$NON-NLS-1$
public Properties getProperties(String type) {
Properties res = new Properties();
- res.setProperty("org.eclipse.datatools.connectivity.db.URL", "url"); //$NON-NLS-1$ //$NON-NLS-2$
- res.setProperty("org.eclipse.datatools.connectivity.db.username", "username"); //$NON-NLS-1$ //$NON-NLS-2$
- res.setProperty("org.eclipse.datatools.connectivity.db.password", "passw"); //$NON-NLS-1$ //$NON-NLS-2$
+ res.setProperty(IJDBCDriverDefinitionConstants.URL_PROP_ID, "url"); //$NON-NLS-1$
+ res.setProperty(IJDBCDriverDefinitionConstants.USERNAME_PROP_ID, "username"); //$NON-NLS-1$
+ res.setProperty(IJDBCDriverDefinitionConstants.PASSWORD_PROP_ID, "passw"); //$NON-NLS-1$
return res;
}
};
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/ConfigurableTestProject.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/ConfigurableTestProject.java 2010-11-15 18:32:33 UTC (rev 26580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/ConfigurableTestProject.java 2010-11-15 19:16:39 UTC (rev 26581)
@@ -13,23 +13,15 @@
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.osgi.util.NLS;
-import org.hibernate.eclipse.console.test.ConsoleTestMessages;
-import org.hibernate.eclipse.console.test.HibernateConsoleTestPlugin;
import org.hibernate.eclipse.console.test.mappingproject.Customization;
import org.hibernate.eclipse.console.test.utils.FilesTransfer;
@@ -89,18 +81,6 @@
return true;
}
- protected File getFolder(String path) throws IOException {
- URL entry = HibernateConsoleTestPlugin.getDefault().getBundle().getEntry(path);
- URL resProject = FileLocator.resolve(entry);
- String resolvePath = FileLocator.resolve(resProject).getFile();
- File folder = new File(resolvePath);
- if (!folder.exists()) {
- String out = NLS.bind(ConsoleTestMessages.MappingTestProject_folder_not_found, path);
- throw new RuntimeException(out);
- }
- return folder;
- }
-
public boolean createTestFoldersList(FileFilter filterFiles, FileFilter filterFolders) {
activePackage = -1;
foldersList = new ArrayList<String>();
@@ -167,11 +147,4 @@
foldersList.add(""); //$NON-NLS-1$
return true;
}
-
- public void fullBuild() throws CoreException {
- IPackageFragmentRoot sourcePackageFragment = createSourceFolder();
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- //sourcePackageFragment.getResource().refreshLocal();
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- }
}
Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java (rev 0)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java 2010-11-15 19:16:39 UTC (rev 26581)
@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.hibernate.eclipse.console.test.project;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.osgi.util.NLS;
+import org.hibernate.eclipse.HibernatePlugin;
+import org.hibernate.eclipse.console.test.ConsoleTestMessages;
+import org.hibernate.eclipse.console.test.utils.FilesTransfer;
+import org.hibernate.eclipse.console.test.utils.ResourceReadUtils;
+
+/**
+ * Test project to execute codegeneration launch configuration.
+ *
+ * @author Vitali Yemialyanchyk
+ */
+public class LaunchConfigTestProject2 extends TestProject {
+
+ public static final String TEST_TMP_OUT_FOLDER = "temp_test_out_folder"; //$NON-NLS-1$
+ public static final String META_INF_FOLDER = "src/META-INF".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final String PROJECT_PATH = "res/project2/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final String RESOURCE_SRC_PATH = "res/project2/src/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final String RESOURCE_LIB_PATH = "res/project2/lib/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final String HIBERNATE_PLUGIN_LIB_PATH = "lib"; //$NON-NLS-1$
+
+ public static final String LAUNCH_CODE_GEN_TEST_FILE = "testLaunchCfg.launch"; //$NON-NLS-1$
+ public static final String LAUNCH_CONSOLE_CONFIG_TEST_FILE = "LaunchConfigTestProject2.launch"; //$NON-NLS-1$
+ public static final String HIBERNATE_CONSOLE_PROPERTIES_FILE = "hibernate-console.properties"; //$NON-NLS-1$
+ public static final String PERSISTENCE_XML_FILE = "persistence.xml"; //$NON-NLS-1$
+
+ public LaunchConfigTestProject2() {
+ super("LaunchConfigTestProject2"); //$NON-NLS-1$
+ }
+
+ public LaunchConfigTestProject2(String projectName) {
+ super(projectName);
+ }
+
+ protected File getHibernatePluginFolder(String path) throws IOException {
+ URL entry = HibernatePlugin.getDefault().getBundle().getEntry(path);
+ URL resProject = FileLocator.resolve(entry);
+ String resolvePath = FileLocator.resolve(resProject).getFile();
+ File folder = new File(resolvePath);
+ if (!folder.exists()) {
+ String out = NLS.bind(ConsoleTestMessages.MappingTestProject_folder_not_found, path);
+ throw new RuntimeException(out);
+ }
+ return folder;
+ }
+
+ @SuppressWarnings("unused")
+ protected void buildProject() throws JavaModelException, CoreException, IOException {
+ super.buildProject();
+ IPackageFragmentRoot tst = createFolder(TEST_TMP_OUT_FOLDER);
+ tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null);
+ //
+ importFileToProject(LAUNCH_CODE_GEN_TEST_FILE);
+ importFileToProject(LAUNCH_CONSOLE_CONFIG_TEST_FILE);
+ importFileToProject(HIBERNATE_CONSOLE_PROPERTIES_FILE);
+ long startCopyFiles = System.currentTimeMillis();
+ IPackageFragmentRoot sourcePackageFragment = createSourceFolder();
+ long startCopyLibs = System.currentTimeMillis();
+ final File libFolder = getFolder(RESOURCE_LIB_PATH);
+ List<IPath> libs = copyLibs(libFolder);
+ final File libFolderHibernatePlugin = getHibernatePluginFolder(HIBERNATE_PLUGIN_LIB_PATH);
+ List<IPath> libsHibernatePlugin = copyLibs(libFolderHibernatePlugin);
+ libs.addAll(libsHibernatePlugin);
+ long startBuild = System.currentTimeMillis();
+ generateClassPath(libs, sourcePackageFragment);
+ setupSourceTestFolder();
+ //
+ tst = createFolder(META_INF_FOLDER);
+ importFileToProject(META_INF_FOLDER + File.separator + PERSISTENCE_XML_FILE);
+ //
+ fullBuild();
+ }
+
+ public IFolder getTestFolder() {
+ return project.getFolder(TEST_TMP_OUT_FOLDER);
+ }
+
+ public boolean setupSourceTestFolder() throws IOException, CoreException {
+ ArrayList<String> foldersList = new ArrayList<String>();
+ File srcFolder = null;
+ try {
+ srcFolder = getFolder(RESOURCE_SRC_PATH);
+ } catch (IOException e) {
+ // ignore
+ }
+ if (srcFolder == null) {
+ return false;
+ }
+ FilesTransfer.collectFoldersWithFiles(srcFolder, FilesTransfer.filterFilesJava,
+ FilesTransfer.filterFolders, foldersList);
+ IPath base = Path.fromOSString(srcFolder.getPath());
+ for (int i = 0; i < foldersList.size(); i++) {
+ String str = foldersList.get(i);
+ IPath path = Path.fromOSString(str);
+ path = path.makeRelativeTo(base);
+ foldersList.set(i, path.toOSString());
+ }
+ for (int i = 0; i < foldersList.size(); i++) {
+ FilesTransfer.delete(new File(project.getLocation().append(SRC_FOLDER).toOSString()));
+ final String pack = foldersList.get(i);
+ srcFolder = getFolder(RESOURCE_SRC_PATH + pack);
+ IPackageFragmentRoot sourcePackageFragment = createFolder(SRC_FOLDER + File.separator + pack);
+ FilesTransfer.copyFolder(srcFolder, (IFolder)sourcePackageFragment.getResource());
+ }
+ return true;
+ }
+
+ public String getSample(String fileName) {
+ return ResourceReadUtils.getSample(PROJECT_PATH + fileName);
+ }
+
+ public void importFileToProject(String fileName) throws CoreException {
+ getIProject().getFile(fileName).create(
+ new ByteArrayInputStream(getSample(fileName).getBytes()),
+ false, new NullProgressMonitor());
+ }
+}
+
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/SimpleTestProject.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/SimpleTestProject.java 2010-11-15 18:32:33 UTC (rev 26580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/SimpleTestProject.java 2010-11-15 19:16:39 UTC (rev 26581)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.project;
import java.io.IOException;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2010-11-15 18:32:33 UTC (rev 26580)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2010-11-15 19:16:39 UTC (rev 26581)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.project;
import java.io.File;
@@ -2,2 +12,3 @@
import java.io.IOException;
+import java.net.URL;
import java.util.ArrayList;
@@ -11,9 +22,12 @@
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
@@ -22,6 +36,7 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.osgi.util.NLS;
import org.hibernate.eclipse.console.test.ConsoleTestMessages;
+import org.hibernate.eclipse.console.test.HibernateConsoleTestPlugin;
import org.hibernate.eclipse.console.test.project.xpl.JavaProjectHelper;
import org.hibernate.eclipse.console.test.utils.FilesTransfer;
@@ -180,4 +195,24 @@
entries.add(JavaCore.newContainerEntry(JRE_CONTAINER));
javaProject.setRawClasspath(entries.toArray(new IClasspathEntry[0]), null);
}
+
+ protected File getFolder(String path) throws IOException {
+ URL entry = HibernateConsoleTestPlugin.getDefault().getBundle().getEntry(path);
+ URL resProject = FileLocator.resolve(entry);
+ String resolvePath = FileLocator.resolve(resProject).getFile();
+ File folder = new File(resolvePath);
+ if (!folder.exists()) {
+ String out = NLS.bind(ConsoleTestMessages.MappingTestProject_folder_not_found, path);
+ throw new RuntimeException(out);
+ }
+ return folder;
+ }
+
+ @SuppressWarnings("unused")
+ public void fullBuild() throws CoreException {
+ IPackageFragmentRoot sourcePackageFragment = createSourceFolder();
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ //sourcePackageFragment.getResource().refreshLocal();
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ }
}
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26580 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-15 13:32:33 -0500 (Mon, 15 Nov 2010)
New Revision: 26580
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
Log:
[JBIDE-7581] added further rse plugins (but rse still does not work)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-15 18:32:07 UTC (rev 26579)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-15 18:32:33 UTC (rev 26580)
@@ -5,13 +5,13 @@
<booleanAttribute key="automaticAdd" value="true"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="org.eclipse.core.expressions"/>
+<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<booleanAttribute key="clearws" value="false"/>
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Deltacloud Tools"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.test,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.mozilla.xulrunner.carbon.macosx,org.eclipse.epp.usagedata.ui,org.mozilla.xpcom,org.jboss.tools.tests,org.jruby.jruby"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.epp.usagedata.recording,org.eclipse.epp.usagedata.gathering,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.deltacloud.docs,org.mozilla.xulrunner.gtk.linux.x86_64,org.mozilla.xulrunner.win32.win32.x86,com.jboss.jbds.usage.branding,org.jboss.tools.deltacloud.test,org.jboss.tools.usage.test,org.mozilla.xulrunner.gtk.linux.x86,org.eclipse.epp.usagedata.ui,org.mozilla.xulrunner.carbon.macosx,org.mozilla.xpcom,org.jboss.tools.tests,org.jruby.jruby"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-New_configuration"/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
@@ -23,12 +23,11 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selectedPlugin" value="org.eclipse.core.expressions"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.jdt.launching@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.search@default:default,org.eclipse.help.base@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.rse.services@default:default,org.eclipse.core.databinding@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ui.workbench@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding.beans@default:default,org.eclipse.team.ui@default:default,org.apache.xml.serializer@default:default,org.ecl!
ipse.equinox.concurrent@default:default,org.apache.commons.net@default:default,org.eclipse.osgi.services@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.jobs@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.ecore@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.editors@default:default,org.eclipse.help@default:default,org.eclipse.ecf.provider.filetransfer@default:default,javax.xml@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.hamcrest.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.cdt.core.linux@default:false,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jface@default:default,org.eclipse.rse.core@defau!
lt:default,org.apache.commons.httpclient*3.1.0.v201005080502@d!
efault:d
efault,org.eclipse.cdt.ui@default:default,org.eclipse.cdt.core@default:default,org.eclipse.equinox.preferences@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ant.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.resources@default:default,org.eclipse.rse.ui@default:default,com.jcraft.jsch@default:default,org.apache.commons.el@default:default,org.eclipse.emf.edit@default:default,org.mortbay.jetty.server@default:default,org.eclipse.help.ui@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.emf.common@default:default,org.apache.lucene@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.equinox.p2.meta!
data@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.text@default:default,org.eclipse.sdk@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.security.ui@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.debug.ui@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.swt@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jem.util@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jdt.core@default:default,javax.servlet.jsp@default:default,org.mortbay.jetty.uti!
l@default:default,org.eclipse.equinox.app@default:default,org.!
eclipse.
core.net.linux.x86_64@default:false,org.eclipse.ui.ide.application@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ui.forms@default:default,com.ibm.icu@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.osgi.util@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.http.jetty@default:default,org.junit4@default:default,org.eclipse.ecf.identity@default:default,org.apache.ant@default:default,org.apache.jasper@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.osgi@-1:true,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.rse.services.ssh@defaul!
t:default,org.eclipse.rse.services.local@default:default,org.eclipse.core.net@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.common@2:true,org.apache.xerces@default:default,org.eclipse.core.variables@default:default,org.apache.xml.resolver@default:default,javax.servlet@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jface.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.compare@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.commands@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.ltk.core.refactoring@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.update.core@default:default,org.eclipse.jst.server.ui@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.jdt.junit@default:default,org.sat4j.pb@default:default,org.eclipse.emf.ecore.edit@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.compare.core@default:default,javax.xml@default:default,org.eclipse.help@default:default,org.eclipse.ui.views@default:default,org.jboss.ide.eclipse.as.core@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.!
core.commands@default:default,org.eclipse.ui.editors@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.wst.xml.ui@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.cdt.core.linux.x86_64@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.rse.services@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ui.ide@!
default:default,org.eclipse.jst.common.annotations.core@defaul!
t:defaul
t,org.eclipse.jdt.ui@default:default,org.apache.xml.resolver@default:default,org.eclipse.wst.server.discovery@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.rse.ui@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.help.ui@default:default,org.eclipse.pde.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.jdt.core.manipulation@default:default,org.apache.lucene@default:default,org.junit4@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.html.core@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.mortbay.jetty.util@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.web.u!
i@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.common@2:true,org.eclipse.ui.views.log@default:default,org.eclipse.jst.jee@default:default,org.eclipse.ui.browser@default:default,org.eclipse.jst.common.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.sat4j.core@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.emf.common@default:default,org.eclipse.swt@default:default,org.eclipse!
.wst.validation@default:default,org.eclipse.wst.jsdt.core@defa!
ult:defa
ult,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.search@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.rse.core@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.wst.web@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.equinox.concurrent@default:default,org.apache.ant@default:default,org.eclipse.equinox.security@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.jst.common.projec!
t.facet.core@default:default,org.jboss.tools.jmx.ui@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.net.linux.x86_64@default:false,org.apache.xerces@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.cdt.core.linux@default:false,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.commons.el@default:default,org.eclipse.core.net@default:default,org.eclipse.team.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.compare@default:default,org.eclipse.jdt@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.common.environment@default:default,org.jboss.tools.jmx.core@default:default,org.eclipse.rse.files.ui@default:default,javax.servlet@default:def!
ault,org.eclipse.jdt.launching@default:default,org.eclipse.cor!
e.runtim
e@default:true,org.eclipse.cdt.ui@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.wst.server.ui@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.security.ui@default:default,org.apache.xml.serializer@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.wst.jsdt.manipulation@default:default,com.ibm.icu@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.jem.util@default:default,org.eclipse.cdt.core@default:default,org.eclipse.pde.build@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.p2.metadata.repository@!
default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.equinox.p2.engine@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.jdt.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.databinding.property@default:default,org.hamcrest.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.help.base@default:default,javax.servlet.jsp@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.touchp!
oint.eclipse@default:default,org.eclipse.osgi.util@default:def!
ault,org
.eclipse.core.variables@default:default,org.eclipse.emf.edit@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.osgi@-1:true,org.eclipse.jst.j2ee.core@default:default,org.eclipse.sdk@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.jem@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.apache.commons.net@default:default,org.eclipse.ui.navigator.resources@default:default,org.jboss.ide.eclipse.as.rse.ui@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.core.jobs@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.jface.text@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,or!
g.eclipse.jem.proxy@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.ecore.xmi@default:default,org.apache.jasper@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.ant.core@default:default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.text@default:default,org.eclipse.emf.codegen@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.eclipse.ui.workbench@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ui.forms@default:default,org.eclipse.update.configurator@3:true,org.eclipse.debug.core@default:default,org.eclipse.osgi.services@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.core@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="true"/>
+<booleanAttribute key="tracing" value="false"/>
<mapAttribute key="tracingOptions">
<mapEntry key="com.ibm.datatools.core.ui/debug" value="true"/>
<mapEntry key="com.ibm.datatools.core.ui/editor/log" value="true"/>
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26579 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-15 13:32:07 -0500 (Mon, 15 Nov 2010)
New Revision: 26579
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
Log:
[JBIDE-7581] renamed method
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-11-15 18:31:47 UTC (rev 26578)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-11-15 18:32:07 UTC (rev 26579)
@@ -108,7 +108,7 @@
} catch (Exception e) {
// do nothing
} finally {
- cloud.addReplaceInstance(instance);
+ cloud.replaceInstance(instance);
cloud.removeActionJob(instanceId, this);
String hostname = instance.getHostName();
Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
15 years, 5 months
- 1
- 0
JBoss Tools SVN: r26578 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-15 13:31:47 -0500 (Mon, 15 Nov 2010)
New Revision: 26578
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
Log:
[JBIDE-7581] removed debugging code
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-11-15 18:31:16 UTC (rev 26577)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-11-15 18:31:47 UTC (rev 26578)
@@ -242,7 +242,6 @@
nameText = new Text(container, SWT.BORDER | SWT.SINGLE);
nameText.addModifyListener(textListener);
- nameText.setBackground(nameText.getDisplay().getSystemColor(SWT.COLOR_RED));
DeltaCloudRealm[] realms = cloud.getRealms();
realmIds = new ArrayList<String>();
15 years, 5 months
- 1
- 0