Author: dgolovin Date: 2007-09-24 21:04:48 -0400 (Mon, 24 Sep 2007) New Revision: 3779 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.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/SeamFacetInstallDataModelProvider.java 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/SeamFacetPreferenceInitializer.java trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/.project trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/.project Log: fix for http://jira.jboss.com/jira/browse/JBIDE-917 and http://jira.jboss.com/jira/browse/JBIDE-937 user can create any kind of DB connection validation forprofile driver class attribute added, to check press Edit... show driver properties and clean driver class name attribute Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java 2007-09-24 22:00:03 UTC (rev 3778) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java 2007-09-25 01:04:48 UTC (rev 3779) @@ -18,13 +18,21 @@ * */ public class SeamFacetPreference { - public static final String SEAM_RUNTIME_NAME = SeamCorePlugin.PLUGIN_ID + ".project.facet.runtime.name"; - public static final String SEAM_DEFAULT_CONNECTION_PROFILE = SeamCorePlugin.PLUGIN_ID + ".project.facet.default.conn.profile"; - public static final String RUNTIME_CONFIG_FORMAT_VERSION = SeamCorePlugin.PLUGIN_ID + ".runtime.config.format.version"; - public static final String RUNTIME_LIST = SeamCorePlugin.PLUGIN_ID+".runtime.list"; - public static final String RUNTIME_DEFAULT = SeamCorePlugin.PLUGIN_ID+".runtime.default"; + public static final String SEAM_DEFAULT_RUNTIME_NAME + = SeamCorePlugin.PLUGIN_ID + ".project.facet.default.runtime.name"; + public static final String SEAM_DEFAULT_CONNECTION_PROFILE + = SeamCorePlugin.PLUGIN_ID + ".project.facet.default.conn.profile"; + public static final String RUNTIME_CONFIG_FORMAT_VERSION + = SeamCorePlugin.PLUGIN_ID + ".runtime.config.format.version"; + public static final String RUNTIME_LIST + = SeamCorePlugin.PLUGIN_ID+".runtime.list"; + public static final String RUNTIME_DEFAULT + = SeamCorePlugin.PLUGIN_ID+".runtime.default"; + public static final String JBOSS_AS_DEFAULT_DEPLOY_AS + = SeamCorePlugin.PLUGIN_ID + ".project.default.deployment.type"; + public static final String HIBERNATE_DEFAULT_DB_TYPE + = SeamCorePlugin.PLUGIN_ID + ".hibernate.default.db.type"; - public static String getStringPreference(final String name) { return SeamCorePlugin.getDefault().getPreferenceStore().getString(name); } 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-09-24 22:00:03 UTC (rev 3778) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2007-09-25 01:04:48 UTC (rev 3779) @@ -42,7 +42,7 @@ public static final String DB_USER_NAME = "hibernate.connection.username"; - public static final String DB_USERP_PASSWORD = "hibernate.connection.password"; + public static final String DB_USER_PASSWORD = "hibernate.connection.password"; public static final String DB_SCHEMA_NAME = "schema.property"; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2007-09-24 22:00:03 UTC (rev 3778) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2007-09-25 01:04:48 UTC (rev 3779) @@ -61,7 +61,7 @@ names.add(ISeamFacetDataModelProperties.JDBC_URL_FOR_DB); names.add(ISeamFacetDataModelProperties.DB_USER_NAME); - names.add(ISeamFacetDataModelProperties.DB_USERP_PASSWORD); + names.add(ISeamFacetDataModelProperties.DB_USER_PASSWORD); names.add(ISeamFacetDataModelProperties.DB_SCHEMA_NAME); names.add(ISeamFacetDataModelProperties.DB_CATALOG_NAME); 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-09-24 22:00:03 UTC (rev 3778) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-09-25 01:04:48 UTC (rev 3779) @@ -44,7 +44,7 @@ props.get("org.eclipse.datatools.connectivity.db.driverClass")==null ?"":props.get("org.eclipse.datatools.connectivity.db.driverClass").toString()); - model.setProperty(ISeamFacetDataModelProperties.DB_USERP_PASSWORD, + model.setProperty(ISeamFacetDataModelProperties.DB_USER_PASSWORD, props.get("org.eclipse.datatools.connectivity.db.password")==null ?"":props.get("org.eclipse.datatools.connectivity.db.password").toString()); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2007-09-24 22:00:03 UTC (rev 3778) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2007-09-25 01:04:48 UTC (rev 3779) @@ -23,6 +23,7 @@ import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; import org.jboss.tools.seam.core.SeamCorePlugin; +import org.jboss.tools.seam.core.SeamPreferences; import org.jboss.tools.seam.core.project.facet.SeamFacetPreference; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeListConverter1; @@ -47,6 +48,9 @@ IScopeContext context = new DefaultScope(); IEclipsePreferences node = context.getNode(SeamCorePlugin.PLUGIN_ID); node.put(SeamFacetPreference.RUNTIME_CONFIG_FORMAT_VERSION, RUNTIME_CONFIG_FORMAT_VERSION); + node.put(SeamFacetPreference.SEAM_DEFAULT_CONNECTION_PROFILE, "DefaultDS"); + node.put(SeamFacetPreference.JBOSS_AS_DEFAULT_DEPLOY_AS, "war"); + node.put(SeamFacetPreference.HIBERNATE_DEFAULT_DB_TYPE, "HSQL"); initializeDefault(node,getSeamGenBuildPath()); } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/.project =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/.project 2007-09-24 22:00:03 UTC (rev 3778) +++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/ear/.project 2007-09-25 01:04:48 UTC (rev 3779) @@ -17,14 +17,8 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.jboss.ide.eclipse.archives.core.archivesBuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> - <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> </natures> Modified: trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/.project =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/.project 2007-09-24 22:00:03 UTC (rev 3778) +++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/ejb/.project 2007-09-25 01:04:48 UTC (rev 3779) @@ -27,7 +27,6 @@ </buildCommand> </buildSpec> <natures> - <nature>org.jboss.ide.eclipse.archives.core.archivesNature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>