[228226] undo revert; not using ChangeBundleClasspath anymore

16 files changed, 43 insertions, 48 deletions

diff --git a/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF
index ac9adc7ec..7362930fa 100644
--- a/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.examples.generator.validator;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-ClassPath: generator.validator.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.examples.generator.validator.ValidatorGeneratorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.examples.generator.validator/build.properties b/examples/org.eclipse.emf.examples.generator.validator/build.properties
index 98ce43273..0f9e99209 100644
--- a/examples/org.eclipse.emf.examples.generator.validator/build.properties
+++ b/examples/org.eclipse.emf.examples.generator.validator/build.properties
@@ -1,14 +1,13 @@
 bin.includes = about.html,\
+               .,\
                plugin.xml,\
                META-INF/,\
                templates/,\
-               generator.validator.jar,\
                plugin.properties,\
                readme.txt
-jars.compile.order = generator.validator.jar
-exclude.generator.validator.jar = **/doc-files/**
-source.generator.validator.jar = src/
-output.generator.validator.jar = bin/
+exclude.. = **/doc-files/**
+source.. = src/
+output.. = bin/
 src.includes = about.html,\
                .classpath,\
                .jetproperties,\
diff --git a/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF
index 5c0b11e51..f58ed803c 100644
--- a/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.examples.library.edit; singleton:=true
 Bundle-Version: 2.4.0.qualifier
-Bundle-ClassPath: org.eclipse.emf.examples.library.edit.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.examples.extlibrary.provider.EXTLibraryEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.examples.library.edit/build.properties b/examples/org.eclipse.emf.examples.library.edit/build.properties
index faaa60968..acfb87be4 100644
--- a/examples/org.eclipse.emf.examples.library.edit/build.properties
+++ b/examples/org.eclipse.emf.examples.library.edit/build.properties
@@ -1,12 +1,11 @@
-bin.includes = org.eclipse.emf.examples.library.edit.jar,\
-               icons/,\
+bin.includes = icons/,\
+               .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
                about.html
-jars.compile.order = org.eclipse.emf.examples.library.edit.jar
-source.org.eclipse.emf.examples.library.edit.jar = src/
-output.org.eclipse.emf.examples.library.edit.jar = bin/
+source.. = src/
+output.. = bin/
 src.includes = about.html,\
                .classpath,\
                .project,\
diff --git a/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF
index af535b570..dc65a3c30 100644
--- a/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.examples.library.editor; singleton:=true
 Bundle-Version: 2.4.0.qualifier
-Bundle-ClassPath: org.eclipse.emf.examples.library.editor.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.examples.extlibrary.presentation.EXTLibraryEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.examples.library.editor/build.properties b/examples/org.eclipse.emf.examples.library.editor/build.properties
index f0743102c..acfb87be4 100644
--- a/examples/org.eclipse.emf.examples.library.editor/build.properties
+++ b/examples/org.eclipse.emf.examples.library.editor/build.properties
@@ -1,12 +1,11 @@
-bin.includes = org.eclipse.emf.examples.library.editor.jar,\
-               icons/,\
+bin.includes = icons/,\
+               .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
                about.html
-jars.compile.order = org.eclipse.emf.examples.library.editor.jar
-source.org.eclipse.emf.examples.library.editor.jar = src/
-output.org.eclipse.emf.examples.library.editor.jar = bin/
+source.. = src/
+output.. = bin/
 src.includes = about.html,\
                .classpath,\
                .project,\
diff --git a/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF
index e111e1332..1cd12dc04 100644
--- a/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.examples.library; singleton:=true
 Bundle-Version: 2.4.0.qualifier
-Bundle-ClassPath: org.eclipse.emf.examples.library.jar
+Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/examples/org.eclipse.emf.examples.library/build.properties b/examples/org.eclipse.emf.examples.library/build.properties
index f382ddbbe..cc2fcac74 100644
--- a/examples/org.eclipse.emf.examples.library/build.properties
+++ b/examples/org.eclipse.emf.examples.library/build.properties
@@ -1,12 +1,11 @@
-bin.includes = org.eclipse.emf.examples.library.jar,\
-               model/,\
+bin.includes = model/,\
+               .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
                about.html
-jars.compile.order = org.eclipse.emf.examples.library.jar
-source.org.eclipse.emf.examples.library.jar = src/
-output.org.eclipse.emf.examples.library.jar = bin/
+source.. = src/
+output.. = bin/
 src.includes = about.html,\
                .classpath,\
                .project,\
diff --git a/examples/org.eclipse.emf.exporter.html/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.exporter.html/META-INF/MANIFEST.MF
index ad7f5cd7f..0f7268a77 100644
--- a/examples/org.eclipse.emf.exporter.html/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.exporter.html/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.exporter.html;singleton:=true
 Bundle-Version: 2.4.0.qualifier
-Bundle-ClassPath: exporter.html.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.exporter.html.HTMLExporterPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.exporter.html/build.properties b/examples/org.eclipse.emf.exporter.html/build.properties
index c1dba9d21..6c68cbae2 100644
--- a/examples/org.eclipse.emf.exporter.html/build.properties
+++ b/examples/org.eclipse.emf.exporter.html/build.properties
@@ -1,14 +1,13 @@
 bin.includes = about.html,\
+               .,\
                plugin.properties,\
                plugin.xml,\
                icons/,\
-               exporter.html.jar,\
                META-INF/,\
                templates/
-jars.compile.order = exporter.html.jar
-exclude.xsd.ecore.exporter.jar = **/doc-files/**
-source.exporter.html.jar = src/
-output.exporter.html.jar = bin/
+exclude.. = **/doc-files/**
+source.. = src/
+output.. = bin/
 src.includes = about.html,\
                .classpath,\
                .jetproperties,\
diff --git a/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF
index aff386052..031958c31 100644
--- a/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.java.edit;singleton:=true
 Bundle-Version: 2.4.0.qualifier
-Bundle-ClassPath: java.edit.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.java.provider.JavaEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.java.edit/build.properties b/examples/org.eclipse.emf.java.edit/build.properties
index 6d7e444eb..70f7b19a5 100644
--- a/examples/org.eclipse.emf.java.edit/build.properties
+++ b/examples/org.eclipse.emf.java.edit/build.properties
@@ -1,13 +1,13 @@
-bin.includes = java.edit.jar,\
-               about.html,\
+bin.includes = about.html,\
+               .,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
                META-INF/
 
-output.java.edit.jar = bin/
-source.java.edit.jar = src/
-exclude.java.edit.jar = **/doc-files/**
+output.. = bin/
+source.. = src/
+exclude.. = **/doc-files/**
 src.includes = about.html,\
                .classpath,\
                .project,\
diff --git a/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF
index 678d6abac..2679fea24 100644
--- a/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.java.editor; singleton:=true
 Bundle-Version: 2.4.0.qualifier
-Bundle-ClassPath: java.editor.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.java.presentation.JavaEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.java.editor/build.properties b/examples/org.eclipse.emf.java.editor/build.properties
index 92076e279..95fe7f018 100644
--- a/examples/org.eclipse.emf.java.editor/build.properties
+++ b/examples/org.eclipse.emf.java.editor/build.properties
@@ -1,13 +1,13 @@
-bin.includes = java.editor.jar,\
-               about.html,\
+bin.includes = about.html,\
+               .,\
                icons/,\
                plugin.properties,\
                plugin.xml,\
                META-INF/
                
-output.java.editor.jar = bin/
-source.java.editor.jar = src/
-exclude.java.editor.jar = **/doc-files/**
+output.. = bin/
+source.. = src/
+exclude.. = **/doc-files/**
 src.includes = about.html,\
                .classpath,\
                .project,\
diff --git a/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF
index 59628b53a..de0604b4b 100644
--- a/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.java;singleton:=true
 Bundle-Version: 2.4.0.qualifier
-Bundle-ClassPath: java.jar
+Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.java.JavaPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.emf.java/build.properties b/examples/org.eclipse.emf.java/build.properties
index 1247a6c33..bd1deeef6 100644
--- a/examples/org.eclipse.emf.java/build.properties
+++ b/examples/org.eclipse.emf.java/build.properties
@@ -1,13 +1,13 @@
-bin.includes = java.jar,\
-               about.html,\
+bin.includes = about.html,\
+               .,\
                plugin.properties,\
                plugin.xml,\
                META-INF/,\
                model/
 
-output.java.jar = bin/
-source.java.jar = src/
-exclude.java.jar = **/doc-files/**
+output.. = bin/
+source.. = src/
+exclude.. = **/doc-files/**
 src.includes = about.html,\
                .classpath,\
                .project,\