Attachment #161064 for bug #302621

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




     <dynamic-preset id="preset.jst.jsf.v1_1">
       <factory class="org.eclipse.jst.jsf.core.internal.project.facet.JSFConfigurationPresetFactory11"/>
     </dynamic-preset>
     <dynamic-preset id="preset.jst.jsf.v1_2">
       <factory class="org.eclipse.jst.jsf.core.internal.project.facet.JSFConfigurationPresetFactory12"/>
     </dynamic-preset>
     <dynamic-preset id="preset.jst.jsf.v2_0">
       <factory class="org.eclipse.jst.jsf.core.internal.project.facet.JSFConfigurationPresetFactory20"/>
     </dynamic-preset>
     <description>
        %JSFv12PresetDesc
     </description>
     </static-preset>
     <static-preset
           id="preset.jst.jsf.v2_0">
        <label>
           %JSFv20Project
        </label>
        <facet
              id="jst.java"
              version="5.0">
        </facet>
        <facet
              id="jst.web"
              version="2.5">
        </facet>
        <facet
              id="jst.jsf"
              version="2.0">
        </facet>
        <description>
           %JSFv20PresetDesc
        </description>
     </static-preset>
  </extension>

  <extension point="org.eclipse.wst.common.project.facet.core.runtimes">

Lines 89-94 Link Here

(-)src/org/eclipse/jst/jsf/core/internal/messages.properties (-2 / +2 lines)
89	RegistryUpgradeCommitHandler_Text=An unrecoverable error occurred while trying to migrate your JSF Library Registry to a newer version. This may cause your library references to be broken in your JSF projects.	89	RegistryUpgradeCommitHandler_Text=An unrecoverable error occurred while trying to migrate your JSF Library Registry to a newer version. This may cause your library references to be broken in your JSF projects.
90	RegistryUpgradeCommitHandler_Title=Serious Error Encountered\!	90	RegistryUpgradeCommitHandler_Title=Serious Error Encountered\!
91		91
92	JSFFacet11_presetLabel = JavaServer Faces v1.1 Project	92	JSFFacet11_presetLabel = JavaServer Faces v{0} Project
93	JSFFacet11_presetDescription = Configures a Dynamic Web application to use JSF v1.1	93	JSFFacet11_presetDescription = Configures a Dynamic Web application to use JSF v{0}
94		94




package org.eclipse.jst.jsf.core.internal.project.facet;

import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
import org.eclipse.jst.jsf.core.internal.Messages;
import org.eclipse.wst.common.project.facet.core.IDynamicPreset;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase;
import org.eclipse.wst.common.project.facet.core.IPresetFactory;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.PresetDefinition;

/**
 * Super-class of all dynamic preset factories.
 * 
 * @author cbateman
 *
 */
public class AbstractJSFConfigurationPresetFactory implements IPresetFactory
{
    private final IProjectFacetVersion _minimumWebVersion;
    private final IProjectFacetVersion _jsfVersion;

    /**
     * @param minimumWebVersion
     * @param jsfVersion
     */
    protected AbstractJSFConfigurationPresetFactory(final IProjectFacetVersion minimumWebVersion,
            final IProjectFacetVersion jsfVersion)
    {
        _minimumWebVersion = minimumWebVersion;
        _jsfVersion = jsfVersion;
    }

    public PresetDefinition createPreset(final String presetId,
            final Map<String, Object> context)
        throws CoreException
    {
        final IFacetedProjectBase fproj = (IFacetedProjectBase) context
                .get(IDynamicPreset.CONTEXT_KEY_FACETED_PROJECT);

        final IProjectFacetVersion webFacetVersion = fproj
                .getProjectFacetVersion(WebFacetUtils.WEB_FACET);

        if (webFacetVersion != null
                && webFacetVersion.compareTo(_minimumWebVersion) >= 0)
        {
            final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>();
            facets.add(_jsfVersion);
            facets.add(webFacetVersion);
            if (webFacetVersion == WebFacetUtils.WEB_23)
            {
                facets.add(JavaFacet.VERSION_1_3);
            } else if (webFacetVersion == WebFacetUtils.WEB_24)
            {
                facets.add(JavaFacet.VERSION_1_4);
            } else if (webFacetVersion == WebFacetUtils.WEB_25)
            {
                facets.add(JavaFacet.VERSION_1_5);
            } else if (webFacetVersion == WebFacetUtils.WEB_30)
            {
                facets.add(JavaFacet.VERSION_1_6);
            }

            return new PresetDefinition(
                    Messages.bind(Messages.JSFFacet11_presetLabel, _jsfVersion.getVersionString()),
                    Messages.bind(Messages.JSFFacet11_presetDescription, _jsfVersion.getVersionString())
                            , facets);
        }

        return null;
    }

}





package org.eclipse.jst.jsf.core.internal.project.facet;

import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
import org.eclipse.jst.jsf.core.IJSFCoreConstants;
import org.eclipse.jst.jsf.core.internal.Messages;
import org.eclipse.wst.common.project.facet.core.IDynamicPreset;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase;
import org.eclipse.wst.common.project.facet.core.IPresetFactory;
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.PresetDefinition;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;

