Author: snjeza Date: 2008-11-15 13:41:30 -0500 (Sat, 15 Nov 2008) New Revision: 11812 Added: trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/Messages.java trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/messages.properties Modified: trunk/birt/plugins/org.jboss.tools.birt.core/META-INF/MANIFEST.MF trunk/birt/plugins/org.jboss.tools.birt.core/plugin.properties trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/BirtCoreActivator.java trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/BirtPostInstallListener.java trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/JBossBirtFacetInstallDelegate.java Log: JBIDE-3000 Internationalize BIRT component Modified: trunk/birt/plugins/org.jboss.tools.birt.core/META-INF/MANIFEST.MF =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.core/META-INF/MANIFEST.MF 2008-11-15 18:41:16 UTC (rev 11811) +++ trunk/birt/plugins/org.jboss.tools.birt.core/META-INF/MANIFEST.MF 2008-11-15 18:41:30 UTC (rev 11812) @@ -1,10 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: JBoss BIRT Core +Bundle-Name: %BundleName Bundle-SymbolicName: org.jboss.tools.birt.core;singleton:=true Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.birt.core.BirtCoreActivator -Bundle-Vendor: JBoss, a division of Red Hat +Bundle-Vendor: %BundleVendor Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/birt/plugins/org.jboss.tools.birt.core/plugin.properties =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.core/plugin.properties 2008-11-15 18:41:16 UTC (rev 11811) +++ trunk/birt/plugins/org.jboss.tools.birt.core/plugin.properties 2008-11-15 18:41:30 UTC (rev 11812) @@ -1,3 +1,6 @@ JBOSS_BIRT_FACET_LABEL=JBoss BIRT Reporting Runtime Component JBOSS_BIRT_FACET_DESCRIPTION=JBoss BIRT Reporting Runtime Component JBOSS_BIRT_FACET_TEMPLATE_LABEL=JBoss BIRT Integration Web Project + +BundleVendor = JBoss, a division of Red Hat +BundleName = JBoss BIRT Core \ No newline at end of file Modified: trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/BirtCoreActivator.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/BirtCoreActivator.java 2008-11-15 18:41:16 UTC (rev 11811) +++ trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/BirtCoreActivator.java 2008-11-15 18:41:30 UTC (rev 11812) @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; import org.eclipse.ui.dialogs.IOverwriteQuery; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; @@ -29,7 +30,7 @@ public class BirtCoreActivator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.birt.core"; + public static final String PLUGIN_ID = "org.jboss.tools.birt.core"; //$NON-NLS-1$ public static final IOverwriteQuery OVERWRITE_ALL_QUERY = new IOverwriteQuery() { @@ -42,11 +43,11 @@ private static BirtCoreActivator plugin; // The facet id - public static final String JBOSS_BIRT__FACET_ID = "jboss.birt"; + public static final String JBOSS_BIRT__FACET_ID = "jboss.birt"; //$NON-NLS-1$ - public static final String BIRT_FACET_ID = "birt.runtime"; + public static final String BIRT_FACET_ID = "birt.runtime"; //$NON-NLS-1$ - public static final String SEAM_FACET_ID = "jst.seam"; + public static final String SEAM_FACET_ID = "jst.seam"; //$NON-NLS-1$ /** @@ -85,12 +86,12 @@ public static void copyPlugin(IProject project,String pluginId, String destination, IProgressMonitor monitor) { IResource destResource = project.findMember(destination); if (!destResource.exists()) { - IStatus status = new Status(IStatus.WARNING,BirtCoreActivator.PLUGIN_ID,"The " + destination + " folder doesn't exist"); + IStatus status = new Status(IStatus.WARNING,BirtCoreActivator.PLUGIN_ID,NLS.bind(Messages.BirtCoreActivator_The_folder_doesnt_exists, destination)); BirtCoreActivator.getDefault().getLog().log(status); return; } if (destResource.getType() != IResource.FOLDER ) { - IStatus status = new Status(IStatus.WARNING,BirtCoreActivator.PLUGIN_ID,"The " + destination + " resource is not a folder"); + IStatus status = new Status(IStatus.WARNING,BirtCoreActivator.PLUGIN_ID,NLS.bind(Messages.BirtCoreActivator_The_resource_is_not_folder, destination)); BirtCoreActivator.getDefault().getLog().log(status); return; } @@ -102,7 +103,7 @@ File file = null; List<File> filesToImport = new ArrayList<File>(); if (bundleFile.isDirectory()) { - URL url = bundle.getEntry("/"); + URL url = bundle.getEntry("/"); //$NON-NLS-1$ String fileName = FileLocator.toFileURL(url).getFile(); file = new File(fileName); filesToImport.addAll(Arrays.asList(file.listFiles())); Added: trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/Messages.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/Messages.java (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/Messages.java 2008-11-15 18:41:30 UTC (rev 11812) @@ -0,0 +1,19 @@ +package org.jboss.tools.birt.core; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.birt.core.messages"; //$NON-NLS-1$ + public static String BirtCoreActivator_The_folder_doesnt_exists; + public static String BirtCoreActivator_The_resource_is_not_folder; + public static String BirtPostInstallListener_Error_while_creating_JBoss_BIRT_artifacts; + public static String BirtPostInstallListener_The_config_ini_file_doesnt_exist; + public static String BirtPostInstallListener_The_resource_is_not_a_folder; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/BirtPostInstallListener.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/BirtPostInstallListener.java 2008-11-15 18:41:16 UTC (rev 11811) +++ trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/BirtPostInstallListener.java 2008-11-15 18:41:30 UTC (rev 11812) @@ -35,6 +35,7 @@ import org.eclipse.jst.javaee.web.ServletMapping; import org.eclipse.jst.javaee.web.WebApp; import org.eclipse.jst.javaee.web.WebFactory; +import org.eclipse.osgi.util.NLS; import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; import org.eclipse.ui.wizards.datatransfer.ImportOperation; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -45,11 +46,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.birt.core.BirtCoreActivator; +import org.jboss.tools.birt.core.Messages; import org.osgi.framework.Bundle; public class BirtPostInstallListener implements IFacetedProjectListener { - private static final String JBossBirtCorePluginId = "org.jboss.tools.birt.core"; + private static final String JBossBirtCorePluginId = "org.jboss.tools.birt.core"; //$NON-NLS-1$ private String configFolder; public void handleEvent(IFacetedProjectEvent event) { @@ -83,7 +85,7 @@ configFolder = dataModel .getStringProperty("IJ2EEFacetInstallDataModelProperties.CONFIG_FOLDER"); //$NON-NLS-1$ if (configFolder == null) { - String message = BirtWTPMessages.BIRTErrors_wrong_webcontent; + String message = ""; //$NON-NLS-1$ Logger.log(Logger.ERROR, message); return; } @@ -93,12 +95,12 @@ } if (isJBossBirtProject || isBirtProject) { String configIniString = configFolder - + "/WEB-INF/platform/configuration/config.ini"; + + "/WEB-INF/platform/configuration/config.ini"; //$NON-NLS-1$ IProject project = facetedProject.getProject(); IResource configFile = project .findMember(new Path(configIniString)); if (!configFile.exists()) { - String message = "The config.ini file doesn't exist"; + String message = Messages.BirtPostInstallListener_The_config_ini_file_doesnt_exist; Logger.log(Logger.ERROR, message); return; } @@ -109,13 +111,13 @@ URL url = configFile.getLocation().toFile().toURL(); inputStream = url.openStream(); properties.load(inputStream); - String bootDelegation = "org.osgi.framework.bootdelegation"; - String loader = "osgi.parentClassloader"; + String bootDelegation = "org.osgi.framework.bootdelegation"; //$NON-NLS-1$ + String loader = "osgi.parentClassloader"; //$NON-NLS-1$ properties .put( bootDelegation, - "org.hibernate,org.hibernate.type,org.hibernate.metadata,org.hibernate.ejb, javax.persistence"); - properties.put(loader, "fwk"); + "org.hibernate,org.hibernate.type,org.hibernate.metadata,org.hibernate.ejb, javax.persistence"); //$NON-NLS-1$ + properties.put(loader, "fwk"); //$NON-NLS-1$ // FIXME // String compatibility = "osgi.compatibility.bootdelegation"; // properties.put(compatibility,"false"); @@ -146,29 +148,28 @@ } if (isBirtProject && !isJBossBirtProject) { - String platformFolder = configFolder + "/WEB-INF/platform/plugins"; + String platformFolder = configFolder + "/WEB-INF/platform/plugins"; //$NON-NLS-1$ IProject project = facetedProject.getProject(); IProgressMonitor monitor = new NullProgressMonitor(); - BirtCoreActivator.copyPlugin(project, "org.jboss.tools.birt.oda", + BirtCoreActivator.copyPlugin(project, "org.jboss.tools.birt.oda", //$NON-NLS-1$ platformFolder, monitor); } if (isSeamProject && (isBirtProject || isJBossBirtProject)) { IProject project = facetedProject.getProject(); - String libFolder = configFolder + "/WEB-INF/lib"; + String libFolder = configFolder + "/WEB-INF/lib"; //$NON-NLS-1$ IResource destResource = project.findMember(libFolder); if (destResource.getType() != IResource.FOLDER) { IStatus status = new Status(IStatus.WARNING, - BirtCoreActivator.PLUGIN_ID, "The " + libFolder - + " resource is not a folder"); + BirtCoreActivator.PLUGIN_ID, NLS.bind(Messages.BirtPostInstallListener_The_resource_is_not_a_folder,libFolder)); BirtCoreActivator.getDefault().getLog().log(status); return; } IFolder folder = (IFolder) destResource; Bundle bundle = Platform.getBundle(JBossBirtCorePluginId); URL entryComponent = bundle - .getEntry("/resources/jboss-seam-birt.jar"); + .getEntry("/resources/jboss-seam-birt.jar"); //$NON-NLS-1$ URL entryServlet = bundle - .getEntry("/resources/jboss-birt-servlet.jar"); + .getEntry("/resources/jboss-birt-servlet.jar"); //$NON-NLS-1$ try { copyEntry(entryComponent, folder); copyEntry(entryServlet, folder); @@ -176,7 +177,7 @@ } catch (Exception e) { IStatus status = new Status(IStatus.WARNING, BirtCoreActivator.PLUGIN_ID, - "Error while creating JBoss BIRT artifacts", e); + Messages.BirtPostInstallListener_Error_while_creating_JBoss_BIRT_artifacts, e); BirtCoreActivator.getDefault().getLog().log(status); } finally { configFolder = null; @@ -209,8 +210,8 @@ return; } WebApp webApp = (WebApp) modelObject; - String servletClass = "org.jboss.tools.birt.servlet.JBossBirtServlet"; - String servletName = "JBoss BIRT Servlet"; + String servletClass = "org.jboss.tools.birt.servlet.JBossBirtServlet"; //$NON-NLS-1$ + String servletName = "JBoss BIRT Servlet"; //$NON-NLS-1$ List servlets = webApp.getServlets(); boolean added = false; for (Iterator iterator = servlets.iterator(); iterator @@ -230,7 +231,7 @@ } String name = servletName; - String value="/embed"; + String value="/embed"; //$NON-NLS-1$ List servletMappings = webApp.getServletMappings(); added = false; for (Iterator iterator = servletMappings.iterator(); iterator.hasNext();) { Modified: trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/JBossBirtFacetInstallDelegate.java =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/JBossBirtFacetInstallDelegate.java 2008-11-15 18:41:16 UTC (rev 11811) +++ trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/internal/project/facet/JBossBirtFacetInstallDelegate.java 2008-11-15 18:41:30 UTC (rev 11812) @@ -33,6 +33,7 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.jboss.tools.birt.core.BirtCoreActivator; +import org.jboss.tools.birt.core.Messages; import org.osgi.framework.Bundle; public class JBossBirtFacetInstallDelegate extends BirtFacetInstallDelegate { @@ -45,8 +46,8 @@ IDataModel masterDataModel = (IDataModel) facetDataModel .getProperty(FacetInstallDataModelProvider.MASTER_PROJECT_DM); String configFolder = BirtWizardUtil.getConfigFolder(masterDataModel); - String platformFolder = configFolder + "/WEB-INF/platform/plugins"; - BirtCoreActivator.copyPlugin(project,"org.jboss.tools.birt.oda",platformFolder,monitor); + String platformFolder = configFolder + "/WEB-INF/platform/plugins"; //$NON-NLS-1$ + BirtCoreActivator.copyPlugin(project,"org.jboss.tools.birt.oda",platformFolder,monitor); //$NON-NLS-1$ //copyPlugin(project,"org.hibernate.eclipse",platformFolder,monitor); //copyPlugin(project,"org.eclipse.ui.console",platformFolder,monitor); //copyPlugin(project,"org.eclipse.jface",platformFolder,monitor); Added: trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/messages.properties =================================================================== --- trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/messages.properties (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.core/src/org/jboss/tools/birt/core/messages.properties 2008-11-15 18:41:30 UTC (rev 11812) @@ -0,0 +1,5 @@ +BirtCoreActivator_The_folder_doesnt_exists=The {0} folder doesn''t exist. +BirtCoreActivator_The_resource_is_not_folder=The {0} resource is not a folder. +BirtPostInstallListener_Error_while_creating_JBoss_BIRT_artifacts=Error while creating JBoss BIRT artifacts +BirtPostInstallListener_The_config_ini_file_doesnt_exist=The config.ini file doesn't exist +BirtPostInstallListener_The_resource_is_not_a_folder=The {0} resource is not a folder