[192568] XML Catalog import/export should be in Import/Export wizards
diff --git a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceAttributeVisitor.java b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceAttributeVisitor.java
index f584c18..58d193d 100644
--- a/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceAttributeVisitor.java
+++ b/bundles/org.eclipse.wst.xml.core/src-contentmodel/org/eclipse/wst/xml/core/internal/contentmodel/util/NamespaceAttributeVisitor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
+ *     David Carver - STAR - bug 198807 - attribute order dependancy.
  *******************************************************************************/
 package org.eclipse.wst.xml.core.internal.contentmodel.util;
 
@@ -62,6 +62,11 @@
   {
     NamedNodeMap map = element.getAttributes();
     int mapLength = map.getLength();
+    
+    // First retrieve all the namespaces so that they are loaded before
+    // doing any special prefix handling.  This allows the attributes to be
+    // defined in any order, but the namespaces have to be retrieved first.
+    
     for (int i = 0; i < mapLength; i++)
     {
       Attr attr = (Attr)map.item(i);
@@ -72,14 +77,6 @@
         if (prefix.equals("xmlns")) //$NON-NLS-1$
         {
           visitXMLNamespaceAttribute(attr, unprefixedName, attr.getValue());
-        } 
-        else if (prefix.equals(xsiPrefix) && unprefixedName.equals("schemaLocation")) //$NON-NLS-1$
-        {
-          visitXSISchemaLocationAttribute(attr, attr.getValue());
-        }
-        else if (prefix.equals(xsiPrefix) && unprefixedName.equals("noNamespaceSchemaLocation")) //$NON-NLS-1$
-        {
-          visitXSINoNamespaceSchemaLocationAttribute(attr, attr.getValue());
         }
       }
       else if (unprefixedName != null)
@@ -89,6 +86,25 @@
           visitXMLNamespaceAttribute(attr, "", attr.getValue()); //$NON-NLS-1$
         }
       }      
+
+    }
+
+    for (int i = 0; i < mapLength; i++)
+    {
+      Attr attr = (Attr)map.item(i);
+      String prefix = DOMNamespaceHelper.getPrefix(attr.getName());
+      String unprefixedName = DOMNamespaceHelper.getUnprefixedName(attr.getName());
+      if (prefix != null && unprefixedName != null)
+      {
+       	if (prefix.equals(xsiPrefix) && unprefixedName.equals("schemaLocation")) //$NON-NLS-1$
+        {
+          visitXSISchemaLocationAttribute(attr, attr.getValue());
+        }
+        else if (prefix.equals(xsiPrefix) && unprefixedName.equals("noNamespaceSchemaLocation")) //$NON-NLS-1$
+        {
+          visitXSINoNamespaceSchemaLocationAttribute(attr, attr.getValue());
+        }
+      }
     }
   }      
 }
diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.properties b/bundles/org.eclipse.wst.xml.ui/plugin.properties
index 17868e6..d30de2d 100644
--- a/bundles/org.eclipse.wst.xml.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.xml.ui/plugin.properties
@@ -8,6 +8,8 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 #     Jens Lukowski/Innoopract - initial renaming/restructuring
+#     David Carver / STAR Standards - added XML Catalog Import/Export Wizard
+#                                     bug 192568
 #     
 ###############################################################################
 providerName=Eclipse.org
@@ -23,6 +25,10 @@
 genMenuLabel=&Generate
 _UI_ACTION_CREATE_XML=&XML File...
 _UI_CREATE_NEW_XML_FILE=Create a new XML file
+_UI_WIZARD_IMPORT_XMLCATALOG=Import XML Catalog
+_UI_WIZARD_EXPORT_XMLCATALOG=Export XML Catalog
+_UI_IMPORT_XML_CATALOG_FILE=Import an existing XML Catalog.
+_UI_EXPORT_XML_CATALOG_FILE=Export a XML Catalog.
 XMLExample.name=Editing and validating XML files
 XMLExampleProjectCreationWizard.description=Create a project containing XML sample files
 XMLExampleProjectCreationWizard.projectname=XMLExamples
diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.xml b/bundles/org.eclipse.wst.xml.ui/plugin.xml
index ef3c201..a36fe22 100644
--- a/bundles/org.eclipse.wst.xml.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xml.ui/plugin.xml
@@ -30,7 +30,7 @@
 			id="org.eclipse.wst.xml.core.ui.catalogFileType.tld">
 		</fileType>
 	</extension>
-	
+
 	<!--The org.eclipse.wst.xml.core.xmlsource content type is only for
 		handling some special cases of ill-formed xml in a reasonable
 		manner, and should not be emulated by clients. The two content
@@ -552,4 +552,38 @@
 			targetId="org.eclipse.core.runtime.xml">
 		</hyperlinkDetector>
    </extension>
+ <extension
+       point="org.eclipse.ui.importWizards">
+    <category
+          id="org.eclipse.wst.XMLCategory"
+          name="%_UI_WIZARD_NEW_XML">
+    </category>
+    <wizard
+          category="org.eclipse.wst.XMLCategory"
+          class="org.eclipse.wst.xml.ui.internal.wizards.ImportXMLCatalogWizard"
+          icon="icons/xmldoc.gif"
+          id="org.eclipse.wst.xml.ui.internal.wizards.ImportXMLCatalogWizard"
+          name="%_UI_WIZARD_IMPORT_XMLCATALOG">
+       <description>
+          %_UI_IMPORT_XML_CATALOG_FILE
+       </description>
+    </wizard>
+ </extension>
+ <extension
+       point="org.eclipse.ui.exportWizards">
+    <category
+          id="org.eclipse.wst.XMLCategory"
+          name="%_UI_WIZARD_NEW_XML">
+    </category>
+    <wizard
+          category="org.eclipse.wst.XMLCategory"
+          class="org.eclipse.wst.xml.ui.internal.wizards.ExportXMLCatalogWizard"
+          icon="icons/xmldoc.gif"
+          id="org.eclipse.wst.xml.ui.internal.wizards.ExportXMLCatalogWizard"
+          name="%_UI_WIZARD_EXPORT_XMLCATALOG">
+       <description>
+          %_UI_EXPORT_XML_CATALOG_FILE
+       </description>
+    </wizard>
+ </extension>
 </plugin>
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java
index 2646946..d59f1eb 100644
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java
+++ b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java
@@ -8,6 +8,9 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Jens Lukowski/Innoopract - initial renaming/restructuring
+ *     David Carver/STAR Standard - d_a_carver@yahoo.com - bug 192568
+ *            Removed Advanced button - Functionality is now in the
+ *            Import/Export XML Catalog Wizards. 
  *     
  *******************************************************************************/
 package org.eclipse.wst.xml.ui.internal.catalog;
@@ -105,13 +108,17 @@
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
 		createCatalogEntriesView(composite);
 		createCatalogDetailsView(composite);
-		createAdvancedButton(composite);
+		//createAdvancedButton(composite);
 		// catalogEntriesView.updatePage();
 		applyDialogFont(composite);
 
 		return composite;
 	}
 
