Author: scabanovich Date: 2007-08-24 08:31:49 -0400 (Fri, 24 Aug 2007) New Revision: 3316 Removed: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFStudioVariableInitializer.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 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 Log: Modified: trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml 2007-08-24 08:09:43 UTC (rev 3315) +++ trunk/jsf/plugins/org.jboss.tools.jsf/Preferences.xml 2007-08-24 12:31:49 UTC (rev 3316) @@ -2,12 +2,6 @@ <XStudio ENTITY="SharableXStudio" NAME="XStudio" SCOPE="project"> <Options ENTITY="SharableOptions" NAME="Options" SCOPE="project"> <StrutsStudio ENTITY="SharableStrutsStudio" NAME="Struts Studio" SCOPE="project"> - <Servlet24Libs ENTITY="SharableServlet24Libs" - NAME="Servlet 2.4 Libraries" SCOPE="project" libraries="STRUTSSTUDIO_LIB_HOME/servlet-2.4/jdbc2_0-stdext.jar;STRUTSSTUDIO_LIB_HOME/servlet-2.4/servlet-api.jar"/> - <Servlet22Libs ENTITY="SharableServlet22Libs" - NAME="Servlet 2.2 Libraries" SCOPE="project" libraries="STRUTSSTUDIO_LIB_HOME/servlet-2.2/jdbc2_0-stdext.jar;STRUTSSTUDIO_LIB_HOME/servlet-2.2/servlet.jar"/> - <Struts10Libs ENTITY="SharableStruts10Libs" - NAME="Struts 1.0 Libraries" SCOPE="project" libraries="STRUTSSTUDIO_LIB_HOME/struts-1.0/struts.jar"/> <Verification ENTITY="SharableVerification" NAME="Verification" SCOPE="project" error_number_limit="unlimited"/> <Running ENTITY="SharableRunning" NAME="Running" SCOPE="project" @@ -43,8 +37,6 @@ <link ENTITY="JSPLink" attribute="name" refer-to="forward" tag="logic:forward"/> <link ENTITY="JSPLink" attribute="forward" refer-to="forward" tag="logic:redirect"/> </link-recognizer>]]></LinkRecognizer> - <Servlet23Libs ENTITY="SharableServlet23Libs" - NAME="Servlet 2.3 Libraries" SCOPE="project" libraries="STRUTSSTUDIO_LIB_HOME/servlet-2.3/jdbc2_0-stdext.jar;STRUTSSTUDIO_LIB_HOME/servlet-2.3/servlet.jar"/> <Project ENTITY="SharableProject" NAME="Project" SCOPE="project"> <StrutsSupport ENTITY="SharableStrutsSupport" NAME="Struts Support" SCOPE="project"> <Struts11Support ENTITY="SharableStruts11Support" @@ -76,8 +68,6 @@ NAME="Default Error Messages" SCOPE="project" text="errors.required={0} is required.\n\nerrors.minlength={0} can not be less than {1} characters.\nerrors.maxlength={0} can not be greater than {1} characters.\nerrors.invalid={0} is invalid.\n \nerrors.byte={0} must be a byte.\nerrors.short={0} must be a short.\nerrors.integer={0} must be an integer.\nerrors.long={0} must be a long.\nerrors.float={0} must be a float.\nerrors.double={0} must be a double.\n \nerrors.date={0} is not a date.\nerrors.range={0} is not in the range {1} through {2}.\nerrors.creditcard={0} is an invalid credit card number.\nerrors.email={0} is an invalid e-mail address.\n"/> </ResourcesInsets> </Automation> - <Struts11Libs ENTITY="SharableStruts11Libs" - NAME="Struts 1.1 Libraries" SCOPE="project" libraries="STRUTSSTUDIO_LIB_HOME/struts-1.1/commons-beanutils.jar;STRUTSSTUDIO_LIB_HOME/struts-1.1/commons-collections.jar;STRUTSSTUDIO_LIB_HOME/struts-1.1/commons-digester.jar;STRUTSSTUDIO_LIB_HOME/struts-1.1/commons-fileupload.jar;STRUTSSTUDIO_LIB_HOME/struts-1.1/commons-lang.jar;STRUTSSTUDIO_LIB_HOME/struts-1.1/commons-logging.jar;STRUTSSTUDIO_LIB_HOME/struts-1.1/commons-validator.jar;STRUTSSTUDIO_LIB_HOME/struts-1.1/jakarta-oro.jar;STRUTSSTUDIO_LIB_HOME/struts-1.1/struts.jar;STRUTSSTUDIO_LIB_HOME/struts-1.1/struts-legacy.jar"/> <Editors ENTITY="SharableEditors" NAME="Editors" SCOPE="project" selectSourceTab="no" tabWidth="4" useRedHatEditors="yes"> <StrutsEditor ENTITY="SharableStrutsEditor" NAME="Web Flow Diagram" Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2007-08-24 08:09:43 UTC (rev 3315) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2007-08-24 12:31:49 UTC (rev 3316) @@ -1575,10 +1575,6 @@ <library name="$nl$/"/> </runtime> </extension> - <extension point="org.eclipse.jdt.core.classpathVariableInitializer"> - <classpathVariableInitializer class="org.jboss.tools.jsf.JSFStudioVariableInitializer" variable="JSFSTUDIO_LIB_HOME"> - </classpathVariableInitializer> - </extension> <extension point="org.jboss.tools.common.model.jspAdopt"> <jspAdopt class="org.jboss.tools.jsf.model.handlers.JSPAdopt"/> 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-08-24 08:09:43 UTC (rev 3315) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFModelPlugin.java 2007-08-24 12:31:49 UTC (rev 3316) @@ -48,7 +48,6 @@ 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.JSF_10_LIBRARIES); 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-08-24 08:09:43 UTC (rev 3315) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFPreference.java 2007-08-24 12:31:49 UTC (rev 3316) @@ -15,7 +15,6 @@ public class JSFPreference extends WebPreference { public static final String OPTIONS_JSFSTUDIO_PATH = OPTIONS_PATH + "/JSF Studio"; - public static final String OPTIONS_JSF_10_LIB_PATH = OPTIONS_JSFSTUDIO_PATH + "/JSF 1.0 Libraries"; public static final String OPTIONS_JSF_PROJECT_PATH = OPTIONS_JSFSTUDIO_PATH + "/Project"; public static final String OPTIONS_JSF_NEW_PROJECT_PATH = OPTIONS_JSF_PROJECT_PATH + "/New Project"; public static final String OPTIONS_JSF_IMPORT_PROJECT_PATH = OPTIONS_JSF_PROJECT_PATH + "/Import Project"; @@ -31,7 +30,6 @@ 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 JSF_10_LIBRARIES = new JSFPreference(OPTIONS_JSF_10_LIB_PATH, "Libraries"); 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"); Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFStudioVariableInitializer.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFStudioVariableInitializer.java 2007-08-24 08:09:43 UTC (rev 3315) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/JSFStudioVariableInitializer.java 2007-08-24 12:31:49 UTC (rev 3316) @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jsf; - -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.core.ClasspathVariableInitializer; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jface.preference.IPreferenceStore; - -import org.jboss.tools.common.model.util.ClassLoaderUtil; -import org.jboss.tools.jst.web.WebModelPlugin; - -public class JSFStudioVariableInitializer extends ClasspathVariableInitializer { - public static final String JSFSTUDIO_LIB_HOME = "JSFSTUDIO_LIB_HOME"; - - public void initialize(String variable) - { - if (JSFSTUDIO_LIB_HOME.equals(variable) /*&& JavaCore.getClasspathVariable(variable) == null*/) - { - ClassLoaderUtil.init(); - IPath ssLibPath = null; - IPreferenceStore store = JSFModelPlugin.getDefault().getPreferenceStore(); - if (store.contains(JSFSTUDIO_LIB_HOME) && !store.isDefault(JSFSTUDIO_LIB_HOME)) - { - String value = store.getString(JSFSTUDIO_LIB_HOME); - ssLibPath = new Path(value); - if (!ssLibPath.toFile().isDirectory()) ssLibPath = null; - } - - if (ssLibPath == null) - { - IPath pluginPath = WebModelPlugin.getTemplateStatePath(); - ssLibPath = pluginPath.append("lib"); - } - - try { - JavaCore.setClasspathVariable(variable, ssLibPath, new NullProgressMonitor()); - } catch (JavaModelException ex) { - JSFModelPlugin.getPluginLog().logError(ex); - } - } - } - - public static void save(IPreferenceStore store) { - IPath value = JavaCore.getClasspathVariable(JSFSTUDIO_LIB_HOME); - if (value != null) store.setValue(JSFSTUDIO_LIB_HOME, value.toString()); - } -}