Author: snjeza Date: 2008-11-16 16:44:27 -0500 (Sun, 16 Nov 2008) New Revision: 11817 Added: trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.properties trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/Messages.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/messages.properties Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF trunk/portlet/plugins/org.jboss.tools.portlet.core/build.properties trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IJBossWebUtil.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/BasePortletClasspathContainer.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/JSFPortlet10LibrariesContainerInitializer.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet10LibrariesContainerInitializer.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet20LibrariesContainerInitializer.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletConfigurationPresetFactory10.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDataModelProvider.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletConfigurationPresetFactory10.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletConfigurationPresetFactory10.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java Log: JBIDE-3001 Internationalize Portal component Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/META-INF/MANIFEST.MF 2008-11-16 21:44:27 UTC (rev 11817) @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Portlet Core Plug-in +Bundle-Name: %BundleName Bundle-SymbolicName: org.jboss.tools.portlet.core;singleton:=true Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.portlet.core.PortletCoreActivator -Bundle-Vendor: JBoss, a division of Red Hat +Bundle-Vendor: %BundleVendor Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.common.project.facet.core, org.eclipse.core.resources, @@ -24,3 +24,4 @@ Export-Package: org.jboss.tools.portlet.core, org.jboss.tools.portlet.core.internal, org.jboss.tools.portlet.core.internal.project.facet +Bundle-Localization: plugin Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/build.properties =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/build.properties 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/build.properties 2008-11-16 21:44:27 UTC (rev 11817) @@ -4,4 +4,5 @@ .,\ plugin.xml,\ resources/,\ - dtdsAndSchemas/ + dtdsAndSchemas/,\ + plugin.properties Added: trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.properties =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.properties (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/plugin.properties 2008-11-16 21:44:27 UTC (rev 11817) @@ -0,0 +1,3 @@ +#Properties file for org.jboss.tools.portlet.core +BundleVendor = JBoss, a division of Red Hat +BundleName = Portlet Core Plug-in \ No newline at end of file Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IJBossWebUtil.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IJBossWebUtil.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IJBossWebUtil.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -5,9 +5,9 @@ public interface IJBossWebUtil { - static final Object JSF_SERVLET_CLASS = "javax.faces.webapp.FacesServlet"; - static final String WEB_INF_FACES_CONFIG_XML = "/WEB-INF/faces-config.xml"; - static final String JAVAX_FACES_CONFIG_FILES = "javax.faces.CONFIG_FILES"; + static final Object JSF_SERVLET_CLASS = "javax.faces.webapp.FacesServlet"; //$NON-NLS-1$ + static final String WEB_INF_FACES_CONFIG_XML = "/WEB-INF/faces-config.xml"; //$NON-NLS-1$ + static final String JAVAX_FACES_CONFIG_FILES = "javax.faces.CONFIG_FILES"; //$NON-NLS-1$ void configureContextParam( IProject project, IProgressMonitor monitor,String name, String value,String description); Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -19,40 +19,40 @@ public interface IPortletConstants { - static final String PORTLET_FACET_ID="jboss.portlet"; + static final String PORTLET_FACET_ID="jboss.portlet"; //$NON-NLS-1$ - static final String JSFPORTLET_FACET_ID="jboss.jsfportlet"; + static final String JSFPORTLET_FACET_ID="jboss.jsfportlet"; //$NON-NLS-1$ - static final String SEAMPORTLET_FACET_ID="jboss.seamportlet"; + static final String SEAMPORTLET_FACET_ID="jboss.seamportlet"; //$NON-NLS-1$ - static final String CONFIG_PATH = "WEB-INF/portlet.xml"; + static final String CONFIG_PATH = "WEB-INF/portlet.xml"; //$NON-NLS-1$ - static final String PORTLET_FACET_VERSION_10 = "1.0"; + static final String PORTLET_FACET_VERSION_10 = "1.0"; //$NON-NLS-1$ - static final String PORTLET_FACET_VERSION_20 = "2.0"; + static final String PORTLET_FACET_VERSION_20 = "2.0"; //$NON-NLS-1$ - static final String JSFPORTLET_FACET_VERSION_10 = "1.0"; + static final String JSFPORTLET_FACET_VERSION_10 = "1.0"; //$NON-NLS-1$ - static final String PORTLET_CONTAINER_10_ID = "org.jboss.tools.portlet.core.internal.portletlibrarycontainer.v10"; + static final String PORTLET_CONTAINER_10_ID = "org.jboss.tools.portlet.core.internal.portletlibrarycontainer.v10"; //$NON-NLS-1$ - static final String PORTLET_CONTAINER_20_ID = "org.jboss.tools.portlet.core.internal.portletlibrarycontainer.v20"; + static final String PORTLET_CONTAINER_20_ID = "org.jboss.tools.portlet.core.internal.portletlibrarycontainer.v20"; //$NON-NLS-1$ - static final String JSFPORTLET_CONTAINER_10_ID = "org.jboss.tools.portlet.core.internal.jsfportletlibrarycontainer.v10"; + static final String JSFPORTLET_CONTAINER_10_ID = "org.jboss.tools.portlet.core.internal.jsfportletlibrarycontainer.v10"; //$NON-NLS-1$ - static final String PORTLET_INSTANCES_FILE = "WEB-INF/portlet-instances.xml"; + static final String PORTLET_INSTANCES_FILE = "WEB-INF/portlet-instances.xml"; //$NON-NLS-1$ - static final String PORTLET_OBJECT_FILE = "WEB-INF/default-object.xml"; + static final String PORTLET_OBJECT_FILE = "WEB-INF/default-object.xml"; //$NON-NLS-1$ - static final String JBOSS_APP_FILE = "WEB-INF/jboss-app.xml"; + static final String JBOSS_APP_FILE = "WEB-INF/jboss-app.xml"; //$NON-NLS-1$ - static final String DEPLOY_JARS = "DEPLOY_JARS"; + static final String DEPLOY_JARS = "DEPLOY_JARS"; //$NON-NLS-1$ - static final String PORTLET_BRIDGE_RUNTIME = "PORTLET_BRIDGE_RUNTIME"; + static final String PORTLET_BRIDGE_RUNTIME = "PORTLET_BRIDGE_RUNTIME"; //$NON-NLS-1$ - static final String JSF_SECTION = "jsfSection"; + static final String JSF_SECTION = "jsfSection"; //$NON-NLS-1$ - static final String WEB_INF_LIB = "WEB-INF/lib"; + static final String WEB_INF_LIB = "WEB-INF/lib"; //$NON-NLS-1$ - static final String JBOSS_PORTLET_FILE = "WEB-INF/jboss-portlet.xml"; + static final String JBOSS_PORTLET_FILE = "WEB-INF/jboss-portlet.xml"; //$NON-NLS-1$ } Added: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/Messages.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/Messages.java (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/Messages.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -0,0 +1,41 @@ +package org.jboss.tools.portlet.core; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.portlet.core.messages"; //$NON-NLS-1$ + public static String BasePortletClasspathContainer_Error_loading_classpath_container; + public static String JSFPortlet10LibrariesContainerInitializer_Error_loading_classpath_container; + public static String JSFPortlet10LibrariesContainerInitializer_JBoss_JSF_Portlet_Libraries_v1_0; + public static String JSFPortlet10LibrariesContainerInitializer_JBossJSF_Portlet_Classpath_Container_Initializer_v1_0; + public static String JSFPortletConfigurationPresetFactory10_JBoss_JSF_Portlet_Project_v1_0; + public static String JSFPortletFacetInstallDelegate_Cannot_configure_web_module_for_JBoss_JSF_Portlet_Facet; + public static String JSFPortletFacetInstallDelegate_Cannot_find_the_JSF_servlet; + public static String JSFPortletFacetInstallDelegate_Error_loading_classpath_container; + public static String JSFPortletFacetInstallDelegate_Missing_configuration; + public static String JSFPortletFacetInstallDelegate_The_web_xml_file_is_not_updateable; + public static String Portlet10LibrariesContainerInitializer_1; + public static String Portlet10LibrariesContainerInitializer_JBoss_Portlet_Classpath_Container_Initializer_v1_0; + public static String Portlet20LibrariesContainerInitializer_JBoss_Portlet_Classpath_Container_Initializer; + public static String Portlet20LibrariesContainerInitializer_JBoss_Portlet_Library; + public static String PortletConfigurationPresetFactory10_Portlet_Project_v1_0; + public static String PortletFacetInstallDelegate_Cannot_configure_web_module_for_JBoss_Portlet_Facet; + public static String PortletFacetInstallDelegate_Exception_occured_while_creating_portlet_xml; + public static String PortletFacetInstallDelegate_Missing_configuration; + public static String PortletFacetInstallDelegate_The_web_xml_file_is_not_updateable; + public static String PortletPostInstallListener_Cannot_find_Portletbridge_Runtime; + public static String PortletPostInstallListener_Cannot_find_the_examples_directory; + public static String PortletPostInstallListener_Cannot_find_the_RichFacesPortlet_war_file; + public static String PortletPostInstallListener_Invalid_Portletbridge_Runtime; + public static String SeamPortletConfigurationPresetFactory10_JBoss_Seam_Portlet_Project_v1_0; + public static String SeamPortletFacetInstallDelegate_Cannot_configure_web_module_for_JBoss_Seam_Portlet_Facet; + public static String SeamPortletFacetInstallDelegate_Missing_configuration; + public static String SeamPortletFacetInstallDelegate_The_web_xml_file_is_not_updateable; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -30,9 +30,9 @@ public class PortletCoreActivator extends Plugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.portlet.core"; - public static final String RESOURCES_FOLDER = "resources"; - public static final String JSFPORTLET_FOLDER = "jsfportlet"; + public static final String PLUGIN_ID = "org.jboss.tools.portlet.core"; //$NON-NLS-1$ + public static final String RESOURCES_FOLDER = "resources"; //$NON-NLS-1$ + public static final String JSFPORTLET_FOLDER = "jsfportlet"; //$NON-NLS-1$ public static final IOverwriteQuery OVERWRITE_ALL_QUERY = new IOverwriteQuery() { public String queryOverwrite(String pathString) { @@ -105,34 +105,34 @@ .getRootFolder().getUnderlyingFolder().getRawLocation().append( new Path(IPortletConstants.CONFIG_PATH)); StringBuffer buffer = new StringBuffer(); - buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); + buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$ if (IPortletConstants.PORTLET_FACET_VERSION_20.equals(versionString)) { buffer - .append("<portlet-app xmlns=\"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd\"...); - buffer.append("\n\t"); + .append("<portlet-app xmlns=\"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd\"...); //$NON-NLS-1$ + buffer.append("\n\t"); //$NON-NLS-1$ buffer - .append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "); - buffer.append("\n\t"); + .append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "); //$NON-NLS-1$ + buffer.append("\n\t"); //$NON-NLS-1$ buffer - .append("xsi:schemaLocation=\"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd\" "); - buffer.append("\n\t"); - buffer.append("version=\"2.0\">"); + .append("xsi:schemaLocation=\"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd\" "); //$NON-NLS-1$ + buffer.append("\n\t"); //$NON-NLS-1$ + buffer.append("version=\"2.0\">"); //$NON-NLS-1$ } else { buffer - .append("<portlet-app xmlns=\"http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd\"...); - buffer.append("\n\t"); + .append("<portlet-app xmlns=\"http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd\"...); //$NON-NLS-1$ + buffer.append("\n\t"); //$NON-NLS-1$ buffer - .append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""); - buffer.append("\n\t"); + .append("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""); //$NON-NLS-1$ + buffer.append("\n\t"); //$NON-NLS-1$ buffer - .append("xsi:schemaLocation=\"http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd\""); - buffer.append("\n\t"); - buffer.append("version=\"1.0\">"); + .append("xsi:schemaLocation=\"http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd\""); //$NON-NLS-1$ + buffer.append("\n\t"); //$NON-NLS-1$ + buffer.append("version=\"1.0\">"); //$NON-NLS-1$ } - buffer.append("\n\n"); - buffer.append("</portlet-app>"); - buffer.append("\n"); + buffer.append("\n\n"); //$NON-NLS-1$ + buffer.append("</portlet-app>"); //$NON-NLS-1$ + buffer.append("\n"); //$NON-NLS-1$ OutputStream outputStream = null; try { IPath directory = portletXmlPath.removeLastSegments(1); @@ -171,16 +171,16 @@ throws CoreException, UnsupportedEncodingException { StringBuffer buffer = new StringBuffer(); - buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); - buffer.append("<!DOCTYPE deployments PUBLIC \n"); - buffer.append("\"-//JBoss Portal//DTD Portlet Instances 2.6//EN\"\n"); + buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$ + buffer.append("<!DOCTYPE deployments PUBLIC \n"); //$NON-NLS-1$ + buffer.append("\"-//JBoss Portal//DTD Portlet Instances 2.6//EN\"\n"); //$NON-NLS-1$ buffer - .append("\"http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd\">"); - buffer.append("<deployments>"); - buffer.append("</deployments>"); + .append("\"http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd\">"); //$NON-NLS-1$ + buffer.append("<deployments>"); //$NON-NLS-1$ + buffer.append("</deployments>"); //$NON-NLS-1$ ByteArrayInputStream source = new ByteArrayInputStream(buffer - .toString().getBytes("UTF8")); + .toString().getBytes("UTF8")); //$NON-NLS-1$ file.create(source, true, new NullProgressMonitor()); } @@ -188,16 +188,16 @@ throws CoreException, UnsupportedEncodingException { StringBuffer buffer = new StringBuffer(); - buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); - buffer.append("<!DOCTYPE deployments PUBLIC \n"); - buffer.append("\"-//JBoss Portal//DTD Portal Object 2.6//EN\"\n"); + buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$ + buffer.append("<!DOCTYPE deployments PUBLIC \n"); //$NON-NLS-1$ + buffer.append("\"-//JBoss Portal//DTD Portal Object 2.6//EN\"\n"); //$NON-NLS-1$ buffer - .append("\"http://www.jboss.org/portal/dtd/portal-object_2_6.dtd\">"); - buffer.append("<deployments>"); - buffer.append("</deployments>"); + .append("\"http://www.jboss.org/portal/dtd/portal-object_2_6.dtd\">"); //$NON-NLS-1$ + buffer.append("<deployments>"); //$NON-NLS-1$ + buffer.append("</deployments>"); //$NON-NLS-1$ ByteArrayInputStream source = new ByteArrayInputStream(buffer - .toString().getBytes("UTF8")); + .toString().getBytes("UTF8")); //$NON-NLS-1$ file.create(source, true, new NullProgressMonitor()); } @@ -205,15 +205,15 @@ throws CoreException, UnsupportedEncodingException { StringBuffer buffer = new StringBuffer(); - buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); - buffer.append("<!DOCTYPE jboss-app PUBLIC \n"); - buffer.append("\"-//JBoss Portal//DTD JBoss Web Application 2.6//EN\"\n"); - buffer.append("\"http://www.jboss.org/portal/dtd/jboss-app_2_6....; - buffer.append("<jboss-app>"); - buffer.append("</jboss-app>"); + buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$ + buffer.append("<!DOCTYPE jboss-app PUBLIC \n"); //$NON-NLS-1$ + buffer.append("\"-//JBoss Portal//DTD JBoss Web Application 2.6//EN\"\n"); //$NON-NLS-1$ + buffer.append("\"http://www.jboss.org/portal/dtd/jboss-app_2_6....; //$NON-NLS-1$ + buffer.append("<jboss-app>"); //$NON-NLS-1$ + buffer.append("</jboss-app>"); //$NON-NLS-1$ ByteArrayInputStream source = new ByteArrayInputStream(buffer - .toString().getBytes("UTF8")); + .toString().getBytes("UTF8")); //$NON-NLS-1$ file.create(source, true, new NullProgressMonitor()); } @@ -221,16 +221,16 @@ throws CoreException, UnsupportedEncodingException { StringBuffer buffer = new StringBuffer(); - buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); - buffer.append("<!DOCTYPE portlet-app PUBLIC \n"); + buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$ + buffer.append("<!DOCTYPE portlet-app PUBLIC \n"); //$NON-NLS-1$ buffer - .append("\"-//JBoss Portal//DTD JBoss Portlet 2.6//EN\"\n"); - buffer.append("\"http://www.jboss.org/portal/dtd/jboss-portlet_...; - buffer.append("<portlet-app>"); - buffer.append("</portlet-app>"); + .append("\"-//JBoss Portal//DTD JBoss Portlet 2.6//EN\"\n"); //$NON-NLS-1$ + buffer.append("\"http://www.jboss.org/portal/dtd/jboss-portlet_...; //$NON-NLS-1$ + buffer.append("<portlet-app>"); //$NON-NLS-1$ + buffer.append("</portlet-app>"); //$NON-NLS-1$ ByteArrayInputStream source = new ByteArrayInputStream(buffer - .toString().getBytes("UTF8")); + .toString().getBytes("UTF8")); //$NON-NLS-1$ file.create(source, true, new NullProgressMonitor()); } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/BasePortletClasspathContainer.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/BasePortletClasspathContainer.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/BasePortletClasspathContainer.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -15,13 +15,14 @@ import org.eclipse.jdt.core.JavaCore; import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainer; import org.jboss.ide.eclipse.as.classpath.core.xpl.ClasspathDecorations; +import org.jboss.tools.portlet.core.Messages; import org.jboss.tools.portlet.core.PortletCoreActivator; public abstract class BasePortletClasspathContainer extends AbstractClasspathContainer { - private static final String PORTLET_FOLDER = "portlet"; + private static final String PORTLET_FOLDER = "portlet"; //$NON-NLS-1$ public final static String SUFFIX = PORTLET_FOLDER;//$NON-NLS-1$ - public final static String PREFIX = "org.jboss.tools.portlet.core"; - private static final String RESOURCES_FOLDER = "resources"; + public final static String PREFIX = "org.jboss.tools.portlet.core"; //$NON-NLS-1$ + private static final String RESOURCES_FOLDER = "resources"; //$NON-NLS-1$ public BasePortletClasspathContainer(IPath path, String description,String suffix) { super(path, description, suffix); @@ -31,11 +32,11 @@ protected String getBaseDir() { try { URL installURL = FileLocator.toFileURL(PortletCoreActivator - .getDefault().getBundle().getEntry("/")); + .getDefault().getBundle().getEntry("/")); //$NON-NLS-1$ return installURL.getFile().toString(); } catch (IOException e) { PortletCoreActivator - .log(e, "Error loading classpath container"); + .log(e, Messages.BasePortletClasspathContainer_Error_loading_classpath_container); } return null; } @@ -50,7 +51,7 @@ String version = getPortletVersion(); File libDir = new File(baseDir - + "/" + RESOURCES_FOLDER + "/" + PORTLET_FOLDER + "/" + version);//$NON-NLS-1$ //$NON-NLS-2$ + + "/" + RESOURCES_FOLDER + "/" + PORTLET_FOLDER + "/" + version);//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ File[] jars = libDir.listFiles(new FileFilter() { public boolean accept(File file) { Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/JSFPortlet10LibrariesContainerInitializer.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/JSFPortlet10LibrariesContainerInitializer.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/JSFPortlet10LibrariesContainerInitializer.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -28,6 +28,7 @@ import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainerInitializer; import org.jboss.ide.eclipse.as.classpath.core.xpl.ClasspathDecorations; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.Messages; import org.jboss.tools.portlet.core.PortletCoreActivator; /** @@ -38,7 +39,7 @@ AbstractClasspathContainerInitializer { public String getDescription(IPath containerPath, IJavaProject project) { - return "JBoss JSF Portlet Classpath Container Initializer v1.0"; + return Messages.JSFPortlet10LibrariesContainerInitializer_JBossJSF_Portlet_Classpath_Container_Initializer_v1_0; } @Override @@ -54,22 +55,21 @@ private class JSFPortlet10ClasspathContainer extends AbstractClasspathContainer { public final static String SUFFIX = PortletCoreActivator.JSFPORTLET_FOLDER;//$NON-NLS-1$ - public final static String PREFIX = "org.jboss.tools.portlet.core"; - public final static String DESCRIPTION = "JBoss JSF Portlet Libraries v1.0"; + public final static String PREFIX = "org.jboss.tools.portlet.core"; //$NON-NLS-1$ public JSFPortlet10ClasspathContainer(IPath path) { - super(path, DESCRIPTION, SUFFIX); + super(path, Messages.JSFPortlet10LibrariesContainerInitializer_JBoss_JSF_Portlet_Libraries_v1_0, SUFFIX); } @Override protected String getBaseDir() { try { URL installURL = FileLocator.toFileURL(PortletCoreActivator - .getDefault().getBundle().getEntry("/")); + .getDefault().getBundle().getEntry("/")); //$NON-NLS-1$ return installURL.getFile().toString(); } catch (IOException e) { PortletCoreActivator - .log(e, "Error loading classpath container"); + .log(e, Messages.JSFPortlet10LibrariesContainerInitializer_Error_loading_classpath_container); } return null; } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet10LibrariesContainerInitializer.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet10LibrariesContainerInitializer.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet10LibrariesContainerInitializer.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -15,6 +15,7 @@ import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainer; import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainerInitializer; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.Messages; /** * @author snjeza @@ -24,7 +25,7 @@ AbstractClasspathContainerInitializer { public String getDescription(IPath containerPath, IJavaProject project) { - return "JBoss Portlet Classpath Container Initializer v1.0"; + return Messages.Portlet10LibrariesContainerInitializer_JBoss_Portlet_Classpath_Container_Initializer_v1_0; } @Override @@ -39,10 +40,8 @@ private class Portlet10ClasspathContainer extends BasePortletClasspathContainer { - public final static String DESCRIPTION = "JBoss Portlet Libraries v1.0"; - public Portlet10ClasspathContainer(IPath path) { - super(path, DESCRIPTION, SUFFIX); + super(path, Messages.Portlet10LibrariesContainerInitializer_1, SUFFIX); } @Override Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet20LibrariesContainerInitializer.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet20LibrariesContainerInitializer.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet20LibrariesContainerInitializer.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -15,6 +15,7 @@ import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainer; import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainerInitializer; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.Messages; /** * @author snjeza @@ -24,7 +25,7 @@ AbstractClasspathContainerInitializer { public String getDescription(IPath containerPath, IJavaProject project) { - return "JBoss Portlet Classpath Container Initializer"; + return Messages.Portlet20LibrariesContainerInitializer_JBoss_Portlet_Classpath_Container_Initializer; } @Override @@ -39,10 +40,8 @@ private class Portlet10ClasspathContainer extends BasePortletClasspathContainer { - public final static String DESCRIPTION = "JBoss Portlet Library"; - public Portlet10ClasspathContainer(IPath path) { - super(path, DESCRIPTION, SUFFIX); + super(path, Messages.Portlet20LibrariesContainerInitializer_JBoss_Portlet_Library, SUFFIX); } @Override Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletConfigurationPresetFactory10.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletConfigurationPresetFactory10.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletConfigurationPresetFactory10.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -26,6 +26,7 @@ import org.eclipse.wst.common.project.facet.core.PresetDefinition; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.Messages; /** * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a> @@ -45,8 +46,8 @@ .getProjectFacetVersion(WebFacetUtils.WEB_FACET); final IProjectFacet PORTLET_FACET = ProjectFacetsManager.getProjectFacet(IPortletConstants.PORTLET_FACET_ID); final IProjectFacetVersion portletFacetVersion = PORTLET_FACET.getVersion(IPortletConstants.PORTLET_FACET_VERSION_10); - final IProjectFacet JSF_FACET = ProjectFacetsManager.getProjectFacet("jst.jsf"); - final IProjectFacetVersion jsfFacetVersion = JSF_FACET.getVersion("1.2"); + final IProjectFacet JSF_FACET = ProjectFacetsManager.getProjectFacet("jst.jsf"); //$NON-NLS-1$ + final IProjectFacetVersion jsfFacetVersion = JSF_FACET.getVersion("1.2"); //$NON-NLS-1$ if (webFacetVersion != null && webFacetVersion.compareTo(WebFacetUtils.WEB_23) >= 0 && portletFacetVersion != null) { @@ -60,8 +61,8 @@ facets.add(JavaFacetUtils.JAVA_50); facets.add(portletFacetVersion); facets.add(jsfFacetVersion); - return new PresetDefinition("JBoss JSF Portlet Project v1.0", - "JBoss JSF Portlet Project v1.0", facets); + return new PresetDefinition(Messages.JSFPortletConfigurationPresetFactory10_JBoss_JSF_Portlet_Project_v1_0, + Messages.JSFPortletConfigurationPresetFactory10_JBoss_JSF_Portlet_Project_v1_0, facets); } return null; } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDataModelProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDataModelProvider.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDataModelProvider.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -14,6 +14,7 @@ import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.Messages; /** * @author snjeza @@ -31,7 +32,7 @@ return Boolean.TRUE; } if (propertyName.equals(IPortletConstants.PORTLET_BRIDGE_RUNTIME)) { - return ""; + return ""; //$NON-NLS-1$ } return super.getDefaultProperty(propertyName); } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -51,6 +51,7 @@ import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.JBossWebUtil; import org.jboss.tools.portlet.core.JBossWebUtil25; +import org.jboss.tools.portlet.core.Messages; import org.jboss.tools.portlet.core.PortletCoreActivator; /** @@ -59,8 +60,8 @@ */ public class JSFPortletFacetInstallDelegate implements IDelegate { - private static final String ORG_JBOSS_PORTLET_STATE_MANAGER = "org.jboss.portletbridge.application.PortletStateManager"; - private static final String ORG_JBOSS_PORTLET_VIEW_HANDLER = "org.jboss.portletbridge.application.PortletViewHandler"; + private static final String ORG_JBOSS_PORTLET_STATE_MANAGER = "org.jboss.portletbridge.application.PortletStateManager"; //$NON-NLS-1$ + private static final String ORG_JBOSS_PORTLET_VIEW_HANDLER = "org.jboss.portletbridge.application.PortletViewHandler"; //$NON-NLS-1$ /* * (non-Javadoc) @@ -76,7 +77,7 @@ throws CoreException { if (monitor != null) { - monitor.beginTask("", 1); + monitor.beginTask("", 1); //$NON-NLS-1$ } try { IDataModel config = null; @@ -86,7 +87,7 @@ } else { throw new CoreException( PortletCoreActivator - .getStatus("Internal Error creating JBoss JSF Portlet Facet. Missing configuration.")); + .getStatus(Messages.JSFPortletFacetInstallDelegate_Missing_configuration)); } // check whether web.xml is available for update @@ -95,11 +96,11 @@ if (provider == null) { throw new CoreException( PortletCoreActivator - .getStatus("Cannot configure web module for JBoss JSF Portlet Facet")); + .getStatus(Messages.JSFPortletFacetInstallDelegate_Cannot_configure_web_module_for_JBoss_JSF_Portlet_Facet)); } else if (!(provider.validateEdit(null, null).isOK())) { if (!(provider.validateEdit(null, null).isOK())) { throw new CoreException(PortletCoreActivator - .getStatus("The web.xml file is not updateable")); + .getStatus(Messages.JSFPortletFacetInstallDelegate_The_web_xml_file_is_not_updateable)); } } @@ -222,37 +223,37 @@ } else { util = new JBossWebUtil(); } - String name = "org.ajax4jsf.VIEW_HANDLERS"; - String value = "org.jboss.portletbridge.application.FaceletPortletViewHandler"; + String name = "org.ajax4jsf.VIEW_HANDLERS"; //$NON-NLS-1$ + String value = "org.jboss.portletbridge.application.FaceletPortletViewHandler"; //$NON-NLS-1$ String description = null; util.configureContextParam(project, monitor, name, value, description); - name = "javax.portlet.faces.renderPolicy"; - value = "ALWAYS_DELEGATE"; + name = "javax.portlet.faces.renderPolicy"; //$NON-NLS-1$ + value = "ALWAYS_DELEGATE"; //$NON-NLS-1$ util.configureContextParam(project, monitor, name, value, description); // RichFaces settings - name = "org.richfaces.LoadStyleStrategy"; - value = "NONE"; + name = "org.richfaces.LoadStyleStrategy"; //$NON-NLS-1$ + value = "NONE"; //$NON-NLS-1$ util.configureContextParam(project, monitor, name, value, description); - name = "org.richfaces.LoadScriptStrategy"; - value = "NONE"; + name = "org.richfaces.LoadScriptStrategy"; //$NON-NLS-1$ + value = "NONE"; //$NON-NLS-1$ util.configureContextParam(project, monitor, name, value, description); - name = "org.ajax4jsf.RESOURCE_URI_PREFIX"; - value = "rfRes"; + name = "org.ajax4jsf.RESOURCE_URI_PREFIX"; //$NON-NLS-1$ + value = "rfRes"; //$NON-NLS-1$ util.configureContextParam(project, monitor, name, value, description); - String displayName = "Ajax4jsf Filter"; - String filterName = "ajax4jsf"; - String className = "org.ajax4jsf.Filter"; + String displayName = "Ajax4jsf Filter"; //$NON-NLS-1$ + String filterName = "ajax4jsf"; //$NON-NLS-1$ + String className = "org.ajax4jsf.Filter"; //$NON-NLS-1$ util.configureFilter(project, monitor, filterName, className, displayName, description); @@ -260,7 +261,7 @@ .getModelObject()); if (servletName == null) { RuntimeException e = new RuntimeException( - "Cannot find the JSF servlet"); + Messages.JSFPortletFacetInstallDelegate_Cannot_find_the_JSF_servlet); PortletCoreActivator.log(e); throw e; } @@ -290,7 +291,7 @@ String[] fileList = pbFolder.list(new FilenameFilter() { public boolean accept(File dir, String name) { - if (name.startsWith("portletbridge") || name.endsWith(".jar")) { + if (name.startsWith("portletbridge") || name.endsWith(".jar")) { //$NON-NLS-1$ //$NON-NLS-2$ return true; } return false; @@ -321,7 +322,7 @@ } } catch (Exception e) { PortletCoreActivator - .log(e, "Error loading classpath container"); + .log(e, Messages.JSFPortletFacetInstallDelegate_Error_loading_classpath_container); } } else { IPath containerPath = new Path( Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletConfigurationPresetFactory10.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletConfigurationPresetFactory10.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletConfigurationPresetFactory10.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -26,6 +26,7 @@ import org.eclipse.wst.common.project.facet.core.PresetDefinition; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.Messages; /** * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a> @@ -53,8 +54,8 @@ facets.add(portletFacetVersion10); facets.add(webFacetVersion); facets.add(JavaFacetUtils.JAVA_50); - return new PresetDefinition("Portlet Project v1.0", - "Portlet Project v1.0", facets); + return new PresetDefinition(Messages.PortletConfigurationPresetFactory10_Portlet_Project_v1_0, + Messages.PortletConfigurationPresetFactory10_Portlet_Project_v1_0, facets); } return null; } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -25,6 +25,7 @@ import org.eclipse.wst.common.project.facet.core.IDelegate; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.Messages; import org.jboss.tools.portlet.core.PortletCoreActivator; /** @@ -47,7 +48,7 @@ throws CoreException { if (monitor != null) { - monitor.beginTask("", 1); + monitor.beginTask("", 1); //$NON-NLS-1$ } try { IDataModel config = null; @@ -57,7 +58,7 @@ } else { throw new CoreException( PortletCoreActivator - .getStatus("Internal Error creating JBoss Portlet Facet. Missing configuration.")); + .getStatus(Messages.PortletFacetInstallDelegate_Missing_configuration)); } // check whether web.xml is available for update @@ -66,11 +67,11 @@ if (provider == null) { throw new CoreException( PortletCoreActivator - .getStatus("Cannot configure web module for JBoss Portlet Facet")); + .getStatus(Messages.PortletFacetInstallDelegate_Cannot_configure_web_module_for_JBoss_Portlet_Facet)); } else if (!(provider.validateEdit(null, null).isOK())) { if (!(provider.validateEdit(null, null).isOK())) { throw new CoreException(PortletCoreActivator - .getStatus("The web.xml file is not updateable")); + .getStatus(Messages.PortletFacetInstallDelegate_The_web_xml_file_is_not_updateable)); } } @@ -121,7 +122,7 @@ op.run(monitor); } catch (CoreException e) { PortletCoreActivator.log(e, - "Exception occured while creating portlet.xml"); + Messages.PortletFacetInstallDelegate_Exception_occured_while_creating_portlet_xml); } } } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -28,11 +28,12 @@ import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener; import org.eclipse.wst.common.project.facet.core.events.IProjectFacetActionEvent; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.Messages; import org.jboss.tools.portlet.core.PortletCoreActivator; public class PortletPostInstallListener implements IFacetedProjectListener { - private static final String SEAM_FACET_ID = "jst.seam"; + private static final String SEAM_FACET_ID = "jst.seam"; //$NON-NLS-1$ private static final IOverwriteQuery OVERWRITE_NONE_QUERY = new IOverwriteQuery() { public String queryOverwrite(String pathString) @@ -69,7 +70,7 @@ portletbridgeRuntime = dataModel .getStringProperty(IPortletConstants.PORTLET_BRIDGE_RUNTIME); if (portletbridgeRuntime == null) { - PortletCoreActivator.log(null, "Invalid Portletbridge Runtime."); + PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Invalid_Portletbridge_Runtime); return; } } catch (Exception e) { @@ -80,21 +81,21 @@ if (isJSFPortlet) { File portletbridgeHome = new File(portletbridgeRuntime); if (!portletbridgeHome.exists()) { - PortletCoreActivator.log(null, "Cannot find Portletbridge Runtime."); + PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Cannot_find_Portletbridge_Runtime); return; } if (!portletbridgeHome.isDirectory()) { - PortletCoreActivator.log(null, "Invalid Portletbridge Runtime."); + PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Invalid_Portletbridge_Runtime); return; } - File examplesHome = new File(portletbridgeHome,"examples"); + File examplesHome = new File(portletbridgeHome,"examples"); //$NON-NLS-1$ if (!examplesHome.exists() || !examplesHome.isDirectory()) { - PortletCoreActivator.log(null, "Cannot find the examples directory."); + PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Cannot_find_the_examples_directory); return; } - File richFacesPortletZip = new File(examplesHome,"RichFacesPortlet.war"); + File richFacesPortletZip = new File(examplesHome,"RichFacesPortlet.war"); //$NON-NLS-1$ if (!richFacesPortletZip.exists() || !richFacesPortletZip.isFile()) { - PortletCoreActivator.log(null, "Cannot find the RichFacesPortlet.war file."); + PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Cannot_find_the_RichFacesPortlet_war_file); return; } try { @@ -132,17 +133,17 @@ Enumeration<? extends ZipEntry> entries = zipFile.entries(); while (entries.hasMoreElements()) { ZipEntry entry = entries.nextElement(); - if (entry.getName().endsWith(".jar")) { - if (entry.getName().startsWith("WEB-INF/lib/richfaces")) { + if (entry.getName().endsWith(".jar")) { //$NON-NLS-1$ + if (entry.getName().startsWith("WEB-INF/lib/richfaces")) { //$NON-NLS-1$ list.add(entry); } if (!isSeamProject) { if (entry.getName().startsWith( - "WEB-INF/lib/commons-beanutils") + "WEB-INF/lib/commons-beanutils") //$NON-NLS-1$ || entry.getName().startsWith( - "WEB-INF/lib/commons-digester") + "WEB-INF/lib/commons-digester") //$NON-NLS-1$ || entry.getName().startsWith( - "WEB-INF/lib/jsf-facelets")) { + "WEB-INF/lib/jsf-facelets")) { //$NON-NLS-1$ list.add(entry); } } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletConfigurationPresetFactory10.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletConfigurationPresetFactory10.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletConfigurationPresetFactory10.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -26,6 +26,7 @@ import org.eclipse.wst.common.project.facet.core.PresetDefinition; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.Messages; /** * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a> @@ -45,10 +46,10 @@ .getProjectFacetVersion(WebFacetUtils.WEB_FACET); final IProjectFacet PORTLET_FACET = ProjectFacetsManager.getProjectFacet(IPortletConstants.PORTLET_FACET_ID); final IProjectFacetVersion portletFacetVersion = PORTLET_FACET.getVersion(IPortletConstants.PORTLET_FACET_VERSION_10); - final IProjectFacet JSF_FACET = ProjectFacetsManager.getProjectFacet("jst.jsf"); - final IProjectFacetVersion jsfFacetVersion = JSF_FACET.getVersion("1.2"); - final IProjectFacet SEAM_FACET = ProjectFacetsManager.getProjectFacet("jst.seam"); - final IProjectFacetVersion seamFacetVersion = SEAM_FACET.getVersion("2.0"); + final IProjectFacet JSF_FACET = ProjectFacetsManager.getProjectFacet("jst.jsf"); //$NON-NLS-1$ + final IProjectFacetVersion jsfFacetVersion = JSF_FACET.getVersion("1.2"); //$NON-NLS-1$ + final IProjectFacet SEAM_FACET = ProjectFacetsManager.getProjectFacet("jst.seam"); //$NON-NLS-1$ + final IProjectFacetVersion seamFacetVersion = SEAM_FACET.getVersion("2.0"); //$NON-NLS-1$ if (webFacetVersion != null && webFacetVersion.compareTo(WebFacetUtils.WEB_23) >= 0 && portletFacetVersion != null) { @@ -63,8 +64,8 @@ facets.add(portletFacetVersion); facets.add(jsfFacetVersion); facets.add(seamFacetVersion); - return new PresetDefinition("JBoss Seam Portlet Project v1.0", - "JBoss Seam Portlet Project v1.0", facets); + return new PresetDefinition(Messages.SeamPortletConfigurationPresetFactory10_JBoss_Seam_Portlet_Project_v1_0, + Messages.SeamPortletConfigurationPresetFactory10_JBoss_Seam_Portlet_Project_v1_0, facets); } return null; } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java 2008-11-16 21:43:50 UTC (rev 11816) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java 2008-11-16 21:44:27 UTC (rev 11817) @@ -49,6 +49,7 @@ import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.JBossWebUtil; import org.jboss.tools.portlet.core.JBossWebUtil25; +import org.jboss.tools.portlet.core.Messages; import org.jboss.tools.portlet.core.PortletCoreActivator; /** @@ -71,7 +72,7 @@ throws CoreException { if (monitor != null) { - monitor.beginTask("", 1); + monitor.beginTask("", 1); //$NON-NLS-1$ } try { IDataModel config = null; @@ -81,7 +82,7 @@ } else { throw new CoreException( PortletCoreActivator - .getStatus("Internal Error creating JBoss Seam Portlet Facet. Missing configuration.")); + .getStatus(Messages.SeamPortletFacetInstallDelegate_Missing_configuration)); } // check whether web.xml is available for update @@ -90,11 +91,11 @@ if (provider == null) { throw new CoreException( PortletCoreActivator - .getStatus("Cannot configure web module for JBoss Seam Portlet Facet")); + .getStatus(Messages.SeamPortletFacetInstallDelegate_Cannot_configure_web_module_for_JBoss_Seam_Portlet_Facet)); } else if (!(provider.validateEdit(null, null).isOK())) { if (!(provider.validateEdit(null, null).isOK())) { throw new CoreException(PortletCoreActivator - .getStatus("The web.xml file is not updateable")); + .getStatus(Messages.SeamPortletFacetInstallDelegate_The_web_xml_file_is_not_updateable)); } } @@ -130,15 +131,15 @@ } else { util = new JBossWebUtil(); } - String name = "org.jboss.portletbridge.ExceptionHandler"; - String value = "org.jboss.portletbridge.SeamExceptionHandlerImpl"; + String name = "org.jboss.portletbridge.ExceptionHandler"; //$NON-NLS-1$ + String value = "org.jboss.portletbridge.SeamExceptionHandlerImpl"; //$NON-NLS-1$ String description = null; util.configureContextParam(project, monitor, name, value, description); // FIXME optional for Seam portlets version 2.1.x and up - name = "javax.faces.LIFECYCLE_ID"; - value = "SEAM_PORTLET"; + name = "javax.faces.LIFECYCLE_ID"; //$NON-NLS-1$ + value = "SEAM_PORTLET"; //$NON-NLS-1$ util.configureContextParam(project, monitor, name, value, description); } Added: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/messages.properties =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/messages.properties (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/messages.properties 2008-11-16 21:44:27 UTC (rev 11817) @@ -0,0 +1,27 @@ +BasePortletClasspathContainer_Error_loading_classpath_container=Error loading classpath container +JSFPortlet10LibrariesContainerInitializer_Error_loading_classpath_container=Error loading classpath container +JSFPortlet10LibrariesContainerInitializer_JBoss_JSF_Portlet_Libraries_v1_0=JBoss JSF Portlet Libraries v1.0 +JSFPortlet10LibrariesContainerInitializer_JBossJSF_Portlet_Classpath_Container_Initializer_v1_0=JBoss JSF Portlet Classpath Container Initializer v1.0 +JSFPortletConfigurationPresetFactory10_JBoss_JSF_Portlet_Project_v1_0=JBoss JSF Portlet Project v1.0 +JSFPortletFacetInstallDelegate_Cannot_configure_web_module_for_JBoss_JSF_Portlet_Facet=Cannot configure web module for JBoss JSF Portlet Facet +JSFPortletFacetInstallDelegate_Cannot_find_the_JSF_servlet=Cannot find the JSF servlet +JSFPortletFacetInstallDelegate_Error_loading_classpath_container=Error loading classpath container +JSFPortletFacetInstallDelegate_Missing_configuration=Internal Error creating JBoss JSF Portlet Facet. Missing configuration. +JSFPortletFacetInstallDelegate_The_web_xml_file_is_not_updateable=The web.xml file is not updateable +Portlet10LibrariesContainerInitializer_1=JBoss Portlet Libraries v1.0 +Portlet10LibrariesContainerInitializer_JBoss_Portlet_Classpath_Container_Initializer_v1_0=JBoss Portlet Classpath Container Initializer v1.0 +Portlet20LibrariesContainerInitializer_JBoss_Portlet_Classpath_Container_Initializer=JBoss Portlet Classpath Container Initializer +Portlet20LibrariesContainerInitializer_JBoss_Portlet_Library=JBoss Portlet Library +PortletConfigurationPresetFactory10_Portlet_Project_v1_0=Portlet Project v1.0 +PortletFacetInstallDelegate_Cannot_configure_web_module_for_JBoss_Portlet_Facet=Cannot configure web module for JBoss Portlet Facet +PortletFacetInstallDelegate_Exception_occured_while_creating_portlet_xml=Exception occured while creating portlet.xml +PortletFacetInstallDelegate_Missing_configuration=Internal Error creating JBoss Portlet Facet. Missing configuration. +PortletFacetInstallDelegate_The_web_xml_file_is_not_updateable=The web.xml file is not updateable +PortletPostInstallListener_Cannot_find_Portletbridge_Runtime=Cannot find Portletbridge Runtime. +PortletPostInstallListener_Cannot_find_the_examples_directory=Cannot find the examples directory. +PortletPostInstallListener_Cannot_find_the_RichFacesPortlet_war_file=Cannot find the RichFacesPortlet.war file. +PortletPostInstallListener_Invalid_Portletbridge_Runtime=Invalid Portletbridge Runtime. +SeamPortletConfigurationPresetFactory10_JBoss_Seam_Portlet_Project_v1_0=JBoss Seam Portlet Project v1.0 +SeamPortletFacetInstallDelegate_Cannot_configure_web_module_for_JBoss_Seam_Portlet_Facet=Cannot configure web module for JBoss Seam Portlet Facet +SeamPortletFacetInstallDelegate_Missing_configuration=Internal Error creating JBoss Seam Portlet Facet. Missing configuration. +SeamPortletFacetInstallDelegate_The_web_xml_file_is_not_updateable=The web.xml file is not updateable