Author: dgeraskov Date: 2010-01-12 08:53:39 -0500 (Tue, 12 Jan 2010) New Revision: 19711 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-5570 Copy full hibernate.properties from seamgen. Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2010-01-12 13:43:15 UTC (rev 19710) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2010-01-12 13:53:39 UTC (rev 19711) @@ -768,11 +768,8 @@ dataSourceDsFile = new File(seamGenResFolder, "datasource-ds.xml"); //$NON-NLS-1$ componentsFile = new File(seamGenResFolder, "WEB-INF/components" + (isWarConfiguration(model) ? "-war" : "") + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - try { - hibernateConsolePropsFile = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "hibernatetools/hibernate-console.properties"); //$NON-NLS-1$ - } catch (IOException e) { - SeamCorePlugin.getPluginLog().logError(e); - } + hibernateConsolePropsFile = new File(seamGenHomeFolder, "hibernatetools/hibernate-console.properties"); //$NON-NLS-1$ + /*if (jpaVersion != null) { IScopeContext context = new ProjectScope(project); IEclipsePreferences prefs = context.getNode("org.eclipse.jpt.core"); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2010-01-12 13:43:15 UTC (rev 19710) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2010-01-12 13:53:39 UTC (rev 19711) @@ -137,10 +137,10 @@ try { hibernateConsoleLaunchFile = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "hibernatetools/hibernate-console.launch"); - hibernateConsolePropsFile = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "hibernatetools/hibernate-console.properties"); //$NON-NLS-1$ } catch (IOException e) { SeamCorePlugin.getPluginLog().logError(e); } + hibernateConsolePropsFile = new File(seamGenHomeFolder, "hibernatetools/hibernate-console.properties"); //$NON-NLS-1$ //hibernateConsoleLaunchFile = new File(seamGenHomeFolder, "hibernatetools/hibernate-console.launch"); //$NON-NLS-1$ dataSourceDsFile = new File(seamGenResFolder, "datasource-ds.xml"); //$NON-NLS-1$ 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 2010-01-12 13:43:15 UTC (rev 19710) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2010-01-12 13:53:39 UTC (rev 19711) @@ -115,7 +115,7 @@ // Database group private IFieldEditor connProfileSelEditor; - //private IFieldEditor jBossHibernateDbTypeEditor ; + private IFieldEditor jBossHibernateDbTypeEditor ; private IFieldEditor dbSchemaName; @@ -284,11 +284,11 @@ model.setStringProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, getJpaConnectionProfile()); } - /*if (jBossHibernateDbTypeEditor != null) { + if (jBossHibernateDbTypeEditor != null) { SeamCorePlugin.getDefault().getPluginPreferences().setValue( SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE, this.jBossHibernateDbTypeEditor.getValueAsString()); - }*/ + } SeamCorePlugin.getDefault().getPluginPreferences().setValue( SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS, @@ -399,6 +399,13 @@ databaseGroup.setText(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE); gridLayout = new GridLayout(4, false); databaseGroup.setLayout(gridLayout); + + jBossHibernateDbTypeEditor = IFieldEditorFactory.INSTANCE + .createComboEditor(ISeamFacetDataModelProperties.DB_TYPE, + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_TYPE, + Arrays.asList(HIBERNATE_HELPER.getDialectNames()), + getDefaultDbType(), false); + registerEditor(jBossHibernateDbTypeEditor, databaseGroup, 4); createDatabaseGoupControl(); @@ -506,7 +513,7 @@ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME, ""); //$NON-NLS-1$ - /*jBossHibernateDbTypeEditor + jBossHibernateDbTypeEditor .addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { SeamInstallWizardPage.this.model @@ -516,7 +523,7 @@ .getNewValue().toString())); } }); - registerEditor(jBossHibernateDbTypeEditor, databaseGroup, 4);*/ + //registerEditor(jBossHibernateDbTypeEditor, databaseGroup, 4); registerEditor(connProfileSelEditor, databaseGroup, 4); registerEditor(dbSchemaName, databaseGroup, 4); registerEditor(dbCatalogName, databaseGroup, 4);