Author: scabanovich Date: 2007-10-12 05:39:24 -0400 (Fri, 12 Oct 2007) New Revision: 4134 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPreference.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportProjectWizardContext.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/NewProjectWizardContext.java Log: JBIDE-544 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java 2007-10-12 09:09:59 UTC (rev 4133) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java 2007-10-12 09:39:24 UTC (rev 4134) @@ -46,8 +46,8 @@ PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.DEFAULT_JSF_PROJECT_TEMPLATE); PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.DEFAULT_JSF_PROJECT_ROOT_DIR); PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.DEFAULT_JSF_SERVLET_VERSION); - PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.REGISTER_NEW_JSF_PROJECT_IN_TOMCAT); - PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.REGISTER_IMPORTED_JSF_PROJECT_IN_TOMCAT); + PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.REGISTER_NEW_JSF_PROJECT_IN_SERVER); + PreferenceModelUtilities.initPreferenceValue(initialModel, JSFPreference.REGISTER_IMPORTED_JSF_PROJECT_IN_SERVER); PreferenceModelUtilities.getPreferenceModel().save(); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPreference.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPreference.java 2007-10-12 09:09:59 UTC (rev 4133) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPreference.java 2007-10-12 09:39:24 UTC (rev 4134) @@ -28,8 +28,8 @@ public static final Preference DEFAULT_JSF_PROJECT_ROOT_DIR = new JSFPreference(OPTIONS_JSF_NEW_PROJECT_PATH, "Projects Root"); public static final Preference DEFAULT_JSF_SERVLET_VERSION = new JSFPreference(OPTIONS_JSF_NEW_PROJECT_PATH, "Servlet Version"); public static final Preference DEFAULT_JSF_IMPORT_SERVLET_VERSION = new JSFPreference(OPTIONS_JSF_IMPORT_PROJECT_PATH, "Servlet Version"); - public static final Preference REGISTER_NEW_JSF_PROJECT_IN_TOMCAT = new JSFPreference(OPTIONS_JSF_NEW_PROJECT_PATH, ATTR_REGISTER_IN_TOMCAT); - public static final Preference REGISTER_IMPORTED_JSF_PROJECT_IN_TOMCAT = new JSFPreference(OPTIONS_JSF_IMPORT_PROJECT_PATH, ATTR_REGISTER_IN_TOMCAT); + public static final Preference REGISTER_NEW_JSF_PROJECT_IN_SERVER = new JSFPreference(OPTIONS_JSF_NEW_PROJECT_PATH, ATTR_REGISTER_IN_SERVER); + public static final Preference REGISTER_IMPORTED_JSF_PROJECT_IN_SERVER = new JSFPreference(OPTIONS_JSF_IMPORT_PROJECT_PATH, ATTR_REGISTER_IN_SERVER); public static final Preference DO_NOT_CREATE_EMPTY_RULE = new JSFPreference(JSF_EDITOR_PATH, "doNotCreateEmptyRule"); public static final Preference ENABLE_CONTROL_MODE_ON_TRANSITION_COMPLETED = new JSFPreference(JSF_EDITOR_PATH, "enableControlModeOnTransitionCompleted"); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportProjectWizardContext.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportProjectWizardContext.java 2007-10-12 09:09:59 UTC (rev 4133) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/ImportProjectWizardContext.java 2007-10-12 09:39:24 UTC (rev 4134) @@ -29,9 +29,9 @@ } protected void initRegistry() { - getRegisterTomcatContext().setNatureIndex(JSFNature.NATURE_NICK); - getRegisterTomcatContext().setPreferences(JSFPreference.REGISTER_IMPORTED_JSF_PROJECT_IN_TOMCAT); - getRegisterTomcatContext().init(); + getRegisterServerContext().setNatureIndex(JSFNature.NATURE_NICK); + getRegisterServerContext().setPreferences(JSFPreference.REGISTER_IMPORTED_JSF_PROJECT_IN_SERVER); + getRegisterServerContext().init(); } public void setPexFileName(String value) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/NewProjectWizardContext.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/NewProjectWizardContext.java 2007-10-12 09:09:59 UTC (rev 4133) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/helpers/context/NewProjectWizardContext.java 2007-10-12 09:39:24 UTC (rev 4134) @@ -22,7 +22,7 @@ protected void initRegistry() { registry.setNatureIndex(JSFNature.NATURE_NICK); - registry.setPreferences(JSFPreference.REGISTER_NEW_JSF_PROJECT_IN_TOMCAT); + registry.setPreferences(JSFPreference.REGISTER_NEW_JSF_PROJECT_IN_SERVER); registry.init(); }