*** empty log message ***
diff --git a/deprecated/doc/org.eclipse.uml2.doc/about.ini b/deprecated/doc/org.eclipse.uml2.doc/about.ini
index a9f0f29..3db2a96 100644
--- a/deprecated/doc/org.eclipse.uml2.doc/about.ini
+++ b/deprecated/doc/org.eclipse.uml2.doc/about.ini
@@ -5,11 +5,23 @@
 # This file does not need to be translated.
 
 # Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
+aboutText = %aboutText
+
+# Property "windowImage" contains path to window icon (16x16)
+# needed for primary features only
 
 # Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
+featureImage = eclipse32.gif
+
+# Property "aboutImage" contains path to product image (500x330 or 115x164)
+# needed for primary features only
 
 # Property "appName" contains name of the application (translated)
-appName=%featureName
+# needed for primary features only
 
+# Property "welcomePage" contains path to welcome page (special XML-based format)
+# optional
+
+# Property "welcomePerspective" contains the id of the perspective in which the
+# welcome page is to be opened.
+# optional
diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml b/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
index 0431847..46b6382 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.2 2004/05/12 22:20:17 khussey Exp $
+ * $Id: plugin.xml,v 1.3 2004/05/17 19:52:39 khussey Exp $
  */
 -->
 
@@ -26,7 +26,6 @@
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.emf.edit.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.eclipse.uml2.editor"/>
       <import plugin="org.eclipse.uml2.examples" export="true"/>
    </requires>
diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/ExampleWizardResourceImportPage.java b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/ExampleWizardResourceImportPage.java
index c6e619f..4ab7fbf 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/ExampleWizardResourceImportPage.java
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/wizards/ExampleWizardResourceImportPage.java
@@ -8,19 +8,15 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExampleWizardResourceImportPage.java,v 1.1 2004/04/29 15:31:14 khussey Exp $
+ * $Id: ExampleWizardResourceImportPage.java,v 1.2 2004/05/17 19:52:39 khussey Exp $
  */
 package org.eclipse.uml2.examples.ui.wizards;
 
 import java.util.List;
 
 import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.ui.dialogs.FileSystemElement;
@@ -40,23 +36,9 @@
 
 		switch (resource.getType()) {
 			case IResource.FILE:
-				if (resource.getName().endsWith("." + extension)) { //$NON-NLS-1$
-					IProject project = resource.getProject();
-					IJavaProject javaProject = JavaCore.create(project);
-
-					try {
-						if (!javaProject.exists()
-							|| project == project.getWorkspace().getRoot()
-								.findMember(javaProject.getOutputLocation())
-							|| !javaProject.getOutputLocation().isPrefixOf(
-								resource.getFullPath())) {
-
-							result = new FileSystemElement(label, parent, false);
-							result.setFileSystemObject(resource);
-						}
-					} catch (JavaModelException jme) {
-						// ignore
-					}
+				if (resource.getName().endsWith('.' + extension)) {
+					result = new FileSystemElement(label, parent, false);
+					result.setFileSystemObject(resource);
 				}
 				break;
 			case IResource.ROOT:
diff --git a/examples/org.eclipse.uml2.examples-feature/feature.xml b/examples/org.eclipse.uml2.examples-feature/feature.xml
index 83057f3..9b90aa5 100644
--- a/examples/org.eclipse.uml2.examples-feature/feature.xml
+++ b/examples/org.eclipse.uml2.examples-feature/feature.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: feature.xml,v 1.3 2004/05/17 18:52:16 khussey Exp $
+ * $Id: feature.xml,v 1.4 2004/05/17 19:52:43 khussey Exp $
  */
 -->
 
@@ -41,7 +41,6 @@
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.emf.ecore.xmi"/>
       <import plugin="org.eclipse.emf.edit"/>
-      <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.uml2"/>
       <import plugin="org.eclipse.uml2.edit"/>
diff --git a/examples/org.eclipse.uml2.examples-feature/sourceTemplatePlugin/about.properties b/examples/org.eclipse.uml2.examples-feature/sourceTemplatePlugin/about.properties
index 22c1bf2..b1e390c 100644
--- a/examples/org.eclipse.uml2.examples-feature/sourceTemplatePlugin/about.properties
+++ b/examples/org.eclipse.uml2.examples-feature/sourceTemplatePlugin/about.properties
@@ -8,7 +8,7 @@
 # * Contributors: 
 # *   IBM - Initial API and implementation
 # *
-# * $Id: about.properties,v 1.1 2004/04/29 15:27:43 khussey Exp $
+# * $Id: about.properties,v 1.2 2004/05/17 19:52:43 khussey Exp $
 # */
 
 # about.properties
@@ -17,7 +17,7 @@
 # fill-ins are supplied by about.mappings
 # This file should be translated.
 
-aboutText = Unified Modeling Language 2.0 Examples Source\n\
+aboutText = UML2 Examples Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
diff --git a/plugins/org.eclipse.uml2-feature/sourceTemplatePlugin/about.properties b/plugins/org.eclipse.uml2-feature/sourceTemplatePlugin/about.properties
index cd9f76a..2739296 100644
--- a/plugins/org.eclipse.uml2-feature/sourceTemplatePlugin/about.properties
+++ b/plugins/org.eclipse.uml2-feature/sourceTemplatePlugin/about.properties
@@ -8,7 +8,7 @@
 # * Contributors: 
 # *   IBM - Initial API and implementation
 # *
-# * $Id: about.properties,v 1.2 2004/04/10 03:55:54 khussey Exp $
+# * $Id: about.properties,v 1.3 2004/05/17 19:52:31 khussey Exp $
 # */
 
 # about.properties
@@ -17,7 +17,7 @@
 # fill-ins are supplied by about.mappings
 # This file should be translated.
 
-aboutText = Unified Modeling Language 2.0 Source\n\
+aboutText = UML2 Source\n\
 \n\
 Version: {featureVersion}\n\
 Build id: {0}\n\