JBoss Tools SVN: r4607 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-10-31 16:46:50 -0400 (Wed, 31 Oct 2007)
New Revision: 4607
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
jbide-1047 renamed rhdsTemp to jbosstoolsTemp as per max's request
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2007-10-31 18:52:28 UTC (rev 4606)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2007-10-31 20:46:50 UTC (rev 4607)
@@ -361,7 +361,7 @@
jreValLabel.setText(install.getInstallLocation().getAbsolutePath() + " (" + install.getName() + ")");
runtimeGroup.layout();
String p = rwc.getLocation().append( "server").append(configValLabel.getText()).append("deploy").toOSString();
- deployTmpFolderVal = rwc.getLocation().append( "server").append(configValLabel.getText()).append("tmp").append("rhdsTemp").toOSString();
+ deployTmpFolderVal = rwc.getLocation().append( "server").append(configValLabel.getText()).append("tmp").append("jbosstoolsTemp").toOSString();
deployText.setText(p);
deployVal = p;
deployGroup.layout();
17 years, 1 month
JBoss Tools SVN: r4606 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 14:52:28 -0400 (Wed, 31 Oct 2007)
New Revision: 4606
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java
Log:
fixed NPE when deleting/editing console configs
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java 2007-10-31 18:52:14 UTC (rev 4605)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/KnownConfigurationsTest.java 2007-10-31 18:52:28 UTC (rev 4606)
@@ -37,7 +37,7 @@
fail("no sf should be closed!");
}
- public void configurationRemoved(ConsoleConfiguration root) {
+ public void configurationRemoved(ConsoleConfiguration root, boolean forUpdate) {
if(!added.remove(root)) {
fail("trying to remove a non existing console");
}
17 years, 1 month
JBoss Tools SVN: r4605 - in trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console: node and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 14:52:14 -0400 (Wed, 31 Oct 2007)
New Revision: 4605
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurationsListener.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationListNode.java
Log:
fixed NPE when deleting/editing console configs
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java 2007-10-31 18:32:51 UTC (rev 4604)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurations.java 2007-10-31 18:52:14 UTC (rev 4605)
@@ -164,19 +164,20 @@
ConsoleConfiguration[] cfgs = getConfigurations();
for (int i = 0; i < cfgs.length; i++) {
ConsoleConfiguration configuration = cfgs[i];
- removeConfiguration(configuration);
+ removeConfiguration(configuration, false);
}
}
- public void removeConfiguration(final ConsoleConfiguration configuration) {
+ // added forUpdate as a workaround for letting listeners know it is done to update the configuration so they don't cause removal issues.
+ public void removeConfiguration(final ConsoleConfiguration configuration, final boolean forUpdate) {
ConsoleConfiguration oldConfig = (ConsoleConfiguration) getRepositoriesMap().remove(configuration.getName() );
if (oldConfig != null) {
oldConfig.removeConsoleConfigurationListener(sfListener);
fireNotification(new Notification() {
public void notify(KnownConfigurationsListener listener) {
- listener.configurationRemoved(configuration);
+ listener.configurationRemoved(configuration, forUpdate);
}
});
oldConfig.reset();
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurationsListener.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurationsListener.java 2007-10-31 18:32:51 UTC (rev 4604)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/KnownConfigurationsListener.java 2007-10-31 18:52:14 UTC (rev 4605)
@@ -31,5 +31,5 @@
public void sessionFactoryClosing(ConsoleConfiguration configuration, SessionFactory closingFactory);
- public void configurationRemoved(ConsoleConfiguration root);
+ public void configurationRemoved(ConsoleConfiguration root, boolean forUpdate);
}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationListNode.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationListNode.java 2007-10-31 18:32:51 UTC (rev 4604)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/ConfigurationListNode.java 2007-10-31 18:52:14 UTC (rev 4605)
@@ -52,7 +52,7 @@
childrenCreated=false;
}
- public void configurationRemoved(ConsoleConfiguration root) {
+ public void configurationRemoved(ConsoleConfiguration root, boolean forUpdate) {
markChildrenForReload();
}
17 years, 1 month
JBoss Tools SVN: r4604 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-31 14:32:51 -0400 (Wed, 31 Oct 2007)
New Revision: 4604
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1228
dialect combo removed from page
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-31 18:30:34 UTC (rev 4603)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-31 18:32:51 UTC (rev 4604)
@@ -103,7 +103,7 @@
.createComboEditor(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DEPLOY_AS, Arrays.asList(new String[] { SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_WAR, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_EAR }),
- getDeployAsDefaultValue(), true);
+ getDeployAsDefaultValue(), false);
String lastCreatedCPName = ""; //$NON-NLS-1$
@@ -123,12 +123,6 @@
SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE, Arrays.asList(HIBERNATE_HELPER
.getDialectNames()), getDefaultDbType(), false);
- private IFieldEditor jBossHibernateDialectEditor = IFieldEditorFactory.INSTANCE
- .createComboEditor(
- ISeamFacetDataModelProperties.HIBERNATE_DIALECT,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_HIBERNATE_DIALECT,DIALECT_CLASSES, HIBERNATE_HELPER
- .getDialectClass(getDefaultDbType()),true);
-
private IFieldEditor dbSchemaName = IFieldEditorFactory.INSTANCE.createTextEditor(
ISeamFacetDataModelProperties.DB_SCHEMA_NAME,
SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME, ""); //$NON-NLS-1$
@@ -338,7 +332,6 @@
gridLayout = new GridLayout(4, false);
databaseGroup.setLayout(gridLayout);
registerEditor(jBossHibernateDbTypeEditor, databaseGroup, 4);
- registerEditor(jBossHibernateDialectEditor, databaseGroup, 4);
registerEditor(connProfileSelEditor, databaseGroup, 4);
registerEditor(dbSchemaName, databaseGroup, 4);
registerEditor(dbCatalogName, databaseGroup, 4);
@@ -392,8 +385,8 @@
jBossHibernateDbTypeEditor
.addPropertyChangeListener(new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
- jBossHibernateDialectEditor.setValue(HIBERNATE_HELPER
- .getDialectClass(evt.getNewValue().toString()));
+ SeamInstallWizardPage.this.model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_DIALECT,
+ HIBERNATE_HELPER.getDialectClass(evt.getNewValue().toString()));
}
}
);
@@ -658,18 +651,16 @@
public void run() {
List<SeamRuntime> added = new ArrayList<SeamRuntime>();
- String seamVersion = model.getProperty(IFacetDataModelProperties.FACET_VERSION_STR).toString();
- List<SeamVersion> versians = new ArrayList<SeamVersion>(1);
- versians.add(SeamVersion.parseFromString(seamVersion));
Wizard wiz = new SeamRuntimeNewWizard((List<SeamRuntime>)
new ArrayList<SeamRuntime>(Arrays.asList(SeamRuntimeManager.getInstance().getRuntimes()))
- , added, versians);
+ ,added);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wiz);
dialog.open();
if (added.size()>0) {
SeamRuntimeManager.getInstance().addRuntime(added.get(0));
+ String seamVersion = model.getProperty(IFacetDataModelProperties.FACET_VERSION_STR).toString();
List<String> runtimes = getRuntimeNames(seamVersion);
SeamRuntime newRuntime = added.get(0);
if(seamVersion.equals(newRuntime.getVersion().toString())) {
@@ -679,7 +670,7 @@
}
}
}
-
+
public class ConnectionProfileChangeListener implements IProfileListener {
/* (non-Javadoc)
* @see org.eclipse.datatools.connectivity.IProfileListener#profileAdded(org.eclipse.datatools.connectivity.IConnectionProfile)
17 years, 1 month
JBoss Tools SVN: r4603 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-31 14:30:34 -0400 (Wed, 31 Oct 2007)
New Revision: 4603
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1228
dialect combo removed from page
http://jira.jboss.org/jira/browse/JBIDE-1198
ds.xml now is placed in resources folder and published by JBoss AS adapter. So you can see ds.xml in server view for WAR and EAR deployment configuration
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java 2007-10-31 18:10:04 UTC (rev 4602)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java 2007-10-31 18:30:34 UTC (rev 4603)
@@ -22,6 +22,7 @@
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.eclipse.wst.server.core.IModule;
@@ -36,44 +37,30 @@
/**
* This class is provided to deploy data source descriptor to JBoss AS for Seam
- * Web Project in WAR deployment configuration.
+ * Web Project in WAR and EAR deployment configurations.
*
* @author eskimo
*
*/
public class DataSourceXmlDeployer extends Job {
IProject project = null;
-
- public DataSourceXmlDeployer(IProject project) {
+ IServer s = null;
+ IPath deploy = null;
+ public DataSourceXmlDeployer(IProject project, IServer s, IPath deploy) {
super(SeamCoreMessages.DATA_SOURCE_XML_DEPLOYER_DEPLOYING_DATASOURCE_TO_SERVER);
this.project = project;
+ // is must be user since ds.xml has the same behaviour for EAR
+ // deployment. It should run after ear project created and imported into
+ // workspace
+ setUser(true);
+ setRule(project);
+ this.s = s;
+ this.deploy = deploy;
}
@Override
protected IStatus run(IProgressMonitor monitor) {
- IFacetedProject facetedProject;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e) {
- return new Status(Status.WARNING, SeamCorePlugin.PLUGIN_ID,
- SeamCoreMessages.DATA_SOURCE_XML_DEPLOYER_NO_SERVER_SELECTED_TO_DEPLOY_DATASOURCE_TO);
- }
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime primaryRuntime = facetedProject
- .getPrimaryRuntime();
- IServer s = null;
- IServer[] servers = ServerCore.getServers();
- for (IServer server : servers) {
- String primaryName = primaryRuntime.getName();
- IRuntime runtime = server.getRuntime();
- if (runtime != null) {
- String serverName = runtime.getName();
- if (primaryName.equals(serverName)) {
- s = server;
- }
- }
- }
-
if (s == null) {
return new Status(Status.WARNING, SeamCorePlugin.PLUGIN_ID,
SeamCoreMessages.DATA_SOURCE_XML_DEPLOYER_NO_SERVER_SELECTED_TO_DEPLOY_DATASOURCE_TO);
@@ -88,18 +75,10 @@
SeamCoreMessages.DATA_SOURCE_XML_DEPLOYER_SERVER_DID_NOT_SUPPORT_DEPLOY_OF_DATASOURCE);
}
- IVirtualComponent com = ComponentCore.createComponent(project);
- final IVirtualFolder srcRootFolder = com.getRootFolder().getFolder(
- new Path("/WEB-INF/classes")); //$NON-NLS-1$
- IContainer underlyingFolder = srcRootFolder.getUnderlyingFolder();
-
IPath projectPath = new Path("/" //$NON-NLS-1$
- + underlyingFolder.getProject().getName());
- IPath projectRelativePath = new Path("src/model"); //$NON-NLS-1$
+ + project.getName());
+ IPath append = projectPath.append(deploy); //$NON-NLS-1$
- IPath append = projectPath.append(projectRelativePath).append(
- project.getName() + "-ds.xml"); //$NON-NLS-1$
-
if (SingleDeployableFactory.makeDeployable(append)) {
IModule module = SingleDeployableFactory.findModule(append);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2007-10-31 18:10:04 UTC (rev 4602)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2007-10-31 18:30:34 UTC (rev 4603)
@@ -86,5 +86,8 @@
public static final String DEPLOY_AS_EAR = "ear"; //$NON-NLS-1$
public static final String JBOSS_AS_TARGET_SERVER = "seam.project.deployment.target"; //$NON-NLS-1$
+
public static final String JBOSS_AS_TARGET_RUNTIME = "seam.project.deployment.runtime"; //$NON-NLS-1$
+
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2007-10-31 18:10:04 UTC (rev 4602)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2007-10-31 18:30:34 UTC (rev 4603)
@@ -339,9 +339,10 @@
new File(srcFolder,"META-INF/persistence.xml"), //$NON-NLS-1$
viewFilterSetCollection, true);
+ File resources = new File(project.getLocation().toFile(),"resources");
AntCopyUtils.copyFileToFile(
dataSourceDsFile,
- new File(srcFolder,project.getName()+"-ds.xml"), //$NON-NLS-1$
+ new File(resources,project.getName()+"-ds.xml"), //$NON-NLS-1$
viewFilterSetCollection, true);
AntCopyUtils.copyFileToFile(
@@ -356,11 +357,6 @@
WtpUtils.setClasspathEntryAsExported(project, new Path("org.eclipse.jst.j2ee.internal.web.container"), monitor); //$NON-NLS-1$
- Job create = new DataSourceXmlDeployer(project);
- create.setUser(true);
- create.setRule(ResourcesPlugin.getWorkspace().getRoot());
- create.schedule();
-
} else {
model.setProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, project.getName()+"-ejb"); //$NON-NLS-1$
model.setProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT, project.getName()+"-ear"); //$NON-NLS-1$
@@ -417,9 +413,10 @@
// ********************************************************************************************
AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"seam.properties"), new File(ejb,"ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$
+ File resources = new File(ear,"resources");
AntCopyUtils.copyFileToFile(
dataSourceDsFile,
- new File(ejb,"ejbModule/"+project.getName()+"-ds.xml"), //$NON-NLS-1$ //$NON-NLS-2$
+ new File(resources,project.getName()+"-ds.xml"), //$NON-NLS-1$ //$NON-NLS-2$
viewFilterSetCollection, true);
AntCopyUtils.copyFileToFolder(
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2007-10-31 18:10:04 UTC (rev 4602)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2007-10-31 18:30:34 UTC (rev 4603)
@@ -332,9 +332,10 @@
new File(srcFolder,"META-INF/persistence.xml"), //$NON-NLS-1$
viewFilterSetCollection, true);
+ File resources = new File(project.getLocation().toFile(),"resources");
AntCopyUtils.copyFileToFile(
dataSourceDsFile,
- new File(srcFolder,project.getName()+"-ds.xml"), //$NON-NLS-1$
+ new File(resources,project.getName()+"-ds.xml"), //$NON-NLS-1$
viewFilterSetCollection, true);
AntCopyUtils.copyFileToFile(
@@ -349,11 +350,6 @@
WtpUtils.setClasspathEntryAsExported(project, new Path("org.eclipse.jst.j2ee.internal.web.container"), monitor); //$NON-NLS-1$
- Job create = new DataSourceXmlDeployer(project);
- create.setUser(true);
- create.setRule(ResourcesPlugin.getWorkspace().getRoot());
- create.schedule();
-
} else {
model.setProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, project.getName()+"-ejb"); //$NON-NLS-1$
model.setProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT, project.getName()+"-ear"); //$NON-NLS-1$
@@ -410,10 +406,7 @@
// ********************************************************************************************
AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"seam.properties"), new File(ejb,"ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$
- AntCopyUtils.copyFileToFile(
- dataSourceDsFile,
- new File(ejb,"ejbModule/"+project.getName()+"-ds.xml"), //$NON-NLS-1$ //$NON-NLS-2$
- viewFilterSetCollection, true);
+
AntCopyUtils.copyFileToFolder(
new File(seamGenResFolder,"META-INF/ejb-jar.xml"), //$NON-NLS-1$
@@ -461,6 +454,13 @@
AntCopyUtils.copyFiles(seamLibFolder,earContentsFolder,new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)));
AntCopyUtils.copyFiles(seamGenResFolder,earContentsFolder,new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamGenResFolder)));
+
+ File resources = new File(ear,"resources");
+ AntCopyUtils.copyFileToFile(
+ dataSourceDsFile,
+ new File(resources,project.getName()+"-ds.xml"), //$NON-NLS-1$ //$NON-NLS-2$
+ viewFilterSetCollection, true);
+
try {
File[] earJars = earContentsFolder.listFiles(new FilenameFilter() {
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java 2007-10-31 18:10:04 UTC (rev 4602)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java 2007-10-31 18:30:34 UTC (rev 4603)
@@ -16,8 +16,10 @@
import org.apache.tools.ant.types.FilterSet;
import org.apache.tools.ant.types.FilterSetCollection;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -35,6 +37,7 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.tools.common.util.ResourcesUtils;
import org.jboss.tools.jst.web.server.RegistrationHelper;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.osgi.service.prefs.BackingStoreException;
@@ -58,10 +61,20 @@
if( jbs != null ) {
String[] driverJars = (String[])model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH);
String configFolder = jbs.getConfigDirectory();
- AntCopyUtils.copyFiles(driverJars, new File(configFolder,"lib"));
+ AntCopyUtils.copyFiles(driverJars, new File(configFolder,"lib"),false);
}
if (server != null) {
RegistrationHelper.runRegisterInServerJob(project, server);
+
+ IPath filePath = new Path("resources").append(project.getName() + "-ds.xml");
+
+ if(!isWarConfiguration(model)) {
+ IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
+ IProject earProjectToBeImported = wsRoot.getProject(project.getName()+"-ear");
+ new DataSourceXmlDeployer(earProjectToBeImported,server,filePath).schedule();
+ } else {
+ new DataSourceXmlDeployer(project,server,filePath).schedule();
+ }
}
}
@@ -70,4 +83,8 @@
*/
public Object create() throws CoreException {return null; }
+ public static boolean isWarConfiguration(IDataModel model) {
+ return "war".equals(model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS)); //$NON-NLS-1$
+ }
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-10-31 18:10:04 UTC (rev 4602)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-10-31 18:30:34 UTC (rev 4603)
@@ -31,30 +31,31 @@
public void execute(IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
IDataModel model = (IDataModel)config;
- if(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE)==null) return;
- IConnectionProfile connProfile = ProfileManager.getInstance().getProfileByName(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE).toString());
- Properties props = connProfile.getBaseProperties(); //Properties("org.eclipse.datatools.connectivity.db.generic.connectionProfile");
- // Collect properties name from DTP Connection Profile
- model.setProperty(ISeamFacetDataModelProperties.DB_USER_NAME,
- props.get("org.eclipse.datatools.connectivity.db.username")==null //$NON-NLS-1$
- ?"":props.get("org.eclipse.datatools.connectivity.db.username").toString()); //$NON-NLS-1$ //$NON-NLS-2$
-
- model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME,
- props.get("org.eclipse.datatools.connectivity.db.driverClass")==null //$NON-NLS-1$
- ?"":props.get("org.eclipse.datatools.connectivity.db.driverClass").toString()); //$NON-NLS-1$ //$NON-NLS-2$
-
- model.setProperty(ISeamFacetDataModelProperties.DB_USER_PASSWORD,
- props.get("org.eclipse.datatools.connectivity.db.password")==null //$NON-NLS-1$
- ?"":props.get("org.eclipse.datatools.connectivity.db.password").toString()); //$NON-NLS-1$ //$NON-NLS-2$
-
- model.setProperty(ISeamFacetDataModelProperties.JDBC_URL_FOR_DB,
- props.get("org.eclipse.datatools.connectivity.db.URL")==null //$NON-NLS-1$
- ?"":props.get("org.eclipse.datatools.connectivity.db.URL").toString()); //$NON-NLS-1$ //$NON-NLS-2$
-
- model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH,
- DriverManager.getInstance().getDriverInstanceByID(
- props.get("org.eclipse.datatools.connectivity.driverDefinitionID").toString()).getJarListAsArray()); //$NON-NLS-1$
-
+ if(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE)!=null) {
+ IConnectionProfile connProfile = ProfileManager.getInstance().getProfileByName(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE).toString());
+ Properties props = connProfile.getBaseProperties(); //Properties("org.eclipse.datatools.connectivity.db.generic.connectionProfile");
+
+ // Collect properties name from DTP Connection Profile
+ model.setProperty(ISeamFacetDataModelProperties.DB_USER_NAME,
+ props.get("org.eclipse.datatools.connectivity.db.username")==null //$NON-NLS-1$
+ ?"":props.get("org.eclipse.datatools.connectivity.db.username").toString()); //$NON-NLS-1$ //$NON-NLS-2$
+
+ model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME,
+ props.get("org.eclipse.datatools.connectivity.db.driverClass")==null //$NON-NLS-1$
+ ?"":props.get("org.eclipse.datatools.connectivity.db.driverClass").toString()); //$NON-NLS-1$ //$NON-NLS-2$
+
+ model.setProperty(ISeamFacetDataModelProperties.DB_USER_PASSWORD,
+ props.get("org.eclipse.datatools.connectivity.db.password")==null //$NON-NLS-1$
+ ?"":props.get("org.eclipse.datatools.connectivity.db.password").toString()); //$NON-NLS-1$ //$NON-NLS-2$
+
+ model.setProperty(ISeamFacetDataModelProperties.JDBC_URL_FOR_DB,
+ props.get("org.eclipse.datatools.connectivity.db.URL")==null //$NON-NLS-1$
+ ?"":props.get("org.eclipse.datatools.connectivity.db.URL").toString()); //$NON-NLS-1$ //$NON-NLS-2$
+
+ model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH,
+ DriverManager.getInstance().getDriverInstanceByID(
+ props.get("org.eclipse.datatools.connectivity.driverDefinitionID").toString()).getJarListAsArray()); //$NON-NLS-1$
+ }
}
}
17 years, 1 month
JBoss Tools SVN: r4602 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: widget/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2007-10-31 14:10:04 -0400 (Wed, 31 Oct 2007)
New Revision: 4602
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1130 Since that user cannot create seam runtime with "wrong" version within new seam project wizard.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-31 18:05:01 UTC (rev 4601)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-31 18:10:04 UTC (rev 4602)
@@ -658,16 +658,18 @@
public void run() {
List<SeamRuntime> added = new ArrayList<SeamRuntime>();
+ String seamVersion = model.getProperty(IFacetDataModelProperties.FACET_VERSION_STR).toString();
+ List<SeamVersion> versians = new ArrayList<SeamVersion>(1);
+ versians.add(SeamVersion.parseFromString(seamVersion));
Wizard wiz = new SeamRuntimeNewWizard((List<SeamRuntime>)
new ArrayList<SeamRuntime>(Arrays.asList(SeamRuntimeManager.getInstance().getRuntimes()))
- ,added);
+ , added, versians);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wiz);
dialog.open();
if (added.size()>0) {
SeamRuntimeManager.getInstance().addRuntime(added.get(0));
- String seamVersion = model.getProperty(IFacetDataModelProperties.FACET_VERSION_STR).toString();
List<String> runtimes = getRuntimeNames(seamVersion);
SeamRuntime newRuntime = added.get(0);
if(seamVersion.equals(newRuntime.getVersion().toString())) {
@@ -677,7 +679,7 @@
}
}
}
-
+
public class ConnectionProfileChangeListener implements IProfileListener {
/* (non-Javadoc)
* @see org.eclipse.datatools.connectivity.IProfileListener#profileAdded(org.eclipse.datatools.connectivity.IConnectionProfile)
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2007-10-31 18:05:01 UTC (rev 4601)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2007-10-31 18:10:04 UTC (rev 4602)
@@ -322,10 +322,7 @@
IFieldEditor name = IFieldEditorFactory.INSTANCE.createTextEditor(
"name", SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME2, ""); //$NON-NLS-1$ //$NON-NLS-2$
- IFieldEditor version = IFieldEditorFactory.INSTANCE.createComboEditor(
- "version", SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2, Arrays.asList( //$NON-NLS-1$
- new String[]{SeamVersion.SEAM_1_2.toString(), SeamVersion.SEAM_2_0.toString()}),
- SeamVersion.SEAM_1_2.toString(), false);
+ IFieldEditor version = null;
IFieldEditor homeDir = IFieldEditorFactory.INSTANCE.createBrowseFolderEditor(
"homeDir", SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_HOME_FOLDER, ""); //$NON-NLS-1$ //$NON-NLS-2$
@@ -338,13 +335,33 @@
* @param style
*/
public SeamRuntimeWizardPage(List<SeamRuntime> editedList) {
+ this(editedList, null);
+ }
+
+ /**
+ * @param parent
+ * @param style
+ */
+ public SeamRuntimeWizardPage(List<SeamRuntime> editedList, List<SeamVersion> validSeamVersions) {
super(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME);
+ if(validSeamVersions==null) {
+ this.version = IFieldEditorFactory.INSTANCE.createComboEditor(
+ "version", SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2, Arrays.asList( //$NON-NLS-1$
+ new String[]{SeamVersion.SEAM_1_2.toString(), SeamVersion.SEAM_2_0.toString()}),
+ SeamVersion.SEAM_1_2.toString(), false);
+ } else {
+ this.version = IFieldEditorFactory.INSTANCE.createComboEditor(
+ "version", SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_VERSION2, validSeamVersions,
+ SeamVersion.SEAM_1_2.toString(), false);
+ }
+
setMessage(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_CREATE_A_SEAM_RUNTIME);
setTitle(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_SEAM_RUNTIME);
setImageDescriptor(ImageDescriptor.createFromFile(
SeamFormWizard.class, "SeamWebProjectWizBan.png")); //$NON-NLS-1$
value = editedList;
}
+
/**
*
*/
@@ -478,14 +495,19 @@
SeamRuntimeWizardPage page1 = null;
List<SeamRuntime> added = null;
List<SeamRuntime> value = null;
- public SeamRuntimeNewWizard(List<SeamRuntime> value, List<SeamRuntime> added) {
+
+ public SeamRuntimeNewWizard(List<SeamRuntime> value, List<SeamRuntime> added, List<SeamVersion> validSeamVersions) {
super();
setWindowTitle(SeamUIMessages.SEAM_RUNTIME_LIST_FIELD_EDITOR_NEW_SEAM_RUNTIME);
- page1 = new SeamRuntimeWizardPage(value);
+ page1 = new SeamRuntimeWizardPage(value, validSeamVersions);
addPage(page1);
this.value = value;
this.added = added;
}
+
+ public SeamRuntimeNewWizard(List<SeamRuntime> value, List<SeamRuntime> added) {
+ this(value, added, null);
+ }
@Override
public boolean performFinish() {
17 years, 1 month
JBoss Tools SVN: r4601 - trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-31 14:05:01 -0400 (Wed, 31 Oct 2007)
New Revision: 4601
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF
Log:
Unused dependency to vpe is removedd
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF 2007-10-31 17:47:23 UTC (rev 4600)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/META-INF/MANIFEST.MF 2007-10-31 18:05:01 UTC (rev 4601)
@@ -27,13 +27,12 @@
org.eclipse.ui.ide,
org.eclipse.ui.workbench.texteditor,
org.eclipse.core.expressions,
- org.eclipse.ui.views,
+ org.eclipse.ui.views,
org.jboss.tools.common.model,
org.jboss.tools.common.model.ui,
org.jboss.tools.common.text.xml,
org.jboss.tools.jst.web,
org.jboss.tools.jst.web.ui,
- org.jboss.tools.vpe,
org.jboss.tools.seam.xml
Bundle-Version: 2.0.0
17 years, 1 month
JBoss Tools SVN: r4600 - trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-31 13:47:23 -0400 (Wed, 31 Oct 2007)
New Revision: 4600
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java
Log:
Fix JUnit test error. Browser view is not showed by default
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java 2007-10-31 17:02:41 UTC (rev 4599)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java 2007-10-31 17:47:23 UTC (rev 4600)
@@ -19,7 +19,6 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.WorkbenchException;
import org.jboss.tools.common.model.ui.views.palette.PaletteViewPart;
-import org.jboss.tools.jst.web.ui.BrowserView;
import org.jboss.tools.jst.web.ui.WebDevelopmentPerspectiveFactory;
import org.jboss.tools.jst.web.ui.navigator.WebProjectsNavigator;
@@ -59,13 +58,6 @@
fail("Cannot show perspective '" +WebDevelopmentPerspectiveFactory.PERSPECTIVE_ID + "'");
}
}
- /**
- *
- */
- public void testBrowserViewIsShowed() {
- IViewPart browserView = findView(BrowserView.ID);
- assertNotNull("Browser View hasn't been loaded",browserView);
- }
public void testWebProjectsViewIsShowed() {
IViewPart webProjectsView = findView(WebProjectsNavigator.VIEW_ID);
17 years, 1 month
JBoss Tools SVN: r4599 - in trunk: jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2007-10-31 13:02:41 -0400 (Wed, 31 Oct 2007)
New Revision: 4599
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/ImportProjectWizard.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/ImportProjectWizard.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1235
"org.jboss.tools.jst.web.ui.RedHat4WebPerspective" -> "org.jboss.tools.jst.web.ui.WebDevelopmentPerspective"
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/plugin.xml
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/plugin.xml 2007-10-31 16:36:44 UTC (rev 4598)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.view/plugin.xml 2007-10-31 17:02:41 UTC (rev 4599)
@@ -15,7 +15,7 @@
<view id="org.jboss.tools.hibernate.view.views.ExplorerClass" moveable="true" ratio="0.50" relationship="stack" relative="org.eclipse.jdt.ui.PackageExplorer" visible="true"/>
<view id="org.jboss.tools.hibernate.view.views.ExplorerBase" moveable="true" ratio="0.50" relationship="stack" relative="org.eclipse.ui.views.ContentOutline" visible="true"/>
</perspectiveExtension>
- <perspectiveExtension targetID="org.jboss.tools.jst.web.ui.RedHat4WebPerspective">
+ <perspectiveExtension targetID="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective">
<showInPart id="org.jboss.tools.hibernate.view.views.ExplorerClass"/>
<viewShortcut id="org.jboss.tools.hibernate.view.views.ExplorerClass"/>
<viewShortcut id="org.jboss.tools.hibernate.view.views.ExplorerBase"/>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/ImportProjectWizard.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/ImportProjectWizard.java 2007-10-31 16:36:44 UTC (rev 4598)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/project/ImportProjectWizard.java 2007-10-31 17:02:41 UTC (rev 4599)
@@ -41,7 +41,7 @@
}
protected String getFinalPerspective() {
- return "org.jboss.tools.jst.web.ui.RedHat4WebPerspective";
+ return "org.jboss.tools.jst.web.ui.WebDevelopmentPerspective";
}
protected boolean checkOldVersion() {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2007-10-31 16:36:44 UTC (rev 4598)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2007-10-31 17:02:41 UTC (rev 4599)
@@ -120,7 +120,7 @@
}
protected String getFinalPerspective() {
- return "org.jboss.tools.jst.web.ui.RedHat4WebPerspective"; //$NON-NLS-1$
+ return "org.jboss.tools.jst.web.ui.WebDevelopmentPerspective"; //$NON-NLS-1$
}
private boolean checkServletVersion() {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java 2007-10-31 16:36:44 UTC (rev 4598)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java 2007-10-31 17:02:41 UTC (rev 4599)
@@ -87,7 +87,7 @@
}
protected String getFinalPerspective() {
- return "org.jboss.tools.jst.web.ui.RedHat4WebPerspective";
+ return "org.jboss.tools.jst.web.ui.WebDevelopmentPerspective";
}
private class ConfigurationElementInternal implements IConfigurationElement {
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/ImportProjectWizard.java
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/ImportProjectWizard.java 2007-10-31 16:36:44 UTC (rev 4598)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/wizard/project/ImportProjectWizard.java 2007-10-31 17:02:41 UTC (rev 4599)
@@ -44,7 +44,7 @@
}
protected String getFinalPerspective() {
- return "org.jboss.tools.jst.web.ui.RedHat4WebPerspective";
+ return "org.jboss.tools.jst.web.ui.WebDevelopmentPerspective";
}
protected IRunnableWithProgress createOperation() {
17 years, 1 month
JBoss Tools SVN: r4598 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-10-31 12:36:44 -0400 (Wed, 31 Oct 2007)
New Revision: 4598
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BasicWorkbenchAdapter.java
Log:
JBIDE-618: bad exception dialog when cfg.xml not found
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BasicWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BasicWorkbenchAdapter.java 2007-10-31 16:04:44 UTC (rev 4597)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BasicWorkbenchAdapter.java 2007-10-31 16:36:44 UTC (rev 4598)
@@ -95,18 +95,27 @@
collector.add(getChildren(object, monitor), monitor);
collector.done();
} catch(Exception e) {
- handleError(collector,e);
+ handleError(collector,object, e);
} finally {
collector.done();
monitor.done();
}
}
- protected void handleError(IElementCollector collector, Exception e) {
+ protected void handleError(IElementCollector collector, Object object, Exception e) {
HibernateConsolePlugin.getDefault().logMessage(IStatus.WARNING, e.toString(), e);
- HibernateConsolePlugin.openError(null, "Lazy tree error", "Error while fetching children", e, HibernateConsolePlugin.PERFORM_SYNC_EXEC);
+ HibernateConsolePlugin.openError(null, getDefaultErrorTitle(), getDefaultErrorMessage(object), e, HibernateConsolePlugin.PERFORM_SYNC_EXEC);
}
+ private String getDefaultErrorMessage(Object object) {
+ return "Error while expanding " + getLabel(object);
+ }
+
+
+ private String getDefaultErrorTitle() {
+ return "Hibernate Configuration error";
+ }
+
public boolean isContainer() {
return true;
}
17 years, 1 month