Author: akazakov Date: 2008-10-14 13:02:08 -0400 (Tue, 14 Oct 2008) New Revision: 10835 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/SeamFacetInstallDataModelProvider.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.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java Log: https://jira.jboss.org/jira/browse/JBIDE-2731 2.1 and 2.2 are done 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 2008-10-14 16:53:33 UTC (rev 10834) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-10-14 17:02:08 UTC (rev 10835) @@ -13,6 +13,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Properties; @@ -35,6 +36,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; +import org.eclipse.datatools.connectivity.IConnectionProfile; +import org.eclipse.datatools.connectivity.ProfileManager; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jst.common.project.facet.core.ClasspathHelper; import org.eclipse.jst.j2ee.model.IModelProvider; @@ -56,6 +59,7 @@ import org.eclipse.jst.javaee.web.WebResourceCollection; import org.eclipse.swt.widgets.Display; import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -67,6 +71,7 @@ import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCoreMessages; import org.jboss.tools.seam.core.SeamCorePlugin; +import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; import org.osgi.service.prefs.BackingStoreException; @@ -302,25 +307,30 @@ webLibFolder = new File(webContentFolder, WEB_LIBRARIES_RELATED_PATH); srcFolder = isWarConfiguration(model) ? new File(srcRootFolder.getUnderlyingFolder().getLocation().toFile(), "model") : srcRootFolder.getUnderlyingFolder().getLocation().toFile(); //$NON-NLS-1$ Object runtimeName = model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME); - final SeamRuntime selectedRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(runtimeName.toString()); + if(runtimeName!=null) { + final SeamRuntime selectedRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(runtimeName.toString()); - seamHomePath = selectedRuntime.getHomeDir(); + seamHomePath = selectedRuntime.getHomeDir(); - seamHomeFolder = new File(seamHomePath); - seamLibFolder = new File(seamHomePath, SEAM_LIB_RELATED_PATH); - seamGenResFolder = new File(seamHomePath, "seam-gen/resources"); //$NON-NLS-1$ + seamHomeFolder = new File(seamHomePath); + seamLibFolder = new File(seamHomePath, SEAM_LIB_RELATED_PATH); + seamGenResFolder = new File(seamHomePath, "seam-gen/resources"); //$NON-NLS-1$ - seamGenHomeFolder = new File(seamHomePath, "seam-gen"); //$NON-NLS-1$ - seamGenViewSource = new File(seamGenHomeFolder, "view"); //$NON-NLS-1$ - 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$ + seamGenHomeFolder = new File(seamHomePath, "seam-gen"); //$NON-NLS-1$ + seamGenViewSource = new File(seamGenHomeFolder, "view"); //$NON-NLS-1$ + 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$ - hibernateConsoleLaunchFile = new File(seamGenHomeFolder, "hibernatetools/hibernate-console.launch"); //$NON-NLS-1$ - hibernateConsolePropsFile = new File(seamGenHomeFolder, "hibernatetools/hibernate-console.properties"); //$NON-NLS-1$ - //final File hibernateConsolePref = new File(seamGenHomeFolder, "hibernatetools/.settings/org.hibernate.eclipse.console.prefs"); //$NON-NLS-1$ - persistenceFile = new File(seamGenResFolder, "META-INF/persistence-" + (isWarConfiguration(model) ? DEV_WAR_PROFILE : DEV_EAR_PROFILE) + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$ + hibernateConsoleLaunchFile = new File(seamGenHomeFolder, "hibernatetools/hibernate-console.launch"); //$NON-NLS-1$ + hibernateConsolePropsFile = new File(seamGenHomeFolder, "hibernatetools/hibernate-console.properties"); //$NON-NLS-1$ + //final File hibernateConsolePref = new File(seamGenHomeFolder, "hibernatetools/.settings/org.hibernate.eclipse.console.prefs"); //$NON-NLS-1$ + persistenceFile = new File(seamGenResFolder, "META-INF/persistence-" + (isWarConfiguration(model) ? DEV_WAR_PROFILE : DEV_EAR_PROFILE) + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$ - copyFilesToWarProject(project, fv, model, monitor); + copyFilesToWarProject(project, fv, model, monitor); + } else { + // If seam runtime is null then just modify web.xml and add seam nature. + configureWebXml(project); + } ClasspathHelper.addClasspathEntries(project, fv); createSeamProjectPreferenes(project, model); @@ -483,6 +493,7 @@ IProjectFacetVersion ejbVersion = facetedProject.getProjectFacetVersion(IJ2EEFacetConstants.EJB_FACET); IProjectFacetVersion webVersion = facetedProject.getProjectFacetVersion(IJ2EEFacetConstants.DYNAMIC_WEB_FACET); IProjectFacetVersion earVersion = facetedProject.getProjectFacetVersion(IJ2EEFacetConstants.ENTERPRISE_APPLICATION_FACET); + initDefaultModelValues(model, webVersion!=null); if(ejbVersion!=null) { doExecuteForEjb(project, fv, model, monitor); } else if(webVersion!=null) { @@ -492,6 +503,40 @@ } } + private void initDefaultModelValues(IDataModel model, boolean warProject) { + if(model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS)==null) { + model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, warProject?ISeamFacetDataModelProperties.DEPLOY_AS_WAR:ISeamFacetDataModelProperties.DEPLOY_AS_EAR); + } + if(model.getProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME)==null) { + model.setProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, "org.domain." + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + ".session"); //$NON-NLS-1$ + } + if(model.getProperty(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME)==null) { + model.setProperty(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "org.domain." + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + ".entity"); //$NON-NLS-1$ + } + if(model.getProperty(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME)==null) { + model.setProperty(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "org.domain." + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + ".test"); //$NON-NLS-1$ + } + if(model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME)==null) { + String runtimeName = SeamFacetInstallDataModelProvider.getSeamRuntimeDefaultValue(model); + if((runtimeName!=null && runtimeName.length()>0)) { + model.setProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, runtimeName); + } + } + if(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE)==null) { + String defaultDs = SeamProjectPreferences.getStringPreference(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE); + IConnectionProfile[] profiles = ProfileManager.getInstance().getProfilesByCategory("org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$ + List<String> names = new ArrayList<String>(); + for (IConnectionProfile connectionProfile : profiles) { + names.add(connectionProfile.getName()); + } + if(names.contains(defaultDs)) { + model.setProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, defaultDs); + } else if(names.size()>0) { + model.setProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, names.get(0)); + } + } + } + /** * */ @@ -536,8 +581,12 @@ prefs.put(JBOSS_AS_DEPLOY_AS, model.getProperty(JBOSS_AS_DEPLOY_AS).toString()); prefs.put(SEAM_SETTINGS_VERSION, SEAM_SETTINGS_VERSION_1_1); - prefs.put(SEAM_RUNTIME_NAME, model.getProperty(SEAM_RUNTIME_NAME).toString()); - prefs.put(SEAM_CONNECTION_PROFILE, model.getProperty(SEAM_CONNECTION_PROFILE).toString()); + if(model.getProperty(SEAM_RUNTIME_NAME)!=null) { + prefs.put(SEAM_RUNTIME_NAME, model.getProperty(SEAM_RUNTIME_NAME).toString()); + } + if(model.getProperty(SEAM_CONNECTION_PROFILE)!=null) { + prefs.put(SEAM_CONNECTION_PROFILE, model.getProperty(SEAM_CONNECTION_PROFILE).toString()); + } prefs.put(SESSION_BEAN_PACKAGE_NAME, model.getProperty(SESSION_BEAN_PACKAGE_NAME).toString()); prefs.put(ENTITY_BEAN_PACKAGE_NAME, model.getProperty(ENTITY_BEAN_PACKAGE_NAME).toString()); prefs.put(TEST_CASES_PACKAGE_NAME, model.getProperty(TEST_CASES_PACKAGE_NAME).toString()); 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 2008-10-14 16:53:33 UTC (rev 10834) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2008-10-14 17:02:08 UTC (rev 10835) @@ -97,9 +97,11 @@ */ public Object getDefaultProperty(String propertyName) { if (JBOSS_AS_HOME.equals(propertyName)) { - return "Jboss_AS_HOME"; //$NON-NLS-1$ +// return "Jboss_AS_HOME"; //$NON-NLS-1$ + return null; } else if (JBOSS_AS_DEPLOY_AS.equals(propertyName)) { - return "Jboos_DEPLOY_AS"; //$NON-NLS-1$ +// return "Jboos_DEPLOY_AS"; //$NON-NLS-1$ + return null; } else if (propertyName.equals(FACET_ID)) { return ISeamFacetDataModelProperties.SEAM_FACET_ID; } else if (SEAM_TEST_PROJECT.equals(propertyName)) { @@ -173,12 +175,9 @@ model.setProperty(ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME, ""); model.setProperty(ISeamFacetDataModelProperties.DB_ALREADY_EXISTS, false); model.setProperty(ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY, false); - if(model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)!=null) { - model.setProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, "org.domain." + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + ".session"); //$NON-NLS-1$ - model.setProperty(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "org.domain." + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + ".entity"); //$NON-NLS-1$ - model.setProperty(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "org.domain." + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + ".test"); //$NON-NLS-1$ - } - // TODO +// SESSION_BEAN_PACKAGE_NAME +// ENTITY_BEAN_PACKAGE_NAME +// TEST_CASES_PACKAGE_NAME // jBossSeamHome // jBossAsDeployAs } 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 2008-10-14 16:53:33 UTC (rev 10834) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2008-10-14 17:02:08 UTC (rev 10835) @@ -52,7 +52,7 @@ .node(SeamCorePlugin.PLUGIN_ID); node.put(SeamProjectPreferences.RUNTIME_CONFIG_FORMAT_VERSION, RUNTIME_CONFIG_FORMAT_VERSION); - node.put(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, "DefaultDS"); //$NON-NLS-1$ +// node.put(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE, "DefaultDS"); //$NON-NLS-1$ node.put(SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS, "war"); //$NON-NLS-1$ node.put(SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE, "HSQL"); //$NON-NLS-1$ initializeDefault(node,getSeamGenBuildPath()); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java 2008-10-14 16:53:33 UTC (rev 10834) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/ComboFieldEditor.java 2008-10-14 17:02:08 UTC (rev 10835) @@ -86,7 +86,9 @@ * @see org.jboss.tools.seam.ui.widget.editor.ITaggedFieldEditor#setTags(java.lang.String[]) */ public void setTags(String[] tags) { - comboField.setTags(tags,getValueAsString()); + if(comboField!=null) { + comboField.setTags(tags,getValueAsString()); + } } /* (non-Javadoc)