+	/**
+	 * @deprecated
+	 * @param composite
+	 */
 	protected void createAdvancedButton(Composite composite) {
 		Composite panel = new Composite(composite, SWT.NONE);
 		GridLayout gridLayout = new GridLayout();
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogResources.properties b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogResources.properties
index eac7a2a..fa97832 100644
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogResources.properties
+++ b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogResources.properties
@@ -7,6 +7,8 @@
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     David Carver/STAR Standard, d_a_carver@yahoo.com, bug 192568
+#        - Fixed grammar in XML Catalog Import dialog.
 ###############################################################################
 UI_WIZARD_SCHEMA_AND_NAME_SPACE_INFO = Schema and Namespace Information
 UI_LABEL_NAME_SPACE_PREFIX           = Namespace prefix:
@@ -95,7 +97,7 @@
                                    
 UI_LABEL_IMPORT_DIALOG_TITLE         = Import XML Catalog Settings
 UI_LABEL_IMPORT_DIALOG_HEADING       = Specify XML Catalog File
-UI_LABEL_IMPORT_DIALOG_MESSAGE       = Specify the file that will used to load the XML Catalog Settings
+UI_LABEL_IMPORT_DIALOG_MESSAGE       = Specify the file that will be used to load the XML Catalog Settings
 
 UI_LABEL_EXPORT_DIALOG_TITLE         = Export XML Catalog Settings
 UI_LABEL_EXPORT_DIALOG_HEADING       = Specify XML Catalog File
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExportXMLCatalogWizard.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExportXMLCatalogWizard.java
new file mode 100644
index 0000000..a079682
--- /dev/null
+++ b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExportXMLCatalogWizard.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Standards for Technology in Automotive Retail (STAR) 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:
+ *     David Carver/STAR - dcarver@starstandard.org/d_a_carver@yahoo.com - bug 192568
+ *            Initial API - This implements the functionality of the
+ *            old Export Dialog for the XML Catalog. 
+ *     
+ *******************************************************************************/
+package org.eclipse.wst.xml.ui.internal.wizards;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IExportWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard;
+import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
+import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
+import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
+import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
+import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
+import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
+public class ExportXMLCatalogWizard extends BasicNewFileResourceWizard implements IExportWizard {
+
+	protected WizardNewFileCreationPage exportPage = null;
+	protected ICatalog workingUserCatalog = null;
+	protected ICatalog userCatalog = null;
+	
+	public ExportXMLCatalogWizard() {
+		setWindowTitle(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_EXPORT_TITLE);
+		ImageDescriptor descriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_WIZBAN_GENERATEXML);
+		setDefaultPageImageDescriptor(descriptor);
+		ICatalog defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
+		INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
+		for (int i = 0; i < nextCatalogs.length; i++) {
+			INextCatalog catalog = nextCatalogs[i];
+			ICatalog referencedCatalog = catalog.getReferencedCatalog();
+			if (referencedCatalog != null) {
+				if (XMLCorePlugin.USER_CATALOG_ID.equals(referencedCatalog.getId())) {
+					userCatalog = referencedCatalog;
+				}
+			}
+		}
+		CatalogSet tempCatalogSet = new CatalogSet();
+		workingUserCatalog = tempCatalogSet.lookupOrCreateCatalog("working", ""); //$NON-NLS-1$ //$NON-NLS-2$
+		workingUserCatalog.addEntriesFromCatalog(userCatalog);
+
+	}
+
+	public boolean performFinish() {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		IWorkspaceRoot workspaceRoot = workspace.getRoot();
+		String workspacePath = workspaceRoot.getLocation().toOSString();
+		String fullPath = workspacePath + exportPage.getContainerFullPath().toOSString();
+		String requiredString=fullPath + File.separator + exportPage.getFileName();
+		try {
+			exportPage.createNewFile();
+			workingUserCatalog.setLocation(requiredString);
+			workingUserCatalog.save();
+		} catch (Exception ex) {
+			return false;
+		}
+		return true;
+	}
+	
+	public void addPages() {
+		exportPage = new WizardNewFileCreationPage("XML Catalog Export",  getSelection());
+		exportPage.setTitle(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_EXPORT_TITLE);
+		exportPage.setDescription(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_EXPORT_DESCRIPTION);
+		addPage(exportPage);
+	}
+	
+	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
+		super.init(workbench, currentSelection);
+		setWindowTitle(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_EXPORT_TITLE);
+		ImageDescriptor descriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_WIZBAN_GENERATEXML);
+		setDefaultPageImageDescriptor(descriptor);
+	}
+}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogPage.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogPage.java
new file mode 100644
index 0000000..a345721
--- /dev/null
+++ b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogPage.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Standards for Technology in Automotive Retail (STAR) 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:
+ *     David Carver/STAR - dcarver@starstandard.org/d_a_carver@yahoo.com - bug 192568
+ *            Initial API - This implements the functionality of the
+ *            old Import Dialog for the XML Catalog. 
+ *     
+ *******************************************************************************/
+package org.eclipse.wst.xml.ui.internal.wizards;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wst.common.ui.internal.viewers.SelectSingleFileView;
+
+public class ImportXMLCatalogPage extends WizardPage {
+
+	protected SelectSingleFileView selectSingleFileView;
+	protected IStructuredSelection selection;
+	
+
+	public ImportXMLCatalogPage() {
+		super(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_IMPORT_TITLE);
+		setTitle(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_IMPORT_TITLE);
+		selection = new StructuredSelection();
+		selectSingleFileView = new SelectSingleFileView(selection, false) {
+			public void createFilterControl(Composite composite) {
+				ImportXMLCatalogPage.this.createFilterControl(composite);
+			}
+		};
+
+	}
+
+	public void createControl(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NULL);
+		composite.setLayout(new GridLayout());
+		GridData gd = new GridData(GridData.FILL_BOTH);
+		gd.widthHint = 350;
+		gd.heightHint = 350;
+		composite.setLayoutData(gd);
+		String[] extensions = { ".xmlcatalog", ".xml" }; //$NON-NLS-1$ //$NON-NLS-2$
+		selectSingleFileView.addFilterExtensions(extensions);
+		selectSingleFileView.createControl(composite);
+		selectSingleFileView.setVisibleHelper(true);
+		setControl(parent);
+	}
+
+	public void createFilterControl(Composite composite) {
+	}
+
+	public IFile getFile() {
+		return selectSingleFileView.getFile();
+	}
+}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogWizard.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogWizard.java
new file mode 100644
index 0000000..7f86e0f
--- /dev/null
+++ b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogWizard.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Standards for Technology in Automotive Retail (STAR) 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:
+ *     David Carver/STAR - dcarver@starstandard.org/d_a_carver@yahoo.com - bug 192568
+ *            Initial API - This implements the functionality of the
+ *            old Import Dialog for the XML Catalog. 
+ *     
+ *******************************************************************************/
+package org.eclipse.wst.xml.ui.internal.wizards;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.IImportWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
+import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
+import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
+import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
+import org.eclipse.wst.xml.ui.internal.catalog.XMLCatalogMessages;
+import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
+import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
+
+public class ImportXMLCatalogWizard extends Wizard implements IImportWizard {
+
+	protected ImportXMLCatalogPage importPage = null;
+	protected ICatalog workingUserCatalog = null;
+	protected ICatalog userCatalog = null;
+	
+	public ImportXMLCatalogWizard() {
+		setWindowTitle(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_IMPORT_TITLE);
+		ImageDescriptor descriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_WIZBAN_GENERATEXML);
+		setDefaultPageImageDescriptor(descriptor);
+		ICatalog defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
+		INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
+		for (int i = 0; i < nextCatalogs.length; i++) {
+			INextCatalog catalog = nextCatalogs[i];
+			ICatalog referencedCatalog = catalog.getReferencedCatalog();
+			if (referencedCatalog != null) {
+				if (XMLCorePlugin.USER_CATALOG_ID.equals(referencedCatalog.getId())) {
+					userCatalog = referencedCatalog;
+				}
+			}
+		}
+
+		CatalogSet tempCatalogSet = new CatalogSet();
+		workingUserCatalog = tempCatalogSet.lookupOrCreateCatalog("working", ""); //$NON-NLS-1$ //$NON-NLS-2$
+		workingUserCatalog.addEntriesFromCatalog(userCatalog);
+	}
+	
+	public boolean performFinish() {
+		IFile file = importPage.getFile();
+		if (file != null) {
+			String fileName = file.getLocation().toFile().toURI().toString();
+			try {
+				CatalogSet tempResourceSet = new CatalogSet();
+				ICatalog newCatalog = tempResourceSet.lookupOrCreateCatalog("temp", fileName); //$NON-NLS-1$
+				
+				workingUserCatalog.addEntriesFromCatalog(newCatalog);
+				userCatalog.clear();
+				userCatalog.addEntriesFromCatalog(workingUserCatalog);
+				userCatalog.save();
+			}
+			catch (Exception e) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
+
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		// TODO Auto-generated method stub
+
+	}
+	
+	public void addPages() {
+		importPage = new ImportXMLCatalogPage();
+		importPage.setTitle(XMLCatalogMessages.UI_LABEL_IMPORT_DIALOG_HEADING);
+		importPage.setDescription(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_IMPORT_DESCRIPTION);
+		importPage.setMessage(XMLCatalogMessages.UI_LABEL_IMPORT_DIALOG_MESSAGE);
+		addPage(importPage);
+		
+	}
+}
+
+
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLWizardsMessages.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLWizardsMessages.java
index eb29971..a1e01bb 100644
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLWizardsMessages.java
+++ b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLWizardsMessages.java
@@ -6,6 +6,7 @@
  * 
  * Contributors: 
  * IBM - Initial API and implementation