/**
 * Preset factory for JSF 1.1.
 * 
 * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
 */

public final class JSFConfigurationPresetFactory11
    extends AbstractJSFConfigurationPresetFactory
    implements IPresetFactory
    
{
    /**
     */
    public JSFConfigurationPresetFactory11()
        throws CoreException
        
    {
        super(WebFacetUtils.WEB_23, ProjectFacetsManager
                .getProjectFacet(IJSFCoreConstants.JSF_CORE_FACET_ID)
                .getVersion(IJSFCoreConstants.JSF_VERSION_1_1));
        final IProjectFacetVersion webFacetVersion
            = fproj.getProjectFacetVersion( WebFacetUtils.WEB_FACET );
        
        if( webFacetVersion != null && webFacetVersion.compareTo( WebFacetUtils.WEB_23 ) >= 0 )
        {
            final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>();
            
            final IProjectFacet jsfFacet
                = ProjectFacetsManager.getProjectFacet( IJSFCoreConstants.JSF_CORE_FACET_ID );
            
            final IProjectFacetVersion jsfFacetVersion11
                = jsfFacet.getVersion( IJSFCoreConstants.JSF_VERSION_1_1 );
            
            facets.add( jsfFacetVersion11 );
            facets.add( webFacetVersion );
            
            if( webFacetVersion == WebFacetUtils.WEB_23 )
            {
                facets.add( JavaFacet.VERSION_1_3 );
            }
            else if( webFacetVersion == WebFacetUtils.WEB_24 )
            {
                facets.add( JavaFacet.VERSION_1_4 );
            }
            else
            {
                facets.add( JavaFacet.VERSION_1_5 );
            }
            
            return new PresetDefinition( Messages.JSFFacet11_presetLabel, Messages.JSFFacet11_presetDescription, facets );
        }
        
        return null;
    }
    
}




/******************************************************************************
 * Copyright (c) 2008 BEA Systems, Inc. and others
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Konstantin Komissarchik
 ******************************************************************************/

package org.eclipse.jst.jsf.core.internal.project.facet;

import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
import org.eclipse.jst.jsf.core.IJSFCoreConstants;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;

/**
 * Preset factory for JSF 1.1.
 * 
 * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
 */

public final class JSFConfigurationPresetFactory12
    extends AbstractJSFConfigurationPresetFactory
    
{
    /**
     */
    public JSFConfigurationPresetFactory12()
    {
        super(WebFacetUtils.WEB_25, ProjectFacetsManager
                .getProjectFacet(IJSFCoreConstants.JSF_CORE_FACET_ID)
                .getVersion(IJSFCoreConstants.JSF_VERSION_1_2));
    }
}




/******************************************************************************
 * Copyright (c) 2008 BEA Systems, Inc. and others
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Konstantin Komissarchik
 ******************************************************************************/

package org.eclipse.jst.jsf.core.internal.project.facet;

import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
import org.eclipse.jst.jsf.core.IJSFCoreConstants;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;

/**
 * Preset factory for JSF 1.1.
 * 
 * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
 */

public final class JSFConfigurationPresetFactory20
    extends AbstractJSFConfigurationPresetFactory
    
{
    /**
     */
    public JSFConfigurationPresetFactory20()
    {
        super(WebFacetUtils.WEB_25, ProjectFacetsManager
                .getProjectFacet(IJSFCoreConstants.JSF_CORE_FACET_ID)
                .getVersion(IJSFCoreConstants.JSF_VERSION_2_0));
    }
}

Return to bug 302621

Lines 112-148 Link Here

(-)plugin.xml (-31 / +6 lines)
112	<dynamic-preset id="preset.jst.jsf.v1_1">	112	<dynamic-preset id="preset.jst.jsf.v1_1">
113	<factory class="org.eclipse.jst.jsf.core.internal.project.facet.JSFConfigurationPresetFactory11"/>	113	<factory class="org.eclipse.jst.jsf.core.internal.project.facet.JSFConfigurationPresetFactory11"/>
114	</dynamic-preset>	114	</dynamic-preset>
115	<static-preset	115	<dynamic-preset id="preset.jst.jsf.v1_2">
116	id="preset.jst.jsf.v1_2">	116	<factory class="org.eclipse.jst.jsf.core.internal.project.facet.JSFConfigurationPresetFactory12"/>
117	<label>%JSFv12Project</label>	117	</dynamic-preset>
118	<facet id="jst.java" version="5.0" />	118	<dynamic-preset id="preset.jst.jsf.v2_0">
119	<facet id="jst.web" version="2.5"/>	119	<factory class="org.eclipse.jst.jsf.core.internal.project.facet.JSFConfigurationPresetFactory20"/>
120	<facet id="jst.jsf" version="1.2" />	120	</dynamic-preset>
121	<description>
122	%JSFv12PresetDesc
123	</description>
124	</static-preset>
125	<static-preset
126	id="preset.jst.jsf.v2_0">
127	<label>
128	%JSFv20Project
129	</label>
130	<facet
131	id="jst.java"
132	version="5.0">
133	</facet>
134	<facet
135	id="jst.web"
136	version="2.5">
137	</facet>
138	<facet
139	id="jst.jsf"
140	version="2.0">
141	</facet>
142	<description>
143	%JSFv20PresetDesc
144	</description>
145	</static-preset>
146	</extension>	121	</extension>
147		122
148	<extension point="org.eclipse.wst.common.project.facet.core.runtimes">	123	<extension point="org.eclipse.wst.common.project.facet.core.runtimes">

