bug 245772 - NLS Message refactoring
diff --git a/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF
index 7fefa24..1232750 100644
--- a/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF
@@ -25,11 +25,11 @@
  org.eclipse.wst.xsl.core.internal.modelhandler;x-internal:=true,
  org.eclipse.wst.xsl.core.internal.parser;x-internal:=true,
  org.eclipse.wst.xsl.core.internal.parser.regions;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.preferences,
+ org.eclipse.wst.xsl.core.internal.preferences;x-internal:=true,
  org.eclipse.wst.xsl.core.internal.regions;x-internal:=true,
  org.eclipse.wst.xsl.core.internal.text;x-internal:=true,
  org.eclipse.wst.xsl.core.internal.text.rules;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.util,
+ org.eclipse.wst.xsl.core.internal.util;x-internal:=true,
  org.eclipse.wst.xsl.core.internal.validation;x-internal:=true,
  org.eclipse.wst.xsl.core.internal.validation.eclipse;x-internal:=true,
  org.eclipse.wst.xsl.core.internal.xinclude;x-internal:=true,
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/Messages.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/Messages.java
new file mode 100644
index 0000000..74bda71
--- /dev/null
+++ b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/Messages.java
@@ -0,0 +1,168 @@
+/**********************************************************************
+ * Copyright (c) 2005, 2008 IBM Corporation and others. All rights reserved.   This
+ * program and the accompanying materials are made available under the terms of
+ * the Eclipse Public License v1.0 which accompanies this distribution, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors: 
+ * IBM - Initial API and implementation
+ * Jesper Steen M�ller - adapted from org.eclipse.core.internal.content
+ **********************************************************************/
+package org.eclipse.wst.xsl.core;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Jesper Steen
+ *
+ */
+// Runtime plugin message catalog
+
+public class Messages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.core.messages"; //$NON-NLS-1$
+
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	// Content type manager
+	public static String XSLCorePlugin_parserConfiguration;
+
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XSLCorePlugin_badInitializationData;
+
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XSLCorePlugin_coreError;
+	
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XIncludeTask_0;
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XIncludeTask_1;
+	
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XIncludeTask_2;
+	
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XIncludeTask_3;
+	
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XIncludeTask_4;
+	
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XIncludeTask_5;
+	
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XIncludeTask_6;
+	
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XIncludeTask_7;
+	
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XIncludeTask_8;
+	
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static String XIncludeTask_9;
+	public static String XSLValidator_1;
+	/**
+	 * Stylesheet importing itself
+	 */
+	public static String XSLValidator_10;
+	/**
+	 * Template conflict (internal)
+	 */
+	public static String XSLValidator_11;
+	/**
+	 * Template conflict (included)
+	 */
+	public static String XSLValidator_12;
+	/**
+	 * Template conflict (external)
+	 */
+	public static String XSLValidator_13;
+	/**
+	 * Parameter missing name attribute
+	 */
+	public static String XSLValidator_14;
+	/**
+	 * Parameter with empty name attribute
+	 */
+	public static String XSLValidator_15;
+	/**
+	 * Duplicate parameter
+	 */
+	public static String XSLValidator_16;
+	/**
+	 * Unresolved named template
+	 */
+	public static String XSLValidator_18;
+	/**
+	 * Circular reference
+	 */
+	public static String XSLValidator_2;
+	/**
+	 * Parameter without default value
+	 */
+	public static String XSLValidator_20;
+	/**
+	 * Parameter does not exist
+	 */
+	public static String XSLValidator_22;
+	/**
+	 * href attribute is required
+	 */
+	public static String XSLValidator_23;
+	/**
+	 * Missing parameter
+	 */
+	public static String XSLValidator_3;
+	/**
+	 * Unresolved include
+	 */
+	public static String XSLValidator_4;
+	/**
+	 * Stylesheet includes itself
+	 */
+	public static String XSLValidator_6;
+	/**
+	 *  Unresolved import
+	 */
+	public static String XSLValidator_8;
+	
+	
+
+	static {
+		// load message values from bundle file
+		reloadMessages();
+	}
+
+	/**
+	 * TODO: Add JavaDoc
+	 */
+	public static void reloadMessages() {
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/Messages.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/Messages.java
deleted file mode 100644
index 376e7be..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/Messages.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- * Jesper Steen M�ller - adapted from org.eclipse.core.internal.content
- **********************************************************************/
-package org.eclipse.wst.xsl.core.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Jesper Steen
- *
- */
-// Runtime plugin message catalog
-
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.core.internal.messages"; //$NON-NLS-1$
-
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	// Content type manager
-	public static String XSLCorePlugin_parserConfiguration;
-
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XSLCorePlugin_badInitializationData;
-
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XSLCorePlugin_coreError;
-
-	static {
-		// load message values from bundle file
-		reloadMessages();
-	}
-
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static void reloadMessages() {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/XSLCorePlugin.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/XSLCorePlugin.java
index 13fc521..e1b7641 100644
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/XSLCorePlugin.java
+++ b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/XSLCorePlugin.java
@@ -19,6 +19,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.wst.xsl.core.Messages;
 import org.eclipse.wst.xsl.core.model.StylesheetModel;
 import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/Messages.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/Messages.java
deleted file mode 100644
index f080f8e..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/Messages.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.wst.xsl.core.internal.ant;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The XInclude message properties for string externalization
- * @author dcarver
- *
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.core.internal.ant.messages"; //$NON-NLS-1$
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_0;
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_1;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_2;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_3;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_4;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_5;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_6;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_7;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_8;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_9;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/XIncludeTask.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/XIncludeTask.java
index eaf33bb..9a06391 100644
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/XIncludeTask.java
+++ b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/XIncludeTask.java
@@ -19,9 +19,11 @@
 import org.apache.tools.ant.Project;

 import org.apache.tools.ant.Task;

 import org.eclipse.wst.xsl.core.internal.xinclude.XIncluder;

+import org.eclipse.wst.xsl.core.Messages;

 

 /**

- * TODO: Add Java Doc

+ * This class provides an XInclude ANT task definition.

+ * 

  * @author Lars Vogel

  *

  */

diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/messages.properties b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/messages.properties
deleted file mode 100644
index 4e6ad93..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/messages.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-XIncludeTask_0=Setting the output File to: 
-XIncludeTask_1=Setting the output File to: 
-XIncludeTask_2=Executing the XIncludeTask
-XIncludeTask_3=Specified Inputfile does not exists 
-XIncludeTask_4=Creating the output directory 
-XIncludeTask_5=Could not create outputfile
-XIncludeTask_6=Changes detected. Creating a new output file
-XIncludeTask_7=Problems with accessing the files.
-XIncludeTask_8=Please specify inputfile 
-XIncludeTask_9=Please specify outputfile 
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/messages.properties b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/messages.properties
deleted file mode 100644
index 0311938..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/messages.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jesper Steen Møller - adapted from org.eclipse.core.internal.content 
-###############################################################################
-
-### Resolver problems
-XSLCorePlugin_badInitializationData = Invalid initialization data for "{0}".
-XSLCorePlugin_parserConfiguration = XSL parser configuration error during content description.
-XSLCorePlugin_coreError=Error logged from XSL core plug-in\: 
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/Messages.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/Messages.java
deleted file mode 100644
index 1eff7fa..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/Messages.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.internal.validation;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Messages for the validator.
- * 
- * @author dcarver
- */
-public class Messages extends NLS
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.core.internal.validation.messages"; //$NON-NLS-1$
-	/**
-	 * Invalid xpath.
-	 */
-	public static String XSLValidator_1;
-	/**
-	 * Stylesheet importing itself
-	 */
-	public static String XSLValidator_10;
-	/**
-	 * Template conflict (internal)
-	 */
-	public static String XSLValidator_11;
-	/**
-	 * Template conflict (included)
-	 */
-	public static String XSLValidator_12;
-	/**
-	 * Template conflict (external)
-	 */
-	public static String XSLValidator_13;
-	/**
-	 * Parameter missing name attribute
-	 */
-	public static String XSLValidator_14;
-	/**
-	 * Parameter with empty name attribute
-	 */
-	public static String XSLValidator_15;
-	/**
-	 * Duplicate parameter
-	 */
-	public static String XSLValidator_16;
-	/**
-	 * Unresolved named template
-	 */
-	public static String XSLValidator_18;
-	/**
-	 * Circular reference
-	 */
-	public static String XSLValidator_2;
-	/**
-	 * Parameter without default value
-	 */
-	public static String XSLValidator_20;
-	/**
-	 * Parameter does not exist
-	 */
-	public static String XSLValidator_22;
-	/**
-	 * href attribute is required
-	 */
-	public static String XSLValidator_23;
-	/**
-	 * Missing parameter
-	 */
-	public static String XSLValidator_3;
-	/**
-	 * Unresolved include
-	 */
-	public static String XSLValidator_4;
-	/**
-	 * Stylesheet includes itself
-	 */
-	public static String XSLValidator_6;
-	/**
-	 *  Unresolved import
-	 */
-	public static String XSLValidator_8;
-
-	static
-	{
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages()
-	{
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidationReport.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidationReport.java
index b26393e..c292ad1 100644
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidationReport.java
+++ b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidationReport.java
@@ -18,6 +18,7 @@
 import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
 import org.eclipse.wst.xsl.core.model.XSLNode;
 
+
 /**
  * A validation report for the XSL validator.
  * 
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidator.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidator.java
index d247560..bfded2d 100644
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidator.java
+++ b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidator.java
@@ -36,6 +36,8 @@
 import org.eclipse.wst.xsl.core.model.XSLAttribute;
 import org.eclipse.wst.xsl.core.model.XSLElement;
 import org.eclipse.wst.xsl.core.model.XSLNode;
+import org.eclipse.wst.xsl.core.Messages;
+
 
 /**
  * The XSL validator for workspace XSL files.
@@ -279,7 +281,8 @@
 			List<Template> templateList = stylesheetComposed.getTemplatesByName(calledTemplate.getName());
 			if (templateList.size() == 0)
 			{
-				createMarker(report, calledTemplate.getAttribute("name"), getPreference(ValidationPreferences.CALL_TEMPLATES), MessageFormat.format(Messages.XSLValidator_18, calledTemplate.getName())); //$NON-NLS-1$
+				Object[] messageArgs = { calledTemplate.getName() };
+				createMarker(report, calledTemplate.getAttribute("name"), getPreference(ValidationPreferences.CALL_TEMPLATES), MessageFormat.format(Messages.XSLValidator_18, messageArgs)); //$NON-NLS-1$
 			}
 			else
 			{
@@ -292,13 +295,18 @@
 						if (calledTemplateParam.getName().equals(namedTemplateParam.getName()))
 						{
 							found = true;
-							if (!namedTemplateParam.isValue() && !calledTemplateParam.isValue())
-								createMarker(report, calledTemplateParam, getPreference(ValidationPreferences.EMPTY_PARAM), MessageFormat.format(Messages.XSLValidator_20, calledTemplateParam.getName()));
+							if (!namedTemplateParam.isValue() && !calledTemplateParam.isValue()) {
+							    Object[] messageArgs = { calledTemplateParam.getName() };	
+								createMarker(report, calledTemplateParam, getPreference(ValidationPreferences.EMPTY_PARAM), MessageFormat.format(Messages.XSLValidator_20, messageArgs));
+							}
 							break;
+							
 						}
 					}
-					if (!found)
-						createMarker(report, calledTemplateParam.getAttribute("name"), getPreference(ValidationPreferences.MISSING_PARAM), MessageFormat.format(Messages.XSLValidator_22, calledTemplateParam.getName())); //$NON-NLS-1$
+					if (!found) {
+						Object[] messageArgs = { calledTemplateParam.getName() };
+						createMarker(report, calledTemplateParam.getAttribute("name"), getPreference(ValidationPreferences.MISSING_PARAM), MessageFormat.format(Messages.XSLValidator_22, messageArgs)); //$NON-NLS-1$
+					}
 				}
 				if (getPreference(ValidationPreferences.MISSING_PARAM) > IMarker.SEVERITY_INFO)
 				{
@@ -315,8 +323,10 @@
 									break;
 								}
 							}
-							if (!found)
-								createMarker(report, calledTemplate, getPreference(ValidationPreferences.MISSING_PARAM), MessageFormat.format(Messages.XSLValidator_3, namedTemplateParam.getName()));
+							if (!found) {
+								Object[] messageArgs = { namedTemplateParam.getName() };
+								createMarker(report, calledTemplate, getPreference(ValidationPreferences.MISSING_PARAM), MessageFormat.format(Messages.XSLValidator_3, messageArgs));
+							}
 						}
 					}
 				}
@@ -345,7 +355,7 @@
 	/**
 	 * Get the singleton XSLValidator instance.
 	 * 
-	 * @return the singleson XSLValidator instance
+	 * @return the singleton XSLValidator instance
 	 */
 	public static XSLValidator getInstance()
 	{
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/messages.properties b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/messages.properties
deleted file mode 100644
index b8599a8..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/messages.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-XSLValidator_1=Xpath is invalid
-XSLValidator_10=A stylesheet must not import itself
-XSLValidator_11=Template conflicts with another template in this stylesheet
-XSLValidator_12=Template conflicts with an included template
-XSLValidator_13=Included templates conflict with each other
-XSLValidator_14=Name attribute is required
-XSLValidator_23=href attribute is required
-XSLValidator_15=Name must be specified
-XSLValidator_16=Parameter already defined
-XSLValidator_18=Named template {0} is not available
-XSLValidator_2=Included stylesheets form a circular reference
-XSLValidator_20=Parameter {0} does not have a default value
-XSLValidator_22=Parameter {0} does not exist
-XSLValidator_3=Missing parameter: {0}
-XSLValidator_4=Missing include: 
-XSLValidator_6=A stylesheet must not include itself
-XSLValidator_8=Missing import: 
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/messages.properties b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/messages.properties
new file mode 100644
index 0000000..c55859e
--- /dev/null
+++ b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/messages.properties
@@ -0,0 +1,45 @@
+###############################################################################
+# Copyright (c) 2000, 2005, 2008 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+#     Jesper Steen Møller - adapted from org.eclipse.core.internal.content 
+###############################################################################
+
+### Resolver problems
+XSLCorePlugin_badInitializationData = Invalid initialization data for "{0}".
+XSLCorePlugin_parserConfiguration = XSL parser configuration error during content description.
+XSLCorePlugin_coreError=Error logged from XSL core plug-in\:
+# XInclude
+XIncludeTask_0=Setting the output File to: 
+XIncludeTask_1=Setting the output File to: 
+XIncludeTask_2=Executing the XIncludeTask
+XIncludeTask_3=Specified Inputfile does not exists 
+XIncludeTask_4=Creating the output directory 
+XIncludeTask_5=Could not create outputfile
+XIncludeTask_6=Changes detected. Creating a new output file
+XIncludeTask_7=Problems with accessing the files.
+XIncludeTask_8=Please specify inputfile 
+XIncludeTask_9=Please specify outputfile  
+# Validation
+XSLValidator_1=Xpath is invalid
+XSLValidator_10=A stylesheet must not import itself
+XSLValidator_11=Template conflicts with another template in this stylesheet
+XSLValidator_12=Template conflicts with an included template
+XSLValidator_13=Included templates conflict with each other
+XSLValidator_14=Name attribute is required
+XSLValidator_23=href attribute is required
+XSLValidator_15=Name must be specified
+XSLValidator_16=Parameter already defined
+XSLValidator_18=Named template {0} is not available
+XSLValidator_2=Included stylesheets form a circular reference
+XSLValidator_20=Parameter {0} does not have a default value
+XSLValidator_22=Parameter {0} does not exist
+XSLValidator_3=Missing parameter: {0}
+XSLValidator_4=Missing include: 
+XSLValidator_6=A stylesheet must not include itself
+XSLValidator_8=Missing import: 
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
index 85ef5e6..cfb19de 100644
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
+++ b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
@@ -28,8 +28,8 @@
 import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
 import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
 import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.eclipse.wst.xsl.core.Messages;
 import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.Messages;
 import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF
index 12f6ff1..42a1885 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF
@@ -19,4 +19,5 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.wst.xsl.internal.debug.ui
+Export-Package: org.eclipse.wst.xsl.debug.ui,
+ org.eclipse.wst.xsl.internal.debug.ui
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/ui/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/ui/Messages.java
new file mode 100644
index 0000000..b5cf0a6
--- /dev/null
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/ui/Messages.java
@@ -0,0 +1,254 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.xsl.debug.ui;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * Messages for the debug.ui package.
+ * 
+ * @author Doug Satchwell
+ */
+public class Messages
+{
+	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.debug.ui.messages"; //$NON-NLS-1$
+
+	/**
+	 * A name for the remove action.
+	 */
+	public static String RemoveAction_Text;
+
+	/**
+	 * A name for the <code>AddWorkspaceFileAction</code> action.
+	 */
+	public static String AddWorkspaceFileAction_Text;
+
+	/**
+	 * A name for the <code>AddExternalFileAction</code> action.
+	 */
+	public static String AddExternalFileAction_Text;
+
+	/**
+	 * A name for the <code>MoveDownAction</code> action.
+	 */
+	public static String MoveDownAction_Text;
+
+	/**
+	 * A name for the <code>MoveUpAction</code> action.
+	 */
+	public static String MoveUpAction_Text;
+
+	/**
+	 * A heading for the <code>AddExternalFileAction</code> dialog.
+	 */
+	public static String AddExternalFileAction_Selection_3;
+
+	/**
+	 * A message for the <code>AddWorkspaceFileAction</code> dialog.
+	 */
+	public static String AddWorkspaceFileAction_DialogMessage;
+
+	/**
+	 * A title for the <code>AddWorkspaceFileAction</code> dialog.
+	 */
+	public static String AddWorkspaceFileAction_DialogTitle;
+
+	/**
+	 * A name for the <code>AddParameterAction</code> action.
+	 */
+	public static String AddParameterAction;
+
+	/**
+	 * A name for the <code>RemoveParameterAction</code> action.
+	 */
+	public static String RemoveParameterAction;
+
+	/**
+	 * A label for the Variables button.
+	 */
+	public static String VariablesFieldButton_Text;
+
+	/**
+	 * A title for the <code>AddParameterAction</code> dialog.
+	 */
+	public static String AddParameterAction_Dialog;
+
+	/**
+	 * A label for the <code>AddParameterAction</code> name text box.
+	 */
+	public static String AddParameterAction_Dialog_Name;
+
+	/**
+	 * A label for the <code>AddParameterAction</code> type combo.
+	 */
+	public static String AddParameterAction_Dialog_Type;
+
+	/**
+	 * A label for the <code>AddParameterAction</code> value text box.
+	 */
+	public static String AddParameterAction_Dialog_Value;
+	
+	public static String XSLBreakpointProvider_0;
+	
+	public static String StylesheetEntryLabelProvider_Invalid_path;
+
+	public static String TransformsBlock_0;
+
+	public static String TransformsBlock_Name;
+
+	public static String InputFileBlock_DIRECTORY_NOT_SPECIFIED;
+
+	public static String InputFileBlock_DIRECTORY_DOES_NOT_EXIST;
+
+	public static String InputFileBlock_GROUP_NAME;
+
+	public static String InputFileBlock_DEFAULT_RADIO;
+
+	public static String InputFileBlock_OTHER_RADIO;
+
+	public static String InputFileBlock_DIALOG_MESSAGE;
+
+	public static String InputFileBlock_WORKSPACE_DIALOG_MESSAGE;
+
+	public static String InputFileBlock_VARIABLES_BUTTON;
+
+	public static String InputFileBlock_FILE_SYSTEM_BUTTON;
+
+	public static String InputFileBlock_WORKSPACE_BUTTON;
+
+	public static String InputFileBlock_Name;
+
+	public static String InputFileBlock_Exception_occurred_reading_configuration;
+
+	public static String InputFileBlock_WORKSPACE_DIALOG_TITLE;
+
+	public static String XSLMainTab_TabName;
+
+	public static String TransformsBlock_ParametersLabel;
+
+	public static String TransformsBlock_StylesheetsLabel;
+	
+	public static String ParametersBlock_0;
+	public static String ParametersBlock_1;
+	public static String ParametersBlock_10;
+	public static String ParametersBlock_11;
+	public static String ParametersBlock_2;
+	public static String ParametersBlock_3;
+	public static String ParametersBlock_4;
+	public static String ParametersBlock_5;
+	public static String ParametersBlock_6;
+	public static String ParametersBlock_7;
+	public static String ParametersBlock_8;
+	public static String ParametersBlock_9;
+	
+	public static String OutputPropertiesBlock_0;
+	public static String OutputPropertiesBlock_1;
+	public static String OutputPropertiesBlock_13;
+	public static String OutputPropertiesBlock_3;
+	public static String OutputPropertiesBlock_4;
+	public static String OutputPropertiesBlock_5;
+	public static String OutputPropertiesBlock_7;
+	public static String OutputPropertiesBlock_8;
+	public static String OutputPropertiesBlock_9;
+	public static String OutputTab_0;
+	public static String OutputTab_1;
+	
+	public static String OutputTypeBlock_Group_Name;
+
+	public static String OutputFileBlock_0;
+
+	public static String OutputFileBlock_7;
+
+	public static String OutputFileBlock_8;
+
+	public static String OutputFileBlock_9;
+
+	public static String OutputFileBlock_DIRECTORY_NOT_SPECIFIED;
+
+	public static String OutputFileBlock_DIRECTORY_DOES_NOT_EXIST;
+
+	public static String OutputFileBlock_GROUP_NAME;
+
+	public static String OutputFileBlock_DEFAULT_RADIO;
+
+	public static String OutputFileBlock_OTHER_RADIO;
+
+	public static String OutputFileBlock_DIALOG_MESSAGE;
+
+	public static String OutputFileBlock_WORKSPACE_DIALOG_MESSAGE;
+
+	public static String OutputFileBlock_VARIABLES_BUTTON;
+
+	public static String OutputFileBlock_FILE_SYSTEM_BUTTON;
+
+	public static String OutputFileBlock_WORKSPACE_BUTTON;
+
+	public static String OutputFileBlock_Name;
+
+	public static String OutputFileBlock_Exception_occurred_reading_configuration;
+
+	public static String OutputFileBlock_WORKSPACE_DIALOG_TITLE;
+
+	public static String OutputFileBlock_Exception_occurred_saving_configuration;
+
+	public static String OutputFOFileBlock_DIRECTORY_NOT_SPECIFIED;
+
+	public static String OutputFOFileBlock_DIRECTORY_DOES_NOT_EXIST;
+
+	public static String OutputFOFileBlock_GROUP_NAME;
+
+	public static String OutputFOFileBlock_DEFAULT_RADIO;
+
+	public static String OutputFOFileBlock_OTHER_RADIO;
+
+	public static String OutputFOFileBlock_DIALOG_MESSAGE;
+
+	public static String OutputFOFileBlock_WORKSPACE_DIALOG_MESSAGE;
+
+	public static String OutputFOFileBlock_VARIABLES_BUTTON;
+
+	public static String OutputFOFileBlock_FILE_SYSTEM_BUTTON;
+
+	public static String OutputFOFileBlock_WORKSPACE_BUTTON;
+
+	public static String OutputFOFileBlock_Name;
+
+	public static String OutputFOFileBlock_Exception_occurred_reading_configuration;
+
+	public static String OutputFOFileBlock_WORKSPACE_DIALOG_TITLE;
+
+	public static String OutputFOFileBlock_Exception_occurred_saving_configuration;	
+	
+	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+
+	private Messages()
+	{
+	}
+
+	/**
+	 * Get the message for the given key.
+	 * 
+	 * @param key the message key
+	 * @return the message
+	 */
+	public static String getString(String key)
+	{
+		try
+		{
+			return RESOURCE_BUNDLE.getString(key);
+		}
+		catch (MissingResourceException e)
+		{
+			return '!' + key + '!';
+		}
+	}
+}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/ui/messages.properties
similarity index 66%
rename from bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.properties
rename to bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/ui/messages.properties
index a26a6a1..637cc04 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.properties
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/ui/messages.properties
@@ -1,3 +1,9 @@
+ResourceSelectionBlock.0=File:
+XSLLaunchShortcut.0=Select an input file for the transformation
+XSLLaunchShortcut.1=Input File
+XSLLaunchShortcut.2=Select a Launch Configuration
+XSLLaunchShortcut.6=Error
+#Action Messages
 RemoveAction_Text=Remove
 AddWorkspaceFileAction_Text=Add Files
 AddExternalFileAction_Text=Add External Files
@@ -13,3 +19,5 @@
 AddParameterAction_Dialog_Name=Name:
 AddParameterAction_Dialog_Type=Type:
 AddParameterAction_Dialog_Value=Value:
+#Breakpoint
+XSLBreakpointProvider_0=unsupported input type
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/Messages.java
deleted file mode 100644
index 147e85d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/Messages.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Messages for the debug.ui package.
- * 
- * @author Doug Satchwell
- */
-public class Messages
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages()
-	{
-	}
-
-	/**
-	 * Get the message for the given key.
-	 * 
-	 * @param key the message key
-	 * @return the message
-	 */
-	public static String getString(String key)
-	{
-		try
-		{
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch (MissingResourceException e)
-		{
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/ResourceSelectionBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/ResourceSelectionBlock.java
index d424353..183c817 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/ResourceSelectionBlock.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/ResourceSelectionBlock.java
@@ -49,6 +49,8 @@
 import org.eclipse.ui.model.WorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.eclipse.ui.views.navigator.ResourceComparator;
+import org.eclipse.wst.xsl.debug.ui.Messages;
+
 
 /**
  * A block that shows a text box with buttons for browsing workspace or the filesystem
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchShortcut.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchShortcut.java
index ad60113..68a8008 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchShortcut.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchShortcut.java
@@ -50,6 +50,7 @@
 import org.eclipse.wst.xsl.launching.config.BaseLaunchHelper;
 import org.eclipse.wst.xsl.launching.config.LaunchPipeline;
 import org.eclipse.wst.xsl.launching.config.LaunchTransform;
+import org.eclipse.wst.xsl.debug.ui.Messages;
 
 /**
  * <table border=1>
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.java
deleted file mode 100644
index 6b93293..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Messages for the debug UI actions.
- * 
- * @author Doug Satchwell
- */
-public final class ActionMessages extends NLS
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.actions.ActionMessages"; //$NON-NLS-1$
-
-	/**
-	 * A name for the remove action.
-	 */
-	public static String RemoveAction_Text;
-
-	/**
-	 * A name for the <code>AddWorkspaceFileAction</code> action.
-	 */
-	public static String AddWorkspaceFileAction_Text;
-
-	/**
-	 * A name for the <code>AddExternalFileAction</code> action.
-	 */
-	public static String AddExternalFileAction_Text;
-
-	/**
-	 * A name for the <code>MoveDownAction</code> action.
-	 */
-	public static String MoveDownAction_Text;
-
-	/**
-	 * A name for the <code>MoveUpAction</code> action.
-	 */
-	public static String MoveUpAction_Text;
-
-	/**
-	 * A heading for the <code>AddExternalFileAction</code> dialog.
-	 */
-	public static String AddExternalFileAction_Selection_3;
-
-	/**
-	 * A message for the <code>AddWorkspaceFileAction</code> dialog.
-	 */
-	public static String AddWorkspaceFileAction_DialogMessage;
-
-	/**
-	 * A title for the <code>AddWorkspaceFileAction</code> dialog.
-	 */
-	public static String AddWorkspaceFileAction_DialogTitle;
-
-	/**
-	 * A name for the <code>AddParameterAction</code> action.
-	 */
-	public static String AddParameterAction;
-
-	/**
-	 * A name for the <code>RemoveParameterAction</code> action.
-	 */
-	public static String RemoveParameterAction;
-
-	/**
-	 * A label for the Variables button.
-	 */
-	public static String VariablesFieldButton_Text;
-
-	/**
-	 * A title for the <code>AddParameterAction</code> dialog.
-	 */
-	public static String AddParameterAction_Dialog;
-
-	/**
-	 * A label for the <code>AddParameterAction</code> name text box.
-	 */
-	public static String AddParameterAction_Dialog_Name;
-
-	/**
-	 * A label for the <code>AddParameterAction</code> type combo.
-	 */
-	public static String AddParameterAction_Dialog_Type;
-
-	/**
-	 * A label for the <code>AddParameterAction</code> value text box.
-	 */
-	public static String AddParameterAction_Dialog_Value;
-
-	static
-	{
-		NLS.initializeMessages(BUNDLE_NAME, ActionMessages.class);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddExternalFileAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddExternalFileAction.java
index 0450d91..7f26895 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddExternalFileAction.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddExternalFileAction.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *     David Carver (STAR) - bug 245772 - NLS Message refactoring
  *******************************************************************************/
 package org.eclipse.wst.xsl.internal.debug.ui.actions;
 
@@ -16,6 +17,8 @@
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
 import org.eclipse.wst.xsl.launching.config.LaunchTransform;
+import org.eclipse.wst.xsl.debug.ui.Messages;
+
 
 /**
  * An action that opens a dialog to allow the user to select a file from the file system.
@@ -32,7 +35,7 @@
 	 */
 	public AddExternalFileAction(StylesheetViewer viewer, String dialogSettingsPrefix)
 	{
-		super(ActionMessages.AddExternalFileAction_Text, viewer, dialogSettingsPrefix);
+		super(Messages.AddExternalFileAction_Text, viewer, dialogSettingsPrefix);
 	}
 
 	@Override
@@ -44,7 +47,7 @@
 			lastUsedPath = ""; //$NON-NLS-1$
 		}
 		FileDialog dialog = new FileDialog(getShell(), SWT.MULTI);
-		dialog.setText(ActionMessages.AddExternalFileAction_Selection_3);
+		dialog.setText(Messages.AddExternalFileAction_Selection_3);
 		dialog.setFilterPath(lastUsedPath);
 		dialog.setFilterExtensions(new String[]{ "*.xsl" }); //$NON-NLS-1$
 		String res = dialog.open();
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddParameterAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddParameterAction.java
index d3ac91e..805e312 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddParameterAction.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddParameterAction.java
@@ -7,12 +7,14 @@
  *
  * Contributors:
  *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *     David Carver (STAR) - bug 245772 - NLS Message refactoring
  *******************************************************************************/
 package org.eclipse.wst.xsl.internal.debug.ui.actions;
 
 import org.eclipse.jface.window.Window;
 import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.ParameterViewer;
 import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
+import org.eclipse.wst.xsl.debug.ui.Messages;
 
 /**
  * An action that opens a dialog to allow the user to add a parameter to a transform.
@@ -28,16 +30,16 @@
 	 */
 	public AddParameterAction(ParameterViewer viewer)
 	{
-		super(ActionMessages.AddParameterAction, viewer);
+		super(Messages.AddParameterAction, viewer);
 	}
 
 	@Override
 	public void run()
 	{
-		MultipleInputDialog dialog = new MultipleInputDialog(getShell(), ActionMessages.AddParameterAction_Dialog);
-		String namelabel = ActionMessages.AddParameterAction_Dialog_Name;
+		MultipleInputDialog dialog = new MultipleInputDialog(getShell(), Messages.AddParameterAction_Dialog);
+		String namelabel = Messages.AddParameterAction_Dialog_Name;
 		dialog.addTextField(namelabel, null, false);
-		String variableslabel = ActionMessages.AddParameterAction_Dialog_Value;
+		String variableslabel = Messages.AddParameterAction_Dialog_Value;
 		dialog.addVariablesField(variableslabel, null, false);
 		dialog.open();
 
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddWorkspaceFileAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddWorkspaceFileAction.java
index ff487df..1ff35b7 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddWorkspaceFileAction.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddWorkspaceFileAction.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *     David Carver - bug 245772 - NLS Message refactoring
  *******************************************************************************/
 package org.eclipse.wst.xsl.internal.debug.ui.actions;
 
@@ -29,6 +30,7 @@
 import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
 import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
 import org.eclipse.wst.xsl.launching.config.LaunchTransform;
+import org.eclipse.wst.xsl.debug.ui.Messages;
 
 /**
  * An action that opens a dialog to allow the user to select a file in the workspace.
@@ -63,7 +65,7 @@
 	 */
 	public AddWorkspaceFileAction(StylesheetViewer viewer)
 	{
-		super(ActionMessages.AddWorkspaceFileAction_Text, viewer);
+		super(Messages.AddWorkspaceFileAction_Text, viewer);
 	}
 
 	@Override
@@ -77,8 +79,8 @@
 
 		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), lp, cp);
 		dialog.setValidator(validator);
-		dialog.setTitle(ActionMessages.AddWorkspaceFileAction_DialogTitle);
-		dialog.setMessage(ActionMessages.AddWorkspaceFileAction_DialogMessage);
+		dialog.setTitle(Messages.AddWorkspaceFileAction_DialogTitle);
+		dialog.setMessage(Messages.AddWorkspaceFileAction_DialogMessage);
 		dialog.addFilter(new ViewerFilter()
 		{
 			@Override
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveDownAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveDownAction.java
index 215619b..fe7dda7 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveDownAction.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveDownAction.java
@@ -15,6 +15,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
 import org.eclipse.wst.xsl.launching.config.LaunchTransform;
+import org.eclipse.wst.xsl.debug.ui.Messages;
 
 /**
  * The action for moving a stylesheet further down in the transformation pipeline.
@@ -30,7 +31,7 @@
 	 */
 	public MoveDownAction(StylesheetViewer viewer)
 	{
-		super(ActionMessages.MoveDownAction_Text, viewer);
+		super(Messages.MoveDownAction_Text, viewer);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveUpAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveUpAction.java
index 794548b..0dffbc8 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveUpAction.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveUpAction.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *     David Carver (STAR) - bug 245772 - NLS Message refactoring
  *******************************************************************************/
 package org.eclipse.wst.xsl.internal.debug.ui.actions;
 
@@ -16,6 +17,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
 import org.eclipse.wst.xsl.launching.config.LaunchTransform;
+import org.eclipse.wst.xsl.debug.ui.Messages;
 
 /**
  * The action for moving a stylesheet further up in the transformation pipeline.
@@ -31,7 +33,7 @@
 	 */
 	public MoveUpAction(StylesheetViewer viewer)
 	{
-		super(ActionMessages.MoveUpAction_Text, viewer);
+		super(Messages.MoveUpAction_Text, viewer);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MultipleInputDialog.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MultipleInputDialog.java
index 0020ed1..27d3b7c 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MultipleInputDialog.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MultipleInputDialog.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *     David Carver (STAR) - bug 245772 - NLS Message refactor
  *******************************************************************************/
 package org.eclipse.wst.xsl.internal.debug.ui.actions;
 
@@ -36,6 +37,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
+import org.eclipse.wst.xsl.debug.ui.Messages;
 
 /**
  * A dialog with handy methods for adding simple controls to itself.
@@ -272,7 +274,7 @@
 			});
 		}
 
-		Button button = createButton(comp, IDialogConstants.IGNORE_ID, ActionMessages.VariablesFieldButton_Text, false);
+		Button button = createButton(comp, IDialogConstants.IGNORE_ID, Messages.VariablesFieldButton_Text, false);
 		button.addSelectionListener(new SelectionAdapter()
 		{
 			@Override
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java
index b72ccfe..c5aee7d 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java
@@ -7,12 +7,14 @@
  *
  * Contributors:
  *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *     David Carver (STAR) - bug 245772 - NLS Message refactoring
  *******************************************************************************/
 package org.eclipse.wst.xsl.internal.debug.ui.actions;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
 import org.eclipse.wst.xsl.launching.config.LaunchTransform;
+import org.eclipse.wst.xsl.debug.ui.Messages;
 
 /**
  * An action that removes a selection from a viewer.
@@ -28,7 +30,7 @@
 	 */
 	public RemoveAction(StylesheetViewer viewer)
 	{
-		super(ActionMessages.RemoveAction_Text, viewer);
+		super(Messages.RemoveAction_Text, viewer);
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveParameterAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveParameterAction.java
index 124f203..aa32f6a 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveParameterAction.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveParameterAction.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *     David Carver (STAR) - bug 245772 - NLS Message refactoring
  *******************************************************************************/
 package org.eclipse.wst.xsl.internal.debug.ui.actions;
 
@@ -15,6 +16,7 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.ParameterViewer;
 import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
+import org.eclipse.wst.xsl.debug.ui.Messages;
 
 /**
  * An action that removes a selection from a viewer.
@@ -30,7 +32,7 @@
 	 */
 	public RemoveParameterAction(ParameterViewer viewer)
 	{
-		super(ActionMessages.RemoveParameterAction, viewer);
+		super(Messages.RemoveParameterAction, viewer);
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/Messages.java
deleted file mode 100644
index 9a2642a..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/Messages.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.breakpoint;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Messages for the debug UI breakpoints.
- * 
- * @author Doug Satchwell
- */
-public class Messages extends NLS
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.breakpoint.messages"; //$NON-NLS-1$
-	/**
-	 * Error message for null breakpoints.
-	 */
-	public static String XSLBreakpointProvider_0;
-	static
-	{
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages()
-	{
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/XSLBreakpointProvider.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/XSLBreakpointProvider.java
index a92735c..3f9c4fa 100644
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/XSLBreakpointProvider.java
+++ b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/XSLBreakpointProvider.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
+ *     David Carver (STAR) - bug 245772 - NLS Message refactoring
  *******************************************************************************/
 package org.eclipse.wst.xsl.internal.debug.ui.breakpoint;
 
@@ -33,6 +34,7 @@
 import org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IBreakpointProvider;
 import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
 import org.eclipse.wst.xsl.launching.model.XSLLineBreakpoint;
+import org.eclipse.wst.xsl.debug.ui.Messages;
 
 /**
  * An SSE <code>IBreakpointProvider</code> for XSL files.
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/messages.properties
deleted file mode 100644
index 30115d4..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-XSLBreakpointProvider_0=unsupported input type
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/messages.properties
deleted file mode 100644
index d51967d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/messages.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-ResourceSelectionBlock.0=File:
-XSLLaunchShortcut.0=Select an input file for the transformation
-XSLLaunchShortcut.1=Input File
-XSLLaunchShortcut.2=Select a Launch Configuration
-XSLLaunchShortcut.6=Error
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/META-INF/MANIFEST.MF
index c4c0d0c..8a0b589 100644
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: XSL JAXP Debug UI (Incubating)
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.xsl.jaxp.debug.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.wst.xsl.jaxp.debug.ui.internal.JAXPDebugUIPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %vendorName
 Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)",
@@ -22,3 +22,4 @@
  org.eclipse.jdt.debug.ui;bundle-version="[3.3.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/build.properties b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/build.properties
index 44e050d..647fcc0 100644
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/build.properties
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/build.properties
@@ -4,4 +4,5 @@
                .,\
                plugin.xml,\
                about.html,\
-               icons/
+               icons/,\
+               plugin.properties
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.properties b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.properties
new file mode 100644
index 0000000..f81236c
--- /dev/null
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.properties
@@ -0,0 +1,5 @@
+#Properties file for org.eclipse.wst.xsl.jaxp.debug.ui
+vendorName = Eclipse.org
+pluginName = XSL JAXP Debug UI (Incubating)
+pageNameJavaProcessors = Java Processors
+viewNameResult = Result
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.xml b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.xml
index 1bf31a1..af972da 100644
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.xml
@@ -34,7 +34,7 @@
 	<extension point="org.eclipse.ui.preferencePages">
 		<page category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
 			class="org.eclipse.wst.xsl.jaxp.debug.ui.internal.preferences.ProcessorsPreferencePage"
-			id="org.eclipse.wst.xsl.ui.preferences.java" name="Java Processors">
+			id="org.eclipse.wst.xsl.ui.preferences.java" name="%pageNameJavaProcessors">
 		</page>
 	</extension>
  <extension
@@ -42,7 +42,7 @@
     <view
           class="org.eclipse.wst.xsl.jaxp.debug.ui.internal.views.ResultView"
           id="org.eclipse.wst.xsl.jaxp.debug.ui.resultview"
-          name="Result"
+          name="%viewNameResult"
           category="org.eclipse.wst.xml">
     </view>
  </extension>
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF
index cb32ec1..21dd829 100644
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug/META-INF/MANIFEST.MF
@@ -1,10 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: XSL JAXP Debugger (Incubating)
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.xsl.jaxp.debug
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %vendorName
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4";visibility:=reexport
 Export-Package: org.eclipse.wst.xsl.jaxp.debug.debugger,
  org.eclipse.wst.xsl.jaxp.debug.invoker
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug/build.properties b/bundles/org.eclipse.wst.xsl.jaxp.debug/build.properties
index 17daa5b..d944674 100644
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug/build.properties
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug/build.properties
@@ -2,4 +2,5 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               about.html
+               about.html,\
+               plugin.properties
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug/plugin.properties b/bundles/org.eclipse.wst.xsl.jaxp.debug/plugin.properties
new file mode 100644
index 0000000..50e0ca0
--- /dev/null
+++ b/bundles/org.eclipse.wst.xsl.jaxp.debug/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.wst.xsl.jaxp.debug
+vendorName = Eclipse.org
+pluginName = XSL JAXP Debugger (Incubating)
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.saxon/plugin.properties b/bundles/org.eclipse.wst.xsl.saxon/plugin.properties
index bf031aa..4538751 100644
--- a/bundles/org.eclipse.wst.xsl.saxon/plugin.properties
+++ b/bundles/org.eclipse.wst.xsl.saxon/plugin.properties
@@ -2,4 +2,6 @@
 Bundle-Name.0 = XSL Saxon Support (Incubating)
 processorType.label.0 = Saxon (XSLT 2.0)
 processorType.label.1 = Saxon (XSLT 1.0)
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
+Bundle-Vendor.0 = Eclipse.org
+transformerFactorySaxon6 = Saxon 6
+transformerSaxonXSLT2 = Saxon 7
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.saxon/plugin.xml b/bundles/org.eclipse.wst.xsl.saxon/plugin.xml
index 7eedf00..8be0a82 100644
--- a/bundles/org.eclipse.wst.xsl.saxon/plugin.xml
+++ b/bundles/org.eclipse.wst.xsl.saxon/plugin.xml
@@ -10,7 +10,7 @@
             outputProperties="SaxonOutputProperties.properties">
          <transformerFactory
                factoryClass="com.icl.saxon.TransformerFactoryImpl"
-               name="Saxon 6">
+               name="%transformerFactorySaxon6">
          </transformerFactory>
       </processorType>
       <processorType
@@ -20,7 +20,7 @@
             outputProperties="SaxonOutputProperties.properties">
          <transformerFactory
                factoryClass="net.sf.saxon.TransformerFactoryImpl"
-               name="Saxon 7">
+               name="%transformerSaxonXSLT2">
          </transformerFactory>
       </processorType>
    </extension>
diff --git a/bundles/org.eclipse.wst.xsl.ui/plugin.properties b/bundles/org.eclipse.wst.xsl.ui/plugin.properties
index 7e088d4..4586855 100644
--- a/bundles/org.eclipse.wst.xsl.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.xsl.ui/plugin.properties
@@ -16,3 +16,17 @@
 perspectiveName=XML
 page.name.0 = XSL
 Structured_XML_Document_Factory_Extension.name = XSL Document Factory
+
+editorName = XSL Editor
+wizardNameXSL = XSL
+wizardDescriptionXSL = Create a new XSL Stylesheet
+contextTypeNewXSL = New XSL
+pageNameTemplates = Templates
+pageNameValidation = Validation
+commandOpenSelection = Open Selection
+commandTooltipOpenSelection = Open Selection
+commandTooltipNewXMLFile = New XML File
+commandTooltipNewXMLFile2 = New XML File
+commandTooltipNewXSDFile = New XML Schema File
+commandTooltipNewXSLFile = New XSL File
+viewNameStylesheet = Stylesheet
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.ui/plugin.xml b/bundles/org.eclipse.wst.xsl.ui/plugin.xml
index d738708..af0620e 100644
--- a/bundles/org.eclipse.wst.xsl.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xsl.ui/plugin.xml
@@ -11,7 +11,7 @@
 	</extension>
 	
 	<extension point="org.eclipse.ui.editors">
-		<editor name="XSL Editor" 
+		<editor name="%editorName" 
 			icon="icons/full/xslt_file.gif"
 			contributorClass="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorActionBarContributor"
 			class="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"
@@ -58,9 +58,9 @@
 			finalPerspective="org.eclipse.wst.xsl.ui.perspective" 
 			icon="icons/full/xslt_file.gif"
 			id="org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard"
-			name="XSL" 
+			name="%wizardNameXSL" 
 			preferredPerspectives="org.eclipse.wst.xsl.ui.perspective">
-			<description>Create a new XSL Stylesheet</description>
+			<description>%wizardDescriptionXSL</description>
 			<selection class="org.eclipse.core.resources.IResource">
 			</selection>
 		</wizard>
@@ -70,7 +70,7 @@
 	<extension point="org.eclipse.ui.editors.templates">
 		<contextType
 			class="org.eclipse.wst.xsl.ui.internal.templates.TemplateContextTypeXSL"
-			id="xsl_new" name="New XSL">
+			id="xsl_new" name="%contextTypeNewXSL">
 		</contextType>
 		<include file="templates/file_templates.xml" />
 	</extension>
@@ -84,13 +84,13 @@
 		<page category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
 			class="org.eclipse.wst.xsl.ui.internal.preferences.XSLTemplatePreferencePage"
 			id="org.eclipse.wst.xsl.ui.template.preferencePage" 
-			name="Templates">
+			name="%pageNameTemplates">
 		</page>
 
 		<page category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
 			class="org.eclipse.wst.xsl.ui.internal.preferences.ValidationPreferencePage"
 			id="org.eclipse.wst.xsl.ui.preferences.Validation" 
-			name="Validation">
+			name="%pageNameValidation">
 		</page>
 	</extension>
 	
@@ -184,9 +184,9 @@
         <command
               commandId="org.eclipse.wst.sse.ui.open.file.from.source"
               id="openSelection"
-              label="Open Selection"
+              label="%commandOpenSelection"
               style="push"
-              tooltip="Open Selection">
+              tooltip="%commandTooltipOpenSelection">
            <visibleWhen
                  checkEnabled="false">
            </visibleWhen>
@@ -205,7 +205,7 @@
               icon="icons/full/new_xml.gif"
               id="org.eclipse.wst.xsl.ui.newXMLFile"
               style="push"
-              tooltip="New XML File">
+              tooltip="%commandTooltipNewXMLFile">
              <parameter
                    name="newWizardId"
                    value="org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard">
@@ -221,7 +221,7 @@
               icon="icons/full/newdtd_wiz.gif"
               id="org.eclipse.wst.xsl.ui.newDTDFile"
               style="push"
-              tooltip="New XML File">
+              tooltip="%commandTooltipNewXMLFile2">
              <parameter
                    name="newWizardId"
                    value="org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard">
@@ -237,7 +237,7 @@
               icon="icons/full/XSDFile.gif"
               id="org.eclipse.wst.xsl.ui.newXSDFile"
               style="push"
-              tooltip="New XML Schema File">
+              tooltip="%commandTooltipNewXSDFile">
              <parameter
                    name="newWizardId"
                    value="org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard">
@@ -254,7 +254,7 @@
               icon="icons/full/xslt_file.gif"
               id="org.eclipse.wst.xsl.ui.newXSLFile"
               style="push"
-              tooltip="New XSL File">
+              tooltip="%commandTooltipNewXSLFile">
              <parameter
                    name="newWizardId"
                    value="org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard">
@@ -277,7 +277,7 @@
      <view
            class="org.eclipse.wst.xsl.ui.internal.StylesheetView"
            id="org.eclipse.wst.xsl.ui.view.outline"
-           name="Stylesheet"
+           name="%viewNameStylesheet"
            category="org.eclipse.wst.xml"
            restorable="true">
      </view>
diff --git a/bundles/org.eclipse.wst.xsl.xalan/plugin.properties b/bundles/org.eclipse.wst.xsl.xalan/plugin.properties
index 56dc633..ab4cbe4 100644
--- a/bundles/org.eclipse.wst.xsl.xalan/plugin.properties
+++ b/bundles/org.eclipse.wst.xsl.xalan/plugin.properties
@@ -3,4 +3,6 @@
 processorType.label.0 = Xalan
 processor.label.0 = Xalan 2.5.1
 processor.label.1 = Xalan 2.7.1
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
+Bundle-Vendor.0 = Eclipse.org
+transformerFactoryNameXalan = Interpretive
+transformerFactoryNameXalanXSLTC = Compiling
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.xalan/plugin.xml b/bundles/org.eclipse.wst.xsl.xalan/plugin.xml
index 5ebf605..6a60297 100644
--- a/bundles/org.eclipse.wst.xsl.xalan/plugin.xml
+++ b/bundles/org.eclipse.wst.xsl.xalan/plugin.xml
@@ -10,11 +10,11 @@
             outputProperties="XalanOutputProperties.properties">
          <transformerFactory
                factoryClass="org.apache.xalan.processor.TransformerFactoryImpl"
-               name="Interpretive">
+               name="%transformerFactoryNameXalan">
          </transformerFactory>
          <transformerFactory
                factoryClass="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"
-               name="Compiling">
+               name="%transformerFactoryNameXalanXSLTC">
          </transformerFactory>
       </processorType>
    </extension>
diff --git a/docs/org.eclipse.wst.xsl.doc/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xsl.doc/META-INF/MANIFEST.MF
index f4d9cd2..aacc65e 100644
--- a/docs/org.eclipse.wst.xsl.doc/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.wst.xsl.doc/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: XSL User Documentation (Incubating)
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.xsl.doc; singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.wst.xsl.doc.Activator
@@ -8,5 +8,6 @@
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %vendorName
 Export-Package: org.eclipse.wst.xsl.doc;uses:="org.osgi.framework,org.eclipse.ui.plugin,org.eclipse.jface.resource"
+Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.xsl.doc/build.properties b/docs/org.eclipse.wst.xsl.doc/build.properties
index c536a41..fd72e2c 100644
--- a/docs/org.eclipse.wst.xsl.doc/build.properties
+++ b/docs/org.eclipse.wst.xsl.doc/build.properties
@@ -5,4 +5,5 @@
                .,\
                html/,\
                *.xml,\
-               about.html
+               about.html,\
+               plugin.properties
diff --git a/docs/org.eclipse.wst.xsl.doc/plugin.properties b/docs/org.eclipse.wst.xsl.doc/plugin.properties
new file mode 100644
index 0000000..ca15f82
--- /dev/null
+++ b/docs/org.eclipse.wst.xsl.doc/plugin.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.wst.xsl.doc
+vendorName = Eclipse.org
+pluginName = XSL User Documentation (Incubating)
\ No newline at end of file