+ * David Carver/STAR Standard - d_a_carver@yahoo.com - bug 192568
  **********************************************************************/
 package org.eclipse.wst.xml.ui.internal.wizards;
 
@@ -80,7 +81,11 @@
 	public static String NewXMLTemplatesWizardPage_4;
 	public static String NewXMLTemplatesWizardPage_5;
 	public static String NewXMLTemplatesWizardPage_6;
-
+	
+	public static String _UI_DIALOG_XMLCATALOG_IMPORT_TITLE;
+	public static String _UI_DIALOG_XMLCATALOG_EXPORT_TITLE;
+	public static String _UI_DIALOG_XMLCATALOG_EXPORT_DESCRIPTION;
+    public static String _UI_DIALOG_XMLCATALOG_IMPORT_DESCRIPTION;
 	static {
 		// load message values from bundle file
 		NLS.initializeMessages(BUNDLE_NAME, XMLWizardsMessages.class);
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/wizardResource.properties b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/wizardResource.properties
index 7fc323b..0bd7bac 100644
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/wizardResource.properties
+++ b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/wizardResource.properties
@@ -7,6 +7,7 @@
 #
 # Contributors:
 #     IBM Corporation - initial API and implementation
+#     David Carver/STAR Standard - d_a_carver@yahoo.com - bug 192568
 ###############################################################################
 ! Properties file for component: XML Tools -  New XML Wizard
 ! Packaged for translation in:  xml.zip
@@ -67,8 +68,17 @@
 _UI_LABEL_ERROR_CATALOG_ENTRY_INVALID = The selected catalog entry specifies a URI that can not be located.
 
 _UI_LABEL_NAMESPACE_INFORMATION=Namespace Information
+
 Validation_Plugins_Unavailable=Validation Plugins Unavailable
 Validation_cannot_be_performed=Validation cannot be performed because the validation plugins were disabled or not found.  The generated file may be invalid.  Do you wish to continue?
+
+!ImportXMLCatalogWizard
+_UI_DIALOG_XMLCATALOG_IMPORT_TITLE    = Import XML Catalog
+_UI_DIALOG_XMLCATALOG_IMPORT_DESCRIPTION = Import all entries from an existing XML Catalog into the User Catalog.
+
+!ExportXMLCatalogWizard
+_UI_DIALOG_XMLCATALOG_EXPORT_TITLE    = Export Existing XML Catalog
+_UI_DIALOG_XMLCATALOG_EXPORT_DESCRIPTION = Export all existing User Catalog entries.
 #
 # ExampleProject
 ExampleProjectCreationOperation_op_desc=Creating example projects...