Lines 11-84 Link Here

(-)src/org/eclipse/jst/jsf/core/internal/project/facet/JSFConfigurationPresetFactory11.java (-57 / +9 lines)
11		11
12	package org.eclipse.jst.jsf.core.internal.project.facet;	12	package org.eclipse.jst.jsf.core.internal.project.facet;
13		13
14	import java.util.HashSet;
15	import java.util.Map;
16	import java.util.Set;
17
18	import org.eclipse.core.runtime.CoreException;
19	import org.eclipse.jst.common.project.facet.core.JavaFacet;
20	import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;	14	import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
21	import org.eclipse.jst.jsf.core.IJSFCoreConstants;	15	import org.eclipse.jst.jsf.core.IJSFCoreConstants;
22	import org.eclipse.jst.jsf.core.internal.Messages;
23	import org.eclipse.wst.common.project.facet.core.IDynamicPreset;
24	import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase;
25	import org.eclipse.wst.common.project.facet.core.IPresetFactory;
26	import org.eclipse.wst.common.project.facet.core.IProjectFacet;
27	import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
28	import org.eclipse.wst.common.project.facet.core.PresetDefinition;
29	import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;	16	import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
30		17
31	/**	18	/**
		19	* Preset factory for JSF 1.1.
		20	*
32	* @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>	21	* @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
33	*/	22	*/
34		23
35	public final class JSFConfigurationPresetFactory11	24	public final class JSFConfigurationPresetFactory11
36		25	extends AbstractJSFConfigurationPresetFactory
37	implements IPresetFactory
38		26
39	{	27	{
40	public PresetDefinition createPreset( final String presetId,	28	/**
41	final Map<String,Object> context )	29	*/
42		30	public JSFConfigurationPresetFactory11()
43	throws CoreException
44
45	{	31	{
46	final IFacetedProjectBase fproj	32	super(WebFacetUtils.WEB_23, ProjectFacetsManager
47	= (IFacetedProjectBase) context.get( IDynamicPreset.CONTEXT_KEY_FACETED_PROJECT );	33	.getProjectFacet(IJSFCoreConstants.JSF_CORE_FACET_ID)
48		34	.getVersion(IJSFCoreConstants.JSF_VERSION_1_1));
49	final IProjectFacetVersion webFacetVersion
50	= fproj.getProjectFacetVersion( WebFacetUtils.WEB_FACET );
51
52	if( webFacetVersion != null && webFacetVersion.compareTo( WebFacetUtils.WEB_23 ) >= 0 )
53	{
54	final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>();
55
56	final IProjectFacet jsfFacet
57	= ProjectFacetsManager.getProjectFacet( IJSFCoreConstants.JSF_CORE_FACET_ID );
58
59	final IProjectFacetVersion jsfFacetVersion11
60	= jsfFacet.getVersion( IJSFCoreConstants.JSF_VERSION_1_1 );
61
62	facets.add( jsfFacetVersion11 );
63	facets.add( webFacetVersion );
64
65	if( webFacetVersion == WebFacetUtils.WEB_23 )
66	{
67	facets.add( JavaFacet.VERSION_1_3 );
68	}
69	else if( webFacetVersion == WebFacetUtils.WEB_24 )
70	{
71	facets.add( JavaFacet.VERSION_1_4 );
72	}
73	else
74	{
75	facets.add( JavaFacet.VERSION_1_5 );
76	}
77
78	return new PresetDefinition( Messages.JSFFacet11_presetLabel, Messages.JSFFacet11_presetDescription, facets );
79	}
80
81	return null;
82	}	35	}
83
84	}	36	}

Added Link Here

(-)src/org/eclipse/jst/jsf/core/internal/project/facet/JSFConfigurationPresetFactory12.java (+36 lines)
1	/******************************************************************************
2	* Copyright (c) 2008 BEA Systems, Inc. and others
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Konstantin Komissarchik
10	******************************************************************************/
11
12	package org.eclipse.jst.jsf.core.internal.project.facet;
13
14	import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
15	import org.eclipse.jst.jsf.core.IJSFCoreConstants;
16	import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
17
18	/**
19	* Preset factory for JSF 1.1.
20	*
21	* @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
22	*/
23
24	public final class JSFConfigurationPresetFactory12
25	extends AbstractJSFConfigurationPresetFactory
26
27	{
28	/**
29	*/
30	public JSFConfigurationPresetFactory12()
31	{
32	super(WebFacetUtils.WEB_25, ProjectFacetsManager
33	.getProjectFacet(IJSFCoreConstants.JSF_CORE_FACET_ID)
34	.getVersion(IJSFCoreConstants.JSF_VERSION_1_2));
35	}
36	}