Author: dgolovin Date: 2009-09-24 21:20:03 -0400 (Thu, 24 Sep 2009) New Revision: 17722 Removed: trunk/jsf/plugins/org.jboss.tools.jsf/meta/ Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jboss/tools/common/projecttemplates/ProjectTemplatesPlugin.java trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf/build.properties trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilitiesLoader.java trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web/build.properties trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3628 - Plugins should be .jar's not directories for efficiency sake to make Plug-ins were converted to jars: jsf jsf.ui jst.web jst.web.ui jst.web.tiles jst.web.tiles.ui jst.jsp common.projecttemplates Modified: trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jboss/tools/common/projecttemplates/ProjectTemplatesPlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jboss/tools/common/projecttemplates/ProjectTemplatesPlugin.java 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/src/org/jboss/tools/common/projecttemplates/ProjectTemplatesPlugin.java 2009-09-25 01:20:03 UTC (rev 17722) @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.jboss.tools.common.util.FileUtil; +import org.jboss.tools.common.zip.UnzipOperation; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -45,34 +46,28 @@ copyProjectTemplates(); } - public static String getInstallPath() { + + void copyProjectTemplates() throws IOException { Bundle bundle = Platform.getBundle(PLUGIN_ID); - URL url = null; - try { - url = bundle == null ? null : FileLocator.resolve(bundle.getEntry("/")); //$NON-NLS-1$ - } catch (IOException e) { - url = bundle.getEntry("/"); //$NON-NLS-1$ + File location = Platform.getStateLocation(bundle).toFile(); + File install = FileLocator.getBundleFile(bundle); + if(install.isDirectory()) { + FileFilter filter = new FileFilter() { + public boolean accept(File pathname) { + return pathname != null + && !"CVS".equals(pathname.getName()) //$NON-NLS-1$ + && !".svn".equalsIgnoreCase(pathname.getName()); //$NON-NLS-1$ + } + }; + copy(location, install, "templates", filter); //$NON-NLS-1$ + copy(location, install, "lib", filter); //$NON-NLS-1$ + } else { + UnzipOperation unzip = new UnzipOperation(install); + unzip.execute(location, "templates"); + unzip.execute(location, "lib"); } - return (url == null) ? null : url.getPath(); } - - void copyProjectTemplates() { - Bundle b = Platform.getBundle(PLUGIN_ID); - File location = Platform.getStateLocation(b).toFile(); - File install = new File(getInstallPath()); - if(!install.isDirectory()) return; - FileFilter filter = new FileFilter() { - public boolean accept(File pathname) { - return pathname != null - && !"CVS".equals(pathname.getName()) //$NON-NLS-1$ - && !".svn".equalsIgnoreCase(pathname.getName()); //$NON-NLS-1$ - } - }; - copy(location, install, "templates", filter); //$NON-NLS-1$ - copy(location, install, "lib", filter); //$NON-NLS-1$ - } - private void copy(File location, File install, String name, FileFilter filter) { location = new File(location, name); //if(location.isDirectory()) return; @@ -95,5 +90,4 @@ static public void log(Exception ex) { getDefault().getLog().log(new Status(Status.ERROR, PLUGIN_ID, Status.OK, "No message", ex)); //$NON-NLS-1$ } - } \ No newline at end of file Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml =================================================================== --- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,322 +1,330 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.richfaces.feature" - label="%featureName" - version="2.0.0" - provider-name="%providerName" - plugin="org.jboss.tools.vpe"> - - <description url="http://www.jboss.org/tools"> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.richfaces.feature" + label="%featureName" + version="2.0.0" + provider-name="%providerName" + plugin="org.jboss.tools.vpe"> + + <description url="http://www.jboss.org/tools"> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license> Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, the GNU Lesser General Public License, and/or certain other open source licenses. For precise licensing details, consult the corresponding source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, -Raleigh NC 27606 USA. - </license> - - <url> - <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> - - <requires> - <import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/> - </requires> - - <plugin - id="org.jboss.tools.common" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.gef" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.model" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.model.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.projecttemplates" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.text.ext" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.text.xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.verification" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.verification.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.text.ext" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf.text.ext.facelets" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf.text.ext.richfaces" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.verification" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf.vpe.ajax4jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.facelets" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.richfaces" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.seam" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.jsp" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.kb" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.tiles" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.tiles.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.ui" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jst.web.verification" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.vpe" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.ui.palette" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jst.firstrun" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.vpe.xulrunner" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.hibernate.xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.hibernate.xml.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jsf.vpe.jsf" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.myfaces" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.html" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.vpe.jsp" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.common.el.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.el.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.resref.core" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.common.resref.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.vpe.resref" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.vpe.docbook" - download-size="0" - install-size="0" - version="0.0.0"/> - - <plugin - id="org.jboss.tools.jsf.vpe.jstl" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.jst.css" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +Raleigh NC 27606 USA. + </license> + + <url> + <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/> + </url> + + <requires> + <import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/> + </requires> + + <plugin + id="org.jboss.tools.common" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.gef" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.model" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.model.ui" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.projecttemplates" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.text.ext" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.text.xml" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.verification" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.verification.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.text.ext" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.text.ext.facelets" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.text.ext.richfaces" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.verification" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.vpe.ajax4jsf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.facelets" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.richfaces" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.seam" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.jsp" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.web" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.web.kb" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jst.web.tiles" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.web.tiles.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.web.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.web.verification" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.vpe" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.ui.palette" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.firstrun" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.vpe.xulrunner" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.hibernate.xml" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.hibernate.xml.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jsf" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.myfaces" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.html" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.vpe.jsp" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.common.el.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.el.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.resref.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.common.resref.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.vpe.resref" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.vpe.docbook" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.jboss.tools.jsf.vpe.jstl" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.jst.css" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName -Bundle-ClassPath: jsf.jar Bundle-Activator: org.jboss.tools.jsf.JSFModelPlugin Bundle-ManifestVersion: 2 Bundle-Vendor: %providerName Modified: trunk/jsf/plugins/org.jboss.tools.jsf/build.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,10 +1,11 @@ -source.jsf.jar = src/,\ - resources/ bin.includes = plugin.xml,\ META-INF/,\ plugin.properties,\ about.html,\ dtds/,\ - jsf.jar,\ - images/ -jars.compile.order = jsf.jar + images/,\ + . +jars.compile.order = . +output.. = bin/ +source.. = src/,\ + resources/ Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -419,7 +419,7 @@ <catalogContribution id="default"> <public publicId="-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - uri="dtds/facelet-taglib_1_0.dtd"/> + uri="platform:/plugin/org.jboss.tools.jsf/dtds/facelet-taglib_1_0.dtd"/> </catalogContribution> </extension> Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilitiesLoader.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilitiesLoader.java 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/JSFCapabilitiesLoader.java 2009-09-25 01:20:03 UTC (rev 17722) @@ -12,6 +12,7 @@ import java.io.File; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Platform; import org.osgi.framework.Bundle; @@ -39,8 +40,8 @@ String fileLocation = stateLocation + "/templates/JSFCapabilities.xml"; File f = new File(fileLocation); if(!f.exists()) { - String install = ProjectTemplatesPlugin.getInstallPath(); - File source = new File(install, "templates/JSFCapabilities.xml"); + IPath install = ProjectTemplatesPlugin.getTemplateStatePath(); + File source = new File(install.toFile(), "templates/JSFCapabilities.xml"); FileUtil.copyFile(source, f, true); } return f; Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,6 +1,5 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName -Bundle-ClassPath: jsfui.jar Bundle-Activator: org.jboss.tools.jsf.ui.JsfUiPlugin Bundle-ManifestVersion: 2 Bundle-Vendor: %providerName Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -3,7 +3,10 @@ plugin.properties,\ images/,\ about.html,\ - META-INF/ -source.jsfui.jar = src/,\ - resources/ -jars.compile.order = jsfui.jar + META-INF/,\ + . +jars.compile.order = jsfui.jar,\ + . +output.. = bin/ +source.. = src/,\ + resources/ Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,7 +1,6 @@ Manifest-Version: 1.0 Bundle-ActivationPolicy: lazy Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: jspeditor.jar Bundle-Activator: org.jboss.tools.jst.jsp.JspEditorPlugin Bundle-ManifestVersion: 2 Bundle-Vendor: %providerName Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,10 +1,12 @@ -source.jspeditor.jar = src/,\ - resources/ bin.includes = templates/,\ plugin.xml,\ plugin.properties,\ images/,\ about.html,\ META-INF/,\ - jspeditor.jar + . src.includes = resources/ +jars.compile.order = . +output.. = bin/ +source.. = resources/,\ + src/ Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -124,7 +124,7 @@ <extension point="org.eclipse.ui.editors"> <editor - icon="images/xstudio/editors/jsp.gif" + icon="$nl$/images/xstudio/editors/jsp.gif" class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor" default="true" name="%editors.jsp.name" @@ -138,7 +138,7 @@ class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor" contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor" extensions="html, htm, jsf" - icon="images/xstudio/editors/html_file.gif" + icon="$nl$/images/xstudio/editors/html_file.gif" id="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor" matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl" name="%editors.html.name" @@ -193,8 +193,8 @@ <action class="org.jboss.tools.jst.jsp.outline.cssdialog.OpenCSSDialogActionDelegate" definitionId="org.jboss.tools.jst.jsp.commands.openCSSDialog" - hoverIcon="images/cssdialog/color_large.gif" - icon="images/cssdialog/color_large.gif" + hoverIcon="$nl$/images/cssdialog/color_large.gif" + icon="$nl$/images/cssdialog/color_large.gif" id="org.jboss.tools.jst.jsp.openCSSDialogEditor" label="Open edit dialog" menubarPath="org.jboss.tools.jst.jsp.cssClassDialogSubMenu/content" @@ -496,7 +496,7 @@ <action class="org.jboss.tools.jst.jsp.outline.cssdialog.OpenCSSDialogActionDelegate" definitionId="org.jboss.tools.jst.jsp.commands.openCSSDialog" - icon="images/cssdialog/color_large.gif" + icon="$nl$/images/cssdialog/color_large.gif" id="org.jboss.tools.jst.jsp.openCSSDialogPopupMenu" label="Open CSS Dialog" menubarPath="additions" Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,7 @@ Bundle-ActivationPolicy: lazy Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: web.jar +Bundle-ClassPath: . Bundle-Activator: org.jboss.tools.jst.web.WebModelPlugin Bundle-Vendor: %providerName Plugin-Class: org.jboss.tools.jst.web.WebModelPlugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,11 +1,11 @@ -source.web.jar = src/,\ - resources/ +source.. = src/,\ + resources/ bin.includes = plugin.xml,\ plugin.properties,\ meta/,\ about.html,\ META-INF/,\ - web.jar,\ + .,\ catalog/,\ schema/ additional.bundles = org.eclipse.jem.util Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -271,10 +271,10 @@ <extension point="org.eclipse.wst.xml.core.catalogContributions"> <catalogContribution id="default"> - <uri name="http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" uri="catalog/web-facesconfig_1_2.xsd" /> + <uri name="http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd" uri="platform:/plugin/org.jboss.tools.jst.web/catalog/web-facesconfig_1_2.xsd" /> <uri name="http://java.sun.com/xml/ns/javaee/" - uri="catalog/javaee_5.xsd" /> + uri="platform:/plugin/org.jboss.tools.jst.web/catalog/javaee_5.xsd" /> </catalogContribution> </extension> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: web-tiles.jar +Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-SymbolicName: org.jboss.tools.jst.web.tiles;singleton:=true Bundle-Localization: plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,10 +1,10 @@ -jars.compile.order = web-tiles.jar -source.web-tiles.jar = src/,\ - resources/ -output.web-tiles.jar = /bin +jars.compile.order = . +source.. = src/,\ + resources/ +output.. = /bin src.includes = src/,\ resources/ -bin.includes = web-tiles.jar,\ +bin.includes = .,\ plugin.xml,\ plugin.properties,\ dtds/,\ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -88,8 +88,8 @@ <catalogContribution id="default"> <public publicId="-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN" - uri="dtds/tiles_config_1_1.dtd"/> + uri="platform:/plugin/org.jboss.tools.jst.web.tiles/dtds/tiles_config_1_1.dtd"/> </catalogContribution> </extension> -</plugin> \ No newline at end of file +</plugin> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy Bundle-Name: %pluginName -Bundle-ClassPath: tilesui.jar +Bundle-ClassPath: . Bundle-Activator: org.jboss.tools.jst.web.tiles.ui.TilesUIPlugin Bundle-Vendor: %providerName Bundle-SymbolicName: org.jboss.tools.jst.web.tiles.ui;singleton:=true Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,10 +1,10 @@ -jars.compile.order = tilesui.jar -source.tilesui.jar = src/,\ - resources/ -output.tilesui.jar = /bin +jars.compile.order = . +source.. = src/,\ + resources/ +output.. = /bin src.includes = src/,\ resources/ -bin.includes = tilesui.jar,\ +bin.includes = .,\ plugin.xml,\ plugin.properties,\ images/,\ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -4,7 +4,7 @@ <!-- contributorClass="org.jboss.tools.jst.web.tiles.editor.action.TilesActionBarContributor" --> <extension id="e" name="XML Editors" point="org.jboss.tools.common.model.ui.xmlEditor"> - <xmlEditor class="org.jboss.tools.jst.web.tiles.ui.editor.TilesCompoundEditor" contributorClass="org.jboss.tools.jst.web.tiles.ui.editor.action.TilesMultiPageContributor" entities="FileTiles" icon="images/xstudio/editors/tiles_definition.gif" name="%editors.tiles.name"> + <xmlEditor class="org.jboss.tools.jst.web.tiles.ui.editor.TilesCompoundEditor" contributorClass="org.jboss.tools.jst.web.tiles.ui.editor.action.TilesMultiPageContributor" entities="FileTiles" icon="$nl$/images/xstudio/editors/tiles_definition.gif" name="%editors.tiles.name"> </xmlEditor> </extension> <extension point="org.jboss.tools.common.model.ui.attributeAdapter"> @@ -44,7 +44,7 @@ <extension point="org.eclipse.ui.newWizards"> <category id="org.jboss.tools.struts" name="%NewWizardCat_Struts" parentCategory="org.jboss.tools.jst.web"> </category> - <wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.jst.web.tiles.ui.wizard.newfile.NewTilesFileWizard" icon="images/xstudio/wizards/new_tiles_file.gif" id="org.jboss.tools.jst.web.tiles.ui.wizard.newfile.NewTilesFileWizard" name="%new.tiles" project="false"> + <wizard category="org.jboss.tools.jst.web/org.jboss.tools.struts" class="org.jboss.tools.jst.web.tiles.ui.wizard.newfile.NewTilesFileWizard" icon="$nl$/images/xstudio/wizards/new_tiles_file.gif" id="org.jboss.tools.jst.web.tiles.ui.wizard.newfile.NewTilesFileWizard" name="%new.tiles" project="false"> <selection class="org.eclipse.core.resources.IResource"> </selection> <description> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2009-09-25 01:20:03 UTC (rev 17722) @@ -2,7 +2,6 @@ Bundle-ManifestVersion: 2 Bundle-ActivationPolicy: lazy Bundle-Name: %Bundle-Name.0 -Bundle-ClassPath: webui.jar Bundle-Activator: org.jboss.tools.jst.web.ui.WebUiPlugin Bundle-Vendor: %providerName Bundle-SymbolicName: org.jboss.tools.jst.web.ui;singleton:=true Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/build.properties 2009-09-25 01:20:03 UTC (rev 17722) @@ -1,7 +1,9 @@ -source.webui.jar = src/ bin.includes = plugin.xml,\ plugin.properties,\ images/,\ about.html,\ META-INF/,\ - webui.jar + . +jars.compile.order = . +source.. = src/ +output.. = bin/ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2009-09-25 00:39:53 UTC (rev 17721) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2009-09-25 01:20:03 UTC (rev 17722) @@ -30,10 +30,10 @@ class="org.jboss.tools.jst.web.ui.editors.WebCompoundEditor" contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" entities="FileWebApp,FileWebApp24,FileWebApp25" - icon="images/xstudio/editors/webapp_file.gif" + icon="$nl$/images/xstudio/editors/webapp_file.gif" name="%editors.web.name"> </xmlEditor> - <xmlEditor class="org.jboss.tools.jst.web.ui.editors.TLDCompoundEditor" contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" entities="FileTLD_PRO,FileTLD_1_2,FileTLD_2_0,FileTLD_2_1" icon="images/xstudio/editors/taglibs_file.gif" name="%editors.tld12.name"> + <xmlEditor class="org.jboss.tools.jst.web.ui.editors.TLDCompoundEditor" contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" entities="FileTLD_PRO,FileTLD_1_2,FileTLD_2_0,FileTLD_2_1" icon="$nl$/images/xstudio/editors/taglibs_file.gif" name="%editors.tld12.name"> </xmlEditor> </extension> <extension point="org.eclipse.ui.preferencePages"> @@ -44,7 +44,7 @@ <extension point="org.eclipse.ui.editors"> <editor class="org.jboss.tools.jst.web.ui.editors.TLDCompoundEditor" - contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" default="true" extensions="tld" icon="images/xstudio/editors/taglibs_file.gif" + contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor" default="true" extensions="tld" icon="$nl$/images/xstudio/editors/taglibs_file.gif" matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl" id="org.jboss.tools.jst.web.ui.editors.TLDCompoundEditor" name="%editors.tld12.name"> @@ -52,7 +52,7 @@ </extension> <extension point="org.eclipse.ui.actionSets"> <!--actionSet description="%actionSets.modelActions.description" id="com.redhat.studio.actionSet" label="%actionSets.modelActions.label" visible="true"> - <action class="org.jboss.tools.jst.web.ui.action.RunPageActionDelegate" icon="images/xstudio/actions/run_project.gif" id="org.jboss.tools.jst.web.ui.action.RunPageActionDelegate" label="%actionSets.serverActions.runApplicationFromSelectedElement.label" style="pulldown" toolbarPath="Normal/SSRun" tooltip="%actionSets.serverActions.runApplicationFromSelectedElement.label"> + <action class="org.jboss.tools.jst.web.ui.action.RunPageActionDelegate" icon="$nl$/images/xstudio/actions/run_project.gif" id="org.jboss.tools.jst.web.ui.action.RunPageActionDelegate" label="%actionSets.serverActions.runApplicationFromSelectedElement.label" style="pulldown" toolbarPath="Normal/SSRun" tooltip="%actionSets.serverActions.runApplicationFromSelectedElement.label"> </action> </actionSet--> </extension> @@ -95,7 +95,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_css_file.gif" + icon="$nl$/images/xstudio/wizards/new_css_file.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard" name="%NewWizard_CSSFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -110,7 +110,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.css.NewCSSClassWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_css_class.gif" + icon="$nl$/images/xstudio/wizards/new_css_class.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSClassWizard" name="%NewWizard_CSSClass" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -125,7 +125,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_js_file.gif" + icon="$nl$/images/xstudio/wizards/new_js_file.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileWizard" name="%NewWizard_JSFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -140,7 +140,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.newfile.NewWebFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_webapp_file.gif" + icon="$nl$/images/xstudio/wizards/new_webapp_file.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewWebFileWizard" name="%NewWizard_WebDescriptor" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -155,7 +155,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_jsp_file.gif" + icon="$nl$/images/xstudio/wizards/new_jsp_file.gif" id="org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFileWizard" name="%NewWizard_JSPFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -170,7 +170,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.common.model.ui.wizard.newfile.NewXHTMLFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_html_file.gif" + icon="$nl$/images/xstudio/wizards/new_html_file.gif" id="org.jboss.tools.common.model.ui.wizard.newfile.NewXHTMLFileWizard" name="%NewWizard_XHTMLFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -185,7 +185,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_html_file.gif" + icon="$nl$/images/xstudio/wizards/new_html_file.gif" id="org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFileWizard" name="%NewWizard_HTMLFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -199,7 +199,7 @@ <wizard category="org.jboss.tools.jst.web" class="org.jboss.tools.common.model.ui.wizard.newfile.NewPropertiesFileWizard" - icon="images/xstudio/wizards/new_properties_file.gif" + icon="$nl$/images/xstudio/wizards/new_properties_file.gif" id="org.jboss.tools.common.model.ui.wizard.newfile.NewPropertiesFileWizard" name="%NewWizard_PropertiesFile" project="false"> @@ -213,7 +213,7 @@ category="org.jboss.tools.jst.web" class="org.jboss.tools.jst.web.ui.wizards.newfile.NewTLDFileWizard" finalPerspective="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" - icon="images/xstudio/wizards/new_taglibs_file.gif" + icon="$nl$/images/xstudio/wizards/new_taglibs_file.gif" id="org.jboss.tools.jst.web.ui.wizards.newfile.NewTLDFileWizard" name="%NewWizard_TLDFile" preferredPerspectives="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" @@ -229,9 +229,9 @@ <extension id="org.jboss.tools.jst.web.ui.views" name="JBoss Tools" point="org.eclipse.ui.views"> <category id="web.views.category.id" name="%ViewCategory_JBossToolsWeb"> </category> - <view category="web.views.category.id" class="org.jboss.tools.common.model.ui.views.palette.PaletteViewPart" icon="images/xstudio/views/palette.gif" id="org.jboss.tools.common.model.ui.views.palette.PaletteView" name="%paletteViewPart.name"> + <view category="web.views.category.id" class="org.jboss.tools.common.model.ui.views.palette.PaletteViewPart" icon="$nl$/images/xstudio/views/palette.gif" id="org.jboss.tools.common.model.ui.views.palette.PaletteView" name="%paletteViewPart.name"> </view> - <view category="web.views.category.id" class="org.jboss.tools.jst.web.ui.navigator.WebProjectsNavigator" icon="images/xstudio/views/web_project.gif" id="org.jboss.tools.jst.web.ui.navigator.WebProjectsView" name="%ViewName_WebProjects"> + <view category="web.views.category.id" class="org.jboss.tools.jst.web.ui.navigator.WebProjectsNavigator" icon="$nl$/images/xstudio/views/web_project.gif" id="org.jboss.tools.jst.web.ui.navigator.WebProjectsView" name="%ViewName_WebProjects"> </view> </extension> @@ -309,7 +309,7 @@ </extension> <extension point="org.eclipse.ui.perspectives"> - <perspective class="org.jboss.tools.jst.web.ui.WebDevelopmentPerspectiveFactory" icon="images/xstudio/perspective.png" id="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" name="%perspective.name"> + <perspective class="org.jboss.tools.jst.web.ui.WebDevelopmentPerspectiveFactory" icon="$nl$/images/xstudio/perspective.png" id="org.jboss.tools.jst.web.ui.WebDevelopmentPerspective" name="%perspective.name"> </perspective> </extension> @@ -436,7 +436,7 @@ <navigatorContent name="%NavigatorContent_FileContentProvider" priority="normal" - icon="images/xstudio/views/web_project.gif" + icon="$nl$/images/xstudio/views/web_project.gif" activeByDefault="true" contentProvider="org.jboss.tools.jst.web.ui.navigator.XContentProvider" labelProvider="org.jboss.tools.jst.web.ui.navigator.WebProjectsLabelProvider" @@ -470,7 +470,7 @@ <navigatorContent name="%NavigatorContent_ProjectContentProvider" priority="highest" - icon="images/xstudio/views/web_project.gif" + icon="$nl$/images/xstudio/views/web_project.gif" activeByDefault="true" contentProvider="org.jboss.tools.jst.web.ui.navigator.XProjectContentProvider" labelProvider="org.jboss.tools.jst.web.ui.navigator.XLabelProvider"