[jbosstools-commits] JBoss Tools SVN: r23232 - in trunk/maven/plugins/org.jboss.tools.maven.seam: META-INF and 3 other directories.

Author: snjeza Date: 2010-07-04 18:45:46 -0400 (Sun, 04 Jul 2010) New Revision: 23232 Removed: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/CDIProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/HibernateProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF trunk/maven/plugins/org.jboss.tools.maven.seam/build.properties trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/Messages.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/messages.properties Log: https://jira.jboss.org/browse/JBIDE-6576 Move JBoss Maven configurators to separate features Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/META-INF/MANIFEST.MF 2010-07-04 22:45:46 UTC (rev 23232) @@ -8,17 +8,16 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.jboss.tools.maven.core, + org.jboss.tools.maven.ui, + org.jboss.tools.maven.jsf, org.jboss.tools.seam.core, - org.jboss.tools.portlet.core, org.jboss.tools.seam.ui, org.jboss.tools.common.model, org.maven.ide.eclipse.maven_model_edit;bundle-version="0.10.0";visibility:=reexport, org.eclipse.jst.j2ee.core, org.eclipse.jst.j2ee, org.eclipse.wst.common.emfworkbench.integration, - org.eclipse.jst.jsf.core, - org.jboss.tools.cdi.core, - org.hibernate.eclipse.console + org.eclipse.jst.jsf.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/build.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/build.properties 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/build.properties 2010-07-04 22:45:46 UTC (rev 23232) @@ -9,5 +9,4 @@ about.properties,\ jboss_about.png,\ poms/,\ - OSGI-INF/l10n/bundle.properties,\ plugin.properties Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.properties 2010-07-04 22:45:46 UTC (rev 23232) @@ -1,9 +1,4 @@ #Properties file for org.jboss.tools.maven.seam Bundle-Vendor = JBoss by Red Hat Bundle-Name = Integration Seam projects with Maven -Seam_Project_configurator = Seam Project configurator -CDI_Project_configurator = CDI Project configurator -Hibernate_Project_configurator = Hibernate Project configurator -JSF_Project_configurator = JSF Project configurator -Portlet_Core_Project_configurator = Portlet Core Project configurator -JBoss_Maven_Integration = JBoss Maven Integration \ No newline at end of file +Seam_Project_configurator = Seam Project configurator \ No newline at end of file Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/plugin.xml 2010-07-04 22:45:46 UTC (rev 23232) @@ -13,46 +13,5 @@ class="org.jboss.tools.maven.seam.configurators.SeamProjectConfigurator" name="%Seam_Project_configurator" priority="200"/> </extension> - - <extension point="org.maven.ide.eclipse.projectConfigurators"> - <configurator - id="org.jboss.tools.maven.cdi.configurator" - class="org.jboss.tools.maven.seam.configurators.CDIProjectConfigurator" - name="%CDI_Project_configurator" priority="250"/> - </extension> - <extension point="org.maven.ide.eclipse.projectConfigurators"> - <configurator - id="org.jboss.tools.maven.cdi.configurator" - class="org.jboss.tools.maven.seam.configurators.HibernateProjectConfigurator" - name="%Hibernate_Project_configurator" priority="250"/> - </extension> - - <extension point="org.maven.ide.eclipse.projectConfigurators"> - <configurator - id="org.jboss.tools.maven.jsf.configurator" - class="org.jboss.tools.maven.seam.configurators.JSFProjectConfigurator" - name="%JSF_Project_configurator" priority="150"/> - </extension> - - <extension point="org.maven.ide.eclipse.projectConfigurators"> - <configurator - id="org.jboss.tools.maven.portlet.configurator" - class="org.jboss.tools.maven.seam.configurators.PortletProjectConfigurator" - name="%Portlet_Core_Project_configurator" priority="155"/> - </extension> - - <extension - point="org.eclipse.ui.preferencePages"> - <page - category="org.jboss.tools.common.model.ui.MainPreferencePage" - class="org.jboss.tools.maven.seam.preferences.SeamConfiguratorPreferencePage" - id="org.jboss.tools.maven.seam.preferences.seamConfiguratorPreferencePage" - name="%JBoss_Maven_Integration"/> - </extension> - - <extension - point="org.eclipse.core.runtime.preferences"> - <initializer class="org.jboss.tools.maven.seam.preferences.SeamConfiguratorPreferencesInitializer"/> - </extension> </plugin> Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-07-04 22:45:46 UTC (rev 23232) @@ -14,11 +14,9 @@ import org.apache.maven.model.Model; import org.apache.maven.model.Parent; import org.apache.maven.model.Resource; -import org.apache.maven.project.MavenProject; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; @@ -30,11 +28,6 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; -import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; -import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderFramework; -import org.eclipse.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties; -import org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.wst.common.componentcore.ComponentCore; @@ -44,9 +37,7 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework; import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.tools.cdi.internal.core.project.facet.CDIFacetInstallDataModelProvider; import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.core.MavenCoreActivator; import org.jboss.tools.seam.core.SeamUtil; @@ -82,43 +73,7 @@ // The plug-in ID public static final String PLUGIN_ID = "org.jboss.tools.maven.seam"; //$NON-NLS-1$ - - public static final String CONFIGURE_SEAM = "configureSeam"; //$NON-NLS-1$ - - public static final String CONFIGURE_PORTLET = "configurePortlet"; //$NON-NLS-1$ - - public static final boolean CONFIGURE_SEAM_VALUE = true; - - public static final String CONFIGURE_SEAM_RUNTIME = "configureSeamRuntime"; //$NON-NLS-1$ - - public static final boolean CONFIGURE_SEAM_RUNTIME_VALUE = true; - - public static final String CONFIGURE_SEAM_ARTIFACTS = "configureSeamArtifacts"; //$NON-NLS-1$ - public static final boolean CONFIGURE_SEAM_ARTIFACTS_VALUE = true; - - public static final String CONFIGURE_JSF = "configureJSF"; //$NON-NLS-1$ - - public static final boolean CONFIGURE_JSF_VALUE = true; - - public static final boolean CONFIGURE_PORTLET_VALUE = true; - - public static final String CONFIGURE_JSFPORTLET = "configureJSFPortlet"; //$NON-NLS-1$ - - public static final boolean CONFIGURE_JSFPORTLET_VALUE = true; - - public static final String CONFIGURE_SEAMPORTLET = "configureSeamPortlet"; //$NON-NLS-1$ - - public static final boolean CONFIGURE_SEAMPORTLET_VALUE = true; - - public static final String CONFIGURE_CDI = "configureCDI"; //$NON-NLS-1$ - - public static final boolean CONFIGURE_CDI_VALUE = true; - - public static final String CONFIGURE_HIBERNATE = "configureHibernate"; //$NON-NLS-1$ - - public static final boolean CONFIGURE_HIBERNATE_VALUE = true; - // The shared instance private static MavenSeamActivator plugin; @@ -986,35 +941,4 @@ getDefault().getLog().log(status); } - public String getDependencyVersion(MavenProject mavenProject, String gid, String aid) { - List<Dependency> dependencies = mavenProject.getDependencies(); - for (Dependency dependency:dependencies) { - String groupId = dependency.getGroupId(); - if (groupId != null && (groupId.equals(gid)) ) { - String artifactId = dependency.getArtifactId(); - if (artifactId != null && artifactId.equals(aid)) { - return dependency.getVersion(); - } - } - } - return null; - } - - public IDataModel createJSFDataModel(IFacetedProject fproj, IProjectFacetVersion facetVersion) { - IDataModel config = (IDataModel) new JSFFacetInstallDataModelProvider().create(); - LibraryInstallDelegate libraryDelegate = new LibraryInstallDelegate(fproj, facetVersion); - ILibraryProvider provider = LibraryProviderFramework.getProvider("jsf-no-op-library-provider"); //$NON-NLS-1$ - libraryDelegate.setLibraryProvider(provider); - config.setProperty(IJSFFacetInstallDataModelProperties.LIBRARY_PROVIDER_DELEGATE, libraryDelegate); - config.setProperty(IJSFFacetInstallDataModelProperties.SERVLET_NAME, ""); - config.setProperty(IJSFFacetInstallDataModelProperties.SERVLET_URL_PATTERNS, new String[0]); - - return config; - } - - public IDataModel createCDIDataModel(IFacetedProject fproj, IProjectFacetVersion facetVersion) { - IDataModel config = (IDataModel) new CDIFacetInstallDataModelProvider().create(); - - return config; - } } Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/Messages.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/Messages.java 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/Messages.java 2010-07-04 22:45:46 UTC (rev 23232) @@ -4,20 +4,10 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.maven.seam.messages"; //$NON-NLS-1$ - public static String JSFProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet; public static String MavenSeamActivator_Cannot_get_seam_runtime; public static String MavenSeamActivator_The_file_does_not_exist; public static String MavenSeamActivator_The_folder_does_not_exist; - public static String PortletProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet; - public static String SeamConfiguratorPreferencePage_Configure_JBoss_JSF_Portlet_facet; - public static String SeamConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet; - public static String SeamConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet; - public static String SeamConfiguratorPreferencePage_Configure_JSF_facet; - public static String SeamConfiguratorPreferencePage_Configure_CDI_facet; - public static String SeamConfiguratorPreferencePage_Configure_Hibernate; - public static String SeamConfiguratorPreferencePage_Configure_Seam_Artifacts; - public static String SeamConfiguratorPreferencePage_Configure_Seam_Runtime; - public static String SeamConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects; + static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); Deleted: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/CDIProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/CDIProjectConfigurator.java 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/CDIProjectConfigurator.java 2010-07-04 22:45:46 UTC (rev 23232) @@ -1,128 +0,0 @@ -package org.jboss.tools.maven.seam.configurators; - -import org.apache.maven.project.MavenProject; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.wst.common.componentcore.ModuleCoreNature; -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.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.tools.maven.core.IJBossMavenConstants; -import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; -import org.jboss.tools.maven.seam.MavenSeamActivator; -import org.jboss.tools.maven.seam.Messages; -import org.maven.ide.eclipse.project.IMavenProjectFacade; -import org.maven.ide.eclipse.project.MavenProjectChangedEvent; -import org.maven.ide.eclipse.project.configurator.AbstractProjectConfigurator; -import org.maven.ide.eclipse.project.configurator.ProjectConfigurationRequest; - -public class CDIProjectConfigurator extends AbstractProjectConfigurator { - - private static final String CDI_API_GROUP_ID = "javax.enterprise"; //$NON-NLS-1$ - private static final String CDI_API_ARTIFACT_ID = "cdi-api"; //$NON-NLS-1$ - - protected static final IProjectFacet dynamicWebFacet; - protected static final IProjectFacetVersion dynamicWebVersion; - - protected static final IProjectFacet cdiFacet; - protected static final IProjectFacetVersion cdiVersion; - - protected static final IProjectFacet m2Facet; - protected static final IProjectFacetVersion m2Version; - - static { - dynamicWebFacet = ProjectFacetsManager.getProjectFacet("jst.web"); //$NON-NLS-1$ - dynamicWebVersion = dynamicWebFacet.getVersion("2.5"); //$NON-NLS-1$ - cdiFacet = ProjectFacetsManager.getProjectFacet("jst.cdi"); //$NON-NLS-1$ - cdiVersion = cdiFacet.getVersion("1.0"); //$NON-NLS-1$ - m2Facet = ProjectFacetsManager.getProjectFacet("jboss.m2"); //$NON-NLS-1$ - m2Version = m2Facet.getVersion("1.0"); //$NON-NLS-1$ - } - - @Override - public void configure(ProjectConfigurationRequest request, - IProgressMonitor monitor) throws CoreException { - MavenProject mavenProject = request.getMavenProject(); - IProject project = request.getProject(); - configureInternal(mavenProject,project, monitor); - } - - private void configureInternal(MavenProject mavenProject,IProject project, - IProgressMonitor monitor) throws CoreException { - IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configureCDI = store.getBoolean(MavenSeamActivator.CONFIGURE_CDI); - if (!configureCDI) { - return; - } - - String packaging = mavenProject.getPackaging(); - String cdiVersion = getCDIVersion(mavenProject); - if (cdiVersion != null) { - final IFacetedProject fproj = ProjectFacetsManager.create(project); - if (fproj != null && "war".equals(packaging)) { //$NON-NLS-1$ - installWarFacets(fproj, cdiVersion, monitor); - } - } - } - - - @Override - protected void mavenProjectChanged(MavenProjectChangedEvent event, - IProgressMonitor monitor) throws CoreException { - IMavenProjectFacade facade = event.getMavenProject(); - if(facade != null) { - IProject project = facade.getProject(); - if(isWTPProject(project)) { - MavenProject mavenProject = facade.getMavenProject(monitor); - configureInternal(mavenProject, project, monitor); - } - } - super.mavenProjectChanged(event, monitor); - } - - private boolean isWTPProject(IProject project) { - return ModuleCoreNature.getModuleCoreNature(project) != null; - } - - private void installM2Facet(IFacetedProject fproj, IProgressMonitor monitor) throws CoreException { - if (!fproj.hasProjectFacet(m2Facet)) { - IDataModel config = (IDataModel) new MavenFacetInstallDataModelProvider().create(); - config.setBooleanProperty(IJBossMavenConstants.MAVEN_PROJECT_EXISTS, true); - fproj.installProjectFacet(m2Version, config, monitor); - } - } - - - private void installWarFacets(IFacetedProject fproj, String cdiVersion,IProgressMonitor monitor) throws CoreException { - - if (!fproj.hasProjectFacet(dynamicWebFacet)) { - MavenSeamActivator.log(Messages.JSFProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet); - } - installCDIFacet(fproj, cdiVersion, monitor); - installM2Facet(fproj, monitor); - - } - - - private void installCDIFacet(IFacetedProject fproj, String cdiVersionString, IProgressMonitor monitor) - throws CoreException { - if (!fproj.hasProjectFacet(cdiFacet)) { - if (cdiVersionString.startsWith("1.0")) { //$NON-NLS-1$ - IDataModel model = MavenSeamActivator.getDefault().createCDIDataModel(fproj,cdiVersion); - fproj.installProjectFacet(cdiVersion, model, monitor); - } - } - } - - private String getCDIVersion(MavenProject mavenProject) { - String version = null; - version = MavenSeamActivator.getDefault().getDependencyVersion(mavenProject, CDI_API_GROUP_ID, CDI_API_ARTIFACT_ID); - - return version; - } - -} Deleted: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/HibernateProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/HibernateProjectConfigurator.java 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/HibernateProjectConfigurator.java 2010-07-04 22:45:46 UTC (rev 23232) @@ -1,82 +0,0 @@ -package org.jboss.tools.maven.seam.configurators; - -import java.util.List; - -import org.apache.maven.model.Dependency; -import org.apache.maven.project.MavenProject; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ProjectScope; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.preferences.IScopeContext; -import org.eclipse.jface.preference.IPreferenceStore; -import org.hibernate.eclipse.console.properties.HibernatePropertiesConstants; -import org.hibernate.eclipse.console.utils.ProjectUtils; -import org.jboss.tools.maven.seam.MavenSeamActivator; -import org.maven.ide.eclipse.project.IMavenProjectFacade; -import org.maven.ide.eclipse.project.MavenProjectChangedEvent; -import org.maven.ide.eclipse.project.configurator.AbstractProjectConfigurator; -import org.maven.ide.eclipse.project.configurator.ProjectConfigurationRequest; -import org.osgi.service.prefs.Preferences; - -public class HibernateProjectConfigurator extends AbstractProjectConfigurator { - - private static final String HIBERNATE_GROUP_ID = "org.hibernate"; //$NON-NLS-1$ - private static final String HIBERNATE_ARTIFACT_ID_PREFIX = "hibernate"; //$NON-NLS-1$ - - @Override - public void configure(ProjectConfigurationRequest request, - IProgressMonitor monitor) throws CoreException { - MavenProject mavenProject = request.getMavenProject(); - IProject project = request.getProject(); - configureInternal(mavenProject,project, monitor); - } - - private void configureInternal(MavenProject mavenProject,IProject project, - IProgressMonitor monitor) throws CoreException { - IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configureHibernate = store.getBoolean(MavenSeamActivator.CONFIGURE_HIBERNATE); - if (!configureHibernate) { - return; - } - - if (isHibernateProject(mavenProject)) { - IScopeContext scope = new ProjectScope(project); - Preferences node = scope.getNode(HibernatePropertiesConstants.HIBERNATE_CONSOLE_NODE); - if (node != null) { - boolean enabled = node.getBoolean(HibernatePropertiesConstants.HIBERNATE3_ENABLED, false); - if (enabled) { - return; - } - } - ProjectUtils.toggleHibernateOnProject(project, true, ""); //$NON-NLS-1$ - } - } - - - @Override - protected void mavenProjectChanged(MavenProjectChangedEvent event, - IProgressMonitor monitor) throws CoreException { - IMavenProjectFacade facade = event.getMavenProject(); - if(facade != null) { - IProject project = facade.getProject(); - MavenProject mavenProject = facade.getMavenProject(monitor); - configureInternal(mavenProject, project, monitor); - } - super.mavenProjectChanged(event, monitor); - } - - private boolean isHibernateProject(MavenProject mavenProject) { - List<Dependency> dependencies = mavenProject.getDependencies(); - for (Dependency dependency:dependencies) { - String groupId = dependency.getGroupId(); - if (groupId != null && HIBERNATE_GROUP_ID.equals(groupId)) { - String artifactId = dependency.getArtifactId(); - if (artifactId != null && artifactId.startsWith(HIBERNATE_ARTIFACT_ID_PREFIX)) { - return true; - } - } - } - return false; - } -} Deleted: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/JSFProjectConfigurator.java 2010-07-04 22:45:46 UTC (rev 23232) @@ -1,142 +0,0 @@ -package org.jboss.tools.maven.seam.configurators; - -import org.apache.maven.project.MavenProject; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.wst.common.componentcore.ModuleCoreNature; -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.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.tools.maven.core.IJBossMavenConstants; -import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; -import org.jboss.tools.maven.seam.MavenSeamActivator; -import org.jboss.tools.maven.seam.Messages; -import org.maven.ide.eclipse.project.IMavenProjectFacade; -import org.maven.ide.eclipse.project.MavenProjectChangedEvent; -import org.maven.ide.eclipse.project.configurator.AbstractProjectConfigurator; -import org.maven.ide.eclipse.project.configurator.ProjectConfigurationRequest; - -public class JSFProjectConfigurator extends AbstractProjectConfigurator { - - private static final String JSF_API_GROUP_ID = "javax.faces"; //$NON-NLS-1$ - private static final String JSF_API2_GROUP_ID = "com.sun.faces"; //$NON-NLS-1$ - private static final String JSF_API_ARTIFACT_ID = "jsf-api"; //$NON-NLS-1$ - - protected static final IProjectFacet dynamicWebFacet; - protected static final IProjectFacetVersion dynamicWebVersion; - - protected static final IProjectFacet jsfFacet; - protected static final IProjectFacetVersion jsfVersion20; - protected static final IProjectFacetVersion jsfVersion12; - protected static final IProjectFacetVersion jsfVersion11; - protected static final IProjectFacet m2Facet; - protected static final IProjectFacetVersion m2Version; - - static { - dynamicWebFacet = ProjectFacetsManager.getProjectFacet("jst.web"); //$NON-NLS-1$ - dynamicWebVersion = dynamicWebFacet.getVersion("2.5"); //$NON-NLS-1$ - jsfFacet = ProjectFacetsManager.getProjectFacet("jst.jsf"); //$NON-NLS-1$ - jsfVersion20 = jsfFacet.getVersion("2.0"); //$NON-NLS-1$ - jsfVersion12 = jsfFacet.getVersion("1.2"); //$NON-NLS-1$ - jsfVersion11 = jsfFacet.getVersion("1.1"); //$NON-NLS-1$ - m2Facet = ProjectFacetsManager.getProjectFacet("jboss.m2"); //$NON-NLS-1$ - m2Version = m2Facet.getVersion("1.0"); //$NON-NLS-1$ - } - - @Override - public void configure(ProjectConfigurationRequest request, - IProgressMonitor monitor) throws CoreException { - MavenProject mavenProject = request.getMavenProject(); - IProject project = request.getProject(); - configureInternal(mavenProject,project, monitor); - } - - private void configureInternal(MavenProject mavenProject,IProject project, - IProgressMonitor monitor) throws CoreException { - IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configureJSF = store.getBoolean(MavenSeamActivator.CONFIGURE_JSF); - if (!configureJSF) { - return; - } - - String packaging = mavenProject.getPackaging(); - String jsfVersion = getJSFVersion(mavenProject); - if (jsfVersion != null) { - final IFacetedProject fproj = ProjectFacetsManager.create(project); - if (fproj != null && "war".equals(packaging)) { //$NON-NLS-1$ - installWarFacets(fproj, jsfVersion, monitor); - } - } - } - - - @Override - protected void mavenProjectChanged(MavenProjectChangedEvent event, - IProgressMonitor monitor) throws CoreException { - IMavenProjectFacade facade = event.getMavenProject(); - if(facade != null) { - IProject project = facade.getProject(); - if(isWTPProject(project)) { - MavenProject mavenProject = facade.getMavenProject(monitor); - configureInternal(mavenProject, project, monitor); - } - } - super.mavenProjectChanged(event, monitor); - } - - private boolean isWTPProject(IProject project) { - return ModuleCoreNature.getModuleCoreNature(project) != null; - } - - private void installM2Facet(IFacetedProject fproj, IProgressMonitor monitor) throws CoreException { - if (!fproj.hasProjectFacet(m2Facet)) { - IDataModel config = (IDataModel) new MavenFacetInstallDataModelProvider().create(); - config.setBooleanProperty(IJBossMavenConstants.MAVEN_PROJECT_EXISTS, true); - fproj.installProjectFacet(m2Version, config, monitor); - } - } - - - private void installWarFacets(IFacetedProject fproj, String jsfVersion,IProgressMonitor monitor) throws CoreException { - - if (!fproj.hasProjectFacet(dynamicWebFacet)) { - MavenSeamActivator.log(Messages.JSFProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet); - } - installJSFFacet(fproj, jsfVersion, monitor); - installM2Facet(fproj, monitor); - - } - - - private void installJSFFacet(IFacetedProject fproj, String jsfVersionString, IProgressMonitor monitor) - throws CoreException { - if (!fproj.hasProjectFacet(jsfFacet)) { - if (jsfVersionString.startsWith("1.1")) { //$NON-NLS-1$ - IDataModel model = MavenSeamActivator.getDefault().createJSFDataModel(fproj,jsfVersion11); - fproj.installProjectFacet(jsfVersion11, model, monitor); - } - if (jsfVersionString.startsWith("1.2")) { //$NON-NLS-1$ - IDataModel model = MavenSeamActivator.getDefault().createJSFDataModel(fproj,jsfVersion12); - fproj.installProjectFacet(jsfVersion12, model, monitor); - } - if (jsfVersionString.startsWith("2.0")) { //$NON-NLS-1$ - IDataModel model = MavenSeamActivator.getDefault().createJSFDataModel(fproj,jsfVersion20); - fproj.installProjectFacet(jsfVersion20, model, monitor); - } - } - } - - private String getJSFVersion(MavenProject mavenProject) { - String version = null; - version = MavenSeamActivator.getDefault().getDependencyVersion(mavenProject, JSF_API_GROUP_ID, JSF_API_ARTIFACT_ID); - if (version == null) { - version = MavenSeamActivator.getDefault().getDependencyVersion(mavenProject, JSF_API2_GROUP_ID, JSF_API_ARTIFACT_ID); - } - return version; - } - -} Deleted: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/PortletProjectConfigurator.java 2010-07-04 22:45:46 UTC (rev 23232) @@ -1,169 +0,0 @@ -package org.jboss.tools.maven.seam.configurators; - -import org.apache.maven.project.MavenProject; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; -import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; -import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderFramework; -import org.eclipse.wst.common.componentcore.ModuleCoreNature; -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.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.jboss.tools.maven.core.IJBossMavenConstants; -import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; -import org.jboss.tools.maven.seam.MavenSeamActivator; -import org.jboss.tools.maven.seam.Messages; -import org.jboss.tools.portlet.core.IPortletConstants; -import org.jboss.tools.portlet.core.internal.project.facet.JSFPortletFacetInstallDataModelProvider; -import org.jboss.tools.portlet.core.internal.project.facet.PortletFacetInstallDataModelProvider; -import org.maven.ide.eclipse.project.IMavenProjectFacade; -import org.maven.ide.eclipse.project.MavenProjectChangedEvent; -import org.maven.ide.eclipse.project.configurator.AbstractProjectConfigurator; -import org.maven.ide.eclipse.project.configurator.ProjectConfigurationRequest; - -public class PortletProjectConfigurator extends AbstractProjectConfigurator { - - private static final String PORTLET_API_GROUP_ID = "javax.portlet"; //$NON-NLS-1$ - private static final String PORTLET_API_ARTIFACT_ID = "portlet-api"; //$NON-NLS-1$ - - private static final String PORTLETBRIDGE_API_GROUP_ID = "org.jboss.portletbridge"; //$NON-NLS-1$ - private static final String PORTLETBRIDGE_API_ARTIFACT_ID = "portletbridge-api"; //$NON-NLS-1$ - - protected static final IProjectFacet dynamicWebFacet; - protected static final IProjectFacetVersion dynamicWebVersion; - - protected static final IProjectFacet jsfFacet; - protected static final IProjectFacet portletFacet; - protected static final IProjectFacetVersion portletVersion10; - protected static final IProjectFacetVersion portletVersion20; - protected static final IProjectFacet m2Facet; - protected static final IProjectFacetVersion m2Version; - protected static final IProjectFacetVersion jsfportletFacetVersion; - - static { - dynamicWebFacet = ProjectFacetsManager.getProjectFacet("jst.web"); //$NON-NLS-1$ - dynamicWebVersion = dynamicWebFacet.getVersion("2.5"); //$NON-NLS-1$ - portletFacet = ProjectFacetsManager.getProjectFacet("jboss.portlet"); //$NON-NLS-1$ - portletVersion20 = portletFacet.getVersion("2.0"); //$NON-NLS-1$ - portletVersion10 = portletFacet.getVersion("1.0"); //$NON-NLS-1$ - m2Facet = ProjectFacetsManager.getProjectFacet("jboss.m2"); //$NON-NLS-1$ - m2Version = m2Facet.getVersion("1.0"); //$NON-NLS-1$ - jsfFacet = ProjectFacetsManager.getProjectFacet("jst.jsf"); //$NON-NLS-1$ - jsfportletFacetVersion = ProjectFacetsManager.getProjectFacet("jboss.jsfportlet").getVersion("1.0"); //$NON-NLS-1$//$NON-NLS-2$ - } - - @Override - public void configure(ProjectConfigurationRequest request, - IProgressMonitor monitor) throws CoreException { - MavenProject mavenProject = request.getMavenProject(); - IProject project = request.getProject(); - configureInternal(mavenProject,project, monitor); - } - - private void configureInternal(MavenProject mavenProject,IProject project, - IProgressMonitor monitor) throws CoreException { - IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configurePortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_PORTLET); - if (!configurePortlet) { - return; - } - - String packaging = mavenProject.getPackaging(); - String portletVersion = MavenSeamActivator.getDefault().getDependencyVersion(mavenProject, PORTLET_API_GROUP_ID, PORTLET_API_ARTIFACT_ID); - String jsfportletVersion = MavenSeamActivator.getDefault().getDependencyVersion(mavenProject, PORTLETBRIDGE_API_GROUP_ID, PORTLETBRIDGE_API_ARTIFACT_ID); - if (portletVersion != null) { - final IFacetedProject fproj = ProjectFacetsManager.create(project); - if (fproj != null && "war".equals(packaging)) { //$NON-NLS-1$ - installWarFacets(fproj, portletVersion, jsfportletVersion, monitor); - } - } - } - - - @Override - protected void mavenProjectChanged(MavenProjectChangedEvent event, - IProgressMonitor monitor) throws CoreException { - IMavenProjectFacade facade = event.getMavenProject(); - if(facade != null) { - IProject project = facade.getProject(); - if(isWTPProject(project)) { - MavenProject mavenProject = facade.getMavenProject(monitor); - configureInternal(mavenProject, project, monitor); - } - } - super.mavenProjectChanged(event, monitor); - } - - private boolean isWTPProject(IProject project) { - return ModuleCoreNature.getModuleCoreNature(project) != null; - } - - private void installM2Facet(IFacetedProject fproj, IProgressMonitor monitor) throws CoreException { - if (!fproj.hasProjectFacet(m2Facet)) { - IDataModel config = (IDataModel) new MavenFacetInstallDataModelProvider().create(); - config.setBooleanProperty(IJBossMavenConstants.MAVEN_PROJECT_EXISTS, true); - fproj.installProjectFacet(m2Version, config, monitor); - } - } - - - private void installWarFacets(IFacetedProject fproj, String portletVersion, String jsfportletVersion, IProgressMonitor monitor) throws CoreException { - - if (!fproj.hasProjectFacet(dynamicWebFacet)) { - MavenSeamActivator.log(Messages.PortletProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet); - } - installM2Facet(fproj, monitor); - installPortletFacet(fproj, portletVersion, jsfportletVersion, monitor); - } - - - private void installPortletFacet(IFacetedProject fproj, String portletVersionString, String jsfportletVersion, IProgressMonitor monitor) - throws CoreException { - if (!fproj.hasProjectFacet(portletFacet)) { - if (portletVersionString.startsWith("1.0")) { //$NON-NLS-1$ - IDataModel model = createPortletDataModel(fproj, portletVersion10); - fproj.installProjectFacet(portletVersion10, model, monitor); - } - if (portletVersionString.startsWith("2.0")) { //$NON-NLS-1$ - IDataModel model = createPortletDataModel(fproj, portletVersion20); - fproj.installProjectFacet(portletVersion20, model, monitor); - } - } - IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configureJSFPortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_JSFPORTLET); - if (!configureJSFPortlet) { - return; - } - if (fproj.hasProjectFacet(portletFacet) && fproj.hasProjectFacet(jsfFacet) && jsfportletVersion != null) { - - if (!fproj.hasProjectFacet(jsfportletFacetVersion)) { - IDataModel model = createJSFPortletDataModel(fproj, jsfportletFacetVersion); - fproj.installProjectFacet(jsfportletFacetVersion, model, monitor); - } - - } - } - - private IDataModel createPortletDataModel(IFacetedProject fproj, IProjectFacetVersion facetVersion) { - IDataModel config = (IDataModel) new PortletFacetInstallDataModelProvider().create(); - LibraryInstallDelegate libraryDelegate = new LibraryInstallDelegate(fproj, facetVersion); - ILibraryProvider provider = LibraryProviderFramework.getProvider("portlet-no-op-library-provider"); //$NON-NLS-1$ - libraryDelegate.setLibraryProvider(provider); - config.setProperty(IPortletConstants.PORTLET_LIBRARY_PROVIDER_DELEGATE, libraryDelegate); - return config; - } - - private IDataModel createJSFPortletDataModel(IFacetedProject fproj, IProjectFacetVersion facetVersion) { - IDataModel config = (IDataModel) new JSFPortletFacetInstallDataModelProvider().create(); - LibraryInstallDelegate libraryDelegate = new LibraryInstallDelegate(fproj, facetVersion); - ILibraryProvider provider = LibraryProviderFramework.getProvider("jsfportlet-no-op-library-provider"); //$NON-NLS-1$ - libraryDelegate.setLibraryProvider(provider); - config.setProperty(IPortletConstants.JSFPORTLET_LIBRARY_PROVIDER_DELEGATE, libraryDelegate); - return config; - } -} Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2010-07-04 22:45:46 UTC (rev 23232) @@ -45,8 +45,10 @@ import org.jboss.tools.jst.web.kb.IKbProject; import org.jboss.tools.maven.core.IJBossMavenConstants; import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider; +import org.jboss.tools.maven.jsf.MavenJSFActivator; import org.jboss.tools.maven.seam.MavenSeamActivator; import org.jboss.tools.maven.seam.Messages; +import org.jboss.tools.maven.ui.Activator; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamUtil; @@ -127,8 +129,8 @@ private void configureInternal(MavenProject mavenProject,IProject project, IProgressMonitor monitor) throws CoreException { - IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configureSeam = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM); + IPreferenceStore store = Activator.getDefault().getPreferenceStore(); + boolean configureSeam = store.getBoolean(Activator.CONFIGURE_SEAM); if (!configureSeam) { return; } @@ -170,7 +172,7 @@ if (ejbProject != null) { prefs.put(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, ejbProject.getName()); IJavaProject javaProject = JavaCore.create(ejbProject); - boolean configureSeamArtifacts = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS); + boolean configureSeamArtifacts = store.getBoolean(Activator.CONFIGURE_SEAM_ARTIFACTS); if (configureSeamArtifacts) { if (javaProject != null && javaProject.isOpen()) { try { @@ -293,7 +295,7 @@ String deploying = model.getStringProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS); if (deploying != null && deploying.equals(ISeamFacetDataModelProperties.DEPLOY_AS_WAR)) { IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configureSeamArtifacts = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS); + boolean configureSeamArtifacts = store.getBoolean(Activator.CONFIGURE_SEAM_ARTIFACTS); if (!configureSeamArtifacts) { return; } @@ -306,7 +308,7 @@ } } IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configureSeamPortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAMPORTLET); + boolean configureSeamPortlet = store.getBoolean(Activator.CONFIGURE_SEAMPORTLET); if (!configureSeamPortlet) { return; } @@ -327,7 +329,7 @@ private void installJSFFacet(IFacetedProject fproj, IProgressMonitor monitor) throws CoreException { if (!fproj.hasProjectFacet(jsfFacet)) { - IDataModel model = MavenSeamActivator.getDefault().createJSFDataModel(fproj,jsfVersion); + IDataModel model = MavenJSFActivator.getDefault().createJSFDataModel(fproj,jsfVersion); fproj.installProjectFacet(jsfVersion, model, monitor); } } @@ -479,7 +481,7 @@ config.setBooleanProperty(ISeamFacetDataModelProperties.CONFIGURE_DEFAULT_SEAM_RUNTIME, false); config.setBooleanProperty(ISeamFacetDataModelProperties.CONFIGURE_WAR_PROJECT, false); IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configureSeamArtifacts = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS); + boolean configureSeamArtifacts = store.getBoolean(Activator.CONFIGURE_SEAM_ARTIFACTS); if (!configureSeamArtifacts) { return config; } @@ -547,7 +549,7 @@ return null; } IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configureSeamRuntime = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME); + boolean configureSeamRuntime = store.getBoolean(Activator.CONFIGURE_SEAM_RUNTIME); if (!configureSeamRuntime) { return null; } Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/messages.properties =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/messages.properties 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/messages.properties 2010-07-04 22:45:46 UTC (rev 23232) @@ -1,14 +1,3 @@ -JSFProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet=The project doesn't contain the Web Module facet. MavenSeamActivator_Cannot_get_seam_runtime=Can't get seam runtime. MavenSeamActivator_The_file_does_not_exist=The {0} file doesn't exist. MavenSeamActivator_The_folder_does_not_exist=The {0} folder doesn't exist. -PortletProjectConfigurator_The_project_does_not_contain_the_Web_Module_facet=The project doesn't contain the Web Module facet. -SeamConfiguratorPreferencePage_Configure_JBoss_JSF_Portlet_facet=JBoss JSF Portlet facet -SeamConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet=JBoss Portlet Core facet -SeamConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet=JBoss Seam Portlet facet -SeamConfiguratorPreferencePage_Configure_JSF_facet=JSF facet -SeamConfiguratorPreferencePage_Configure_CDI_facet=CDI facet -SeamConfiguratorPreferencePage_Configure_Hibernate=Hibernate -SeamConfiguratorPreferencePage_Configure_Seam_Artifacts=Seam Artifacts (view folder, model source folder, package ...) -SeamConfiguratorPreferencePage_Configure_Seam_Runtime=Seam Runtime -SeamConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects=Seam Deleted: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencePage.java 2010-07-04 22:45:46 UTC (rev 23232) @@ -1,150 +0,0 @@ -package org.jboss.tools.maven.seam.preferences; - -import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; -import org.jboss.tools.maven.seam.MavenSeamActivator; -import org.jboss.tools.maven.seam.Messages; - -public class SeamConfiguratorPreferencePage extends PreferencePage implements - IWorkbenchPreferencePage { - - - private Button configureSeamButton; - private Button configureSeamRuntimeButton; - private Button configureSeamArtifactsButton; - private Button configureJSFButton; - private Button configurePortletButton; - private Button configureJSFPortletButton; - private Button configureSeamPortletButton; - private Button configureCDIButton; - private Button configureHibernateButton; - - @Override - protected Control createContents(Composite parent) { - Composite composite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(1, false); - layout.marginWidth = 0; - layout.marginHeight = 0; - composite.setLayout(layout); - - Label label = new Label(composite, SWT.NONE); - label.setText("When importing Maven projects configure the following:"); - configureSeamButton = new Button(composite,SWT.CHECK); - configureSeamButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_Seam_when_importing_Maven_projects); - IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - boolean configureSeam = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM); - configureSeamButton.setSelection(configureSeam); - - configureSeamRuntimeButton = new Button(composite,SWT.CHECK); - configureSeamRuntimeButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_Seam_Runtime); - boolean configureSeamRuntime = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME); - configureSeamRuntimeButton.setSelection(configureSeamRuntime); - configureSeamRuntimeButton.setEnabled(configureSeam); - - configureSeamArtifactsButton = new Button(composite,SWT.CHECK); - configureSeamArtifactsButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_Seam_Artifacts); - boolean configureSeamArtifacts = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS); - configureSeamArtifactsButton.setSelection(configureSeamArtifacts); - configureSeamArtifactsButton.setEnabled(configureSeam); - - configureSeamButton.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - configureSeamRuntimeButton.setEnabled(configureSeamButton.getSelection()); - configureSeamArtifactsButton.setEnabled(configureSeamButton.getSelection()); - } - - }); - - configureJSFButton = new Button(composite,SWT.CHECK); - configureJSFButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_JSF_facet); - boolean configureJSF = store.getBoolean(MavenSeamActivator.CONFIGURE_JSF); - configureJSFButton.setSelection(configureJSF); - - configurePortletButton = new Button(composite,SWT.CHECK); - configurePortletButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_JBoss_Portlet_Core_facet); - boolean configurePortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_PORTLET); - configurePortletButton.setSelection(configurePortlet); - - configureJSFPortletButton = new Button(composite,SWT.CHECK); - configureJSFPortletButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_JBoss_JSF_Portlet_facet); - boolean configureJSFPortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_JSFPORTLET); - configureJSFPortletButton.setSelection(configureJSFPortlet); - - configureSeamPortletButton = new Button(composite,SWT.CHECK); - configureSeamPortletButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_JBoss_Seam_Portlet_facet); - boolean configureSeamPortlet = store.getBoolean(MavenSeamActivator.CONFIGURE_SEAMPORTLET); - configureSeamPortletButton.setSelection(configureSeamPortlet); - - configureCDIButton = new Button(composite,SWT.CHECK); - configureCDIButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_CDI_facet); - boolean configureCDI = store.getBoolean(MavenSeamActivator.CONFIGURE_CDI); - configureCDIButton.setSelection(configureCDI); - - configureHibernateButton = new Button(composite,SWT.CHECK); - configureHibernateButton.setText(Messages.SeamConfiguratorPreferencePage_Configure_Hibernate); - boolean configureHibernate = store.getBoolean(MavenSeamActivator.CONFIGURE_HIBERNATE); - configureHibernateButton.setSelection(configureHibernate); - - return composite; - } - - public void init(IWorkbench workbench) { - } - - @Override - protected void performDefaults() { - configureJSFButton.setSelection(MavenSeamActivator.CONFIGURE_JSF_VALUE); - configureSeamButton.setSelection(MavenSeamActivator.CONFIGURE_SEAM_VALUE); - configureSeamRuntimeButton.setSelection(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME_VALUE); - configureSeamArtifactsButton.setSelection(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS_VALUE); - configurePortletButton.setSelection(MavenSeamActivator.CONFIGURE_PORTLET_VALUE); - configureJSFPortletButton.setSelection(MavenSeamActivator.CONFIGURE_JSFPORTLET_VALUE); - configureSeamPortletButton.setSelection(MavenSeamActivator.CONFIGURE_SEAMPORTLET_VALUE); - configureCDIButton.setSelection(MavenSeamActivator.CONFIGURE_CDI_VALUE); - configureHibernateButton.setSelection(MavenSeamActivator.CONFIGURE_HIBERNATE_VALUE); - - IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - store.setValue(MavenSeamActivator.CONFIGURE_SEAM, MavenSeamActivator.CONFIGURE_SEAM_VALUE); - store.setValue(MavenSeamActivator.CONFIGURE_JSF, MavenSeamActivator.CONFIGURE_JSF_VALUE); - store.setValue(MavenSeamActivator.CONFIGURE_JSFPORTLET, MavenSeamActivator.CONFIGURE_JSFPORTLET_VALUE); - store.setValue(MavenSeamActivator.CONFIGURE_SEAMPORTLET, MavenSeamActivator.CONFIGURE_SEAMPORTLET_VALUE); - store.setValue(MavenSeamActivator.CONFIGURE_PORTLET, MavenSeamActivator.CONFIGURE_PORTLET_VALUE); - store.setValue(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME, MavenSeamActivator.CONFIGURE_SEAM_RUNTIME_VALUE); - store.setValue(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS, MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS_VALUE); - store.setValue(MavenSeamActivator.CONFIGURE_CDI, MavenSeamActivator.CONFIGURE_CDI_VALUE); - store.setValue(MavenSeamActivator.CONFIGURE_HIBERNATE, MavenSeamActivator.CONFIGURE_HIBERNATE_VALUE); - configureSeamRuntimeButton.setEnabled(configureSeamButton.getSelection()); - configureSeamArtifactsButton.setEnabled(configureSeamButton.getSelection()); - super.performDefaults(); - } - - @Override - public boolean performOk() { - IPreferenceStore store = MavenSeamActivator.getDefault().getPreferenceStore(); - store.setValue(MavenSeamActivator.CONFIGURE_SEAM, configureSeamButton.getSelection()); - store.setValue(MavenSeamActivator.CONFIGURE_PORTLET, configurePortletButton.getSelection()); - store.setValue(MavenSeamActivator.CONFIGURE_JSF, configureJSFButton.getSelection()); - store.setValue(MavenSeamActivator.CONFIGURE_JSFPORTLET, configureJSFPortletButton.getSelection()); - store.setValue(MavenSeamActivator.CONFIGURE_SEAMPORTLET, configureSeamPortletButton.getSelection()); - store.setValue(MavenSeamActivator.CONFIGURE_SEAM_RUNTIME, configureSeamRuntimeButton.getSelection()); - store.setValue(MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS, configureSeamArtifactsButton.getSelection()); - store.setValue(MavenSeamActivator.CONFIGURE_CDI, configureCDIButton.getSelection()); - store.setValue(MavenSeamActivator.CONFIGURE_HIBERNATE, configureHibernateButton.getSelection()); - - return super.performOk(); - } - - -} Deleted: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java 2010-07-04 22:44:31 UTC (rev 23231) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/preferences/SeamConfiguratorPreferencesInitializer.java 2010-07-04 22:45:46 UTC (rev 23232) @@ -1,45 +0,0 @@ -package org.jboss.tools.maven.seam.preferences; - - -import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.core.runtime.preferences.DefaultScope; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.jboss.tools.maven.seam.MavenSeamActivator; - -public class SeamConfiguratorPreferencesInitializer extends - AbstractPreferenceInitializer { - - @Override - public void initializeDefaultPreferences() { - IEclipsePreferences node = new DefaultScope().getNode(MavenSeamActivator.PLUGIN_ID); - - node.putBoolean( - MavenSeamActivator.CONFIGURE_SEAM, - MavenSeamActivator.CONFIGURE_SEAM_VALUE); - node.putBoolean( - MavenSeamActivator.CONFIGURE_SEAM_RUNTIME, - MavenSeamActivator.CONFIGURE_SEAM_RUNTIME_VALUE); - node.putBoolean( - MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS, - MavenSeamActivator.CONFIGURE_SEAM_ARTIFACTS_VALUE); - node.putBoolean( - MavenSeamActivator.CONFIGURE_JSF, - MavenSeamActivator.CONFIGURE_JSF_VALUE); - node.putBoolean( - MavenSeamActivator.CONFIGURE_PORTLET, - MavenSeamActivator.CONFIGURE_PORTLET_VALUE); - node.putBoolean( - MavenSeamActivator.CONFIGURE_JSFPORTLET, - MavenSeamActivator.CONFIGURE_JSFPORTLET_VALUE); - node.putBoolean( - MavenSeamActivator.CONFIGURE_SEAMPORTLET, - MavenSeamActivator.CONFIGURE_SEAMPORTLET_VALUE); - node.putBoolean( - MavenSeamActivator.CONFIGURE_CDI, - MavenSeamActivator.CONFIGURE_CDI_VALUE); - node.putBoolean( - MavenSeamActivator.CONFIGURE_HIBERNATE, - MavenSeamActivator.CONFIGURE_HIBERNATE_VALUE); - } - -}