Author: scabanovich Date: 2007-10-12 05:40:32 -0400 (Fri, 12 Oct 2007) New Revision: 4139 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsPreference.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportProjectWizardContext.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/NewProjectWizardContext.java Log: JBIDE-544 Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsPreference.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsPreference.java 2007-10-12 09:40:19 UTC (rev 4138) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsPreference.java 2007-10-12 09:40:32 UTC (rev 4139) @@ -25,8 +25,8 @@ public static final Preference DEFAULT_PROJECT_ROOT_DIR = new StrutsPreference(OPTIONS_NEW_PROJECT_PATH, "Projects Root"); public static final Preference DEFAULT_TLD_SET = new StrutsPreference(OPTIONS_NEW_PROJECT_PATH, "Default TLDs"); - public static final Preference REGISTER_NEW_PROJECT_IN_TOMCAT = new StrutsPreference(OPTIONS_NEW_PROJECT_PATH, ATTR_REGISTER_IN_TOMCAT); - public static final Preference REGISTER_IMPORTED_PROJECT_IN_TOMCAT = new StrutsPreference(OPTIONS_IMPORT_PROJECT_PATH, ATTR_REGISTER_IN_TOMCAT); + public static final Preference REGISTER_NEW_PROJECT_IN_SERVER = new StrutsPreference(OPTIONS_NEW_PROJECT_PATH, ATTR_REGISTER_IN_SERVER); + public static final Preference REGISTER_IMPORTED_PROJECT_IN_SERVER = new StrutsPreference(OPTIONS_IMPORT_PROJECT_PATH, ATTR_REGISTER_IN_SERVER); public static final Preference DEFAULT_STRUTS_IMPORT_SERVLET_VERSION = new StrutsPreference(OPTIONS_IMPORT_PROJECT_PATH, "Servlet Version"); Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportProjectWizardContext.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportProjectWizardContext.java 2007-10-12 09:40:19 UTC (rev 4138) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/ImportProjectWizardContext.java 2007-10-12 09:40:32 UTC (rev 4139) @@ -39,9 +39,9 @@ } protected void initRegistry() { - getRegisterTomcatContext().setNatureIndex(StrutsProjectUtil.NATURE_NICK); - getRegisterTomcatContext().setPreferences(StrutsPreference.REGISTER_IMPORTED_PROJECT_IN_TOMCAT); - getRegisterTomcatContext().init(); + getRegisterServerContext().setNatureIndex(StrutsProjectUtil.NATURE_NICK); + getRegisterServerContext().setPreferences(StrutsPreference.REGISTER_IMPORTED_PROJECT_IN_SERVER); + getRegisterServerContext().init(); } public void setPexFileName(String value) { Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/NewProjectWizardContext.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/NewProjectWizardContext.java 2007-10-12 09:40:19 UTC (rev 4138) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/webprj/model/helpers/context/NewProjectWizardContext.java 2007-10-12 09:40:32 UTC (rev 4139) @@ -15,7 +15,7 @@ import org.jboss.tools.struts.StrutsPreference; import org.jboss.tools.struts.StrutsProjectUtil; import org.jboss.tools.struts.StrutsUtils; -import org.jboss.tools.jst.web.context.RegisterTomcatContext; +import org.jboss.tools.jst.web.context.RegisterServerContext; import org.jboss.tools.jst.web.project.helpers.IWebProjectTemplate; import org.jboss.tools.jst.web.project.helpers.NewWebProjectContext; @@ -31,7 +31,7 @@ protected void initRegistry() { registry.setNatureIndex(StrutsProjectUtil.NATURE_NICK); - registry.setPreferences(StrutsPreference.REGISTER_NEW_PROJECT_IN_TOMCAT); + registry.setPreferences(StrutsPreference.REGISTER_NEW_PROJECT_IN_SERVER); registry.init(); } @@ -56,7 +56,7 @@ } } - public RegisterTomcatContext getRegisterTomcatContext() { + public RegisterServerContext getRegisterServerContext() { return registry; }