making jarred plugins
diff --git a/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
index 95fdec6..7870b65 100644
--- a/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.jsp.core; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: jspmodel.jar
 Bundle-Activator: org.eclipse.jst.jsp.core.internal.JSPCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.jst.jsp.core/build.properties b/bundles/org.eclipse.jst.jsp.core/build.properties
index 59822c5..6b443b0 100644
--- a/bundles/org.eclipse.jst.jsp.core/build.properties
+++ b/bundles/org.eclipse.jst.jsp.core/build.properties
@@ -9,14 +9,12 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = plugin.xml,\
-               *.jar,\
-               jsp.jar,\
                .options,\
                plugin.properties,\
-               META-INF/
+               META-INF/,\
+               .
 src.includes = plugin.xml,\
-               build.xml,\
-               .options,\
                plugin.properties,\
-               component.xml
-source.jspmodel.jar = src/
+               component.xml,\
+               build.properties
+source.. = src/
diff --git a/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
index 35922fb..b0a236f 100644
--- a/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.jsp.ui; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: jspeditor.jar
 Bundle-Activator: org.eclipse.jst.jsp.ui.internal.JSPUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.jst.jsp.ui/build.properties b/bundles/org.eclipse.jst.jsp.ui/build.properties
index 42eecf1..a4ffd6a 100644
--- a/bundles/org.eclipse.jst.jsp.ui/build.properties
+++ b/bundles/org.eclipse.jst.jsp.ui/build.properties
@@ -8,16 +8,18 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-source.jspeditor.jar = src/
+source.. = src/
 bin.includes = plugin.xml,\
                *.jar,\
-               jspeditor.jar,\
+               ./,\
                icons/,\
                plugin.properties,\
                templates/,\
-               META-INF/
+               META-INF/,\
+               .
 src.includes = plugin.xml,\
                plugin.properties,\
                icons/,\
                build.xml,\
-               templates/
+               templates/,\
+               build.properties
diff --git a/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
index 0886286..7e936fa 100644
--- a/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.css.core; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: cssmodel.jar
 Bundle-Activator: org.eclipse.wst.css.core.internal.CSSCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.css.core/build.properties b/bundles/org.eclipse.wst.css.core/build.properties
index e1ef875..7af2510 100644
--- a/bundles/org.eclipse.wst.css.core/build.properties
+++ b/bundles/org.eclipse.wst.css.core/build.properties
@@ -9,16 +9,17 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = plugin.xml,\
-               *.jar,\
-               css.jar,\
                cssprofile/,\
                .options,\
                plugin.properties,\
-               META-INF/
-source.cssmodel.jar = src/
+               META-INF/,\
+               .
 src.includes = plugin.xml,\
                cssprofile/,\
                build.xml,\
                .options,\
                plugin.properties,\
-               component.xml
+               component.xml,\
+               build.properties
+source.. = src/
+               
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
index bcb6f6d..d9a27a3 100644
--- a/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.css.ui; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: csseditor.jar
 Bundle-Activator: org.eclipse.wst.css.ui.internal.CSSUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.css.ui/build.properties b/bundles/org.eclipse.wst.css.ui/build.properties
index 7e98d66..e6db149 100644
--- a/bundles/org.eclipse.wst.css.ui/build.properties
+++ b/bundles/org.eclipse.wst.css.ui/build.properties
@@ -9,8 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = plugin.xml,\
-               *.jar,\
-               css.jar,\
                icons/,\
                plugin.properties,\
                META-INF/
@@ -20,4 +18,4 @@
                build.xml,\
                build.properties,\
                README.txt
-source.csseditor.jar = src/
+source.. = src/
diff --git a/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
index 9e4718b..62a12fa 100644
--- a/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.dtd.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.dtd.core; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: dtdcore.jar
 Bundle-Activator: org.eclipse.wst.dtd.core.internal.DTDCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.dtd.core/build.properties b/bundles/org.eclipse.wst.dtd.core/build.properties
index f2484cd..2cc6081 100644
--- a/bundles/org.eclipse.wst.dtd.core/build.properties
+++ b/bundles/org.eclipse.wst.dtd.core/build.properties
@@ -11,18 +11,16 @@
 #     
 ###############################################################################
 bin.includes = plugin.xml,\
-               *.jar,\
                plugin.properties,\
                icons/,\
-               META-INF/
+               META-INF/,\
+               .
 src.includes = plugin.xml,\
                plugin.properties,\
                build.xml,\
                icons/,\
                component.xml
-source.dtdcore.jar = src/,\
+source.. = src/,\
                      contentmodel/,\
                      emfmodel/,\
-                     saxparser/
-                      
-output.dtdcore.jar = bin/
+                     saxparser/
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
index c13e7b8..e5c5cf7 100644
--- a/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.dtd.ui; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: dtdui.jar
 Bundle-Activator: org.eclipse.wst.dtd.ui.internal.DTDUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.dtd.ui/build.properties b/bundles/org.eclipse.wst.dtd.ui/build.properties
index fd5cd47..e83e81a 100644
--- a/bundles/org.eclipse.wst.dtd.ui/build.properties
+++ b/bundles/org.eclipse.wst.dtd.ui/build.properties
@@ -11,11 +11,11 @@
 #     
 ###############################################################################
 bin.includes = plugin.xml,\
-               *.jar,\
                icons/,\
                plugin.properties,\
-               META-INF/
-source.dtdui.jar = src/
+               META-INF/,\
+               .
+source.. = src/
 src.includes = plugin.xml,\
                icons/,\
                build.xml,\
diff --git a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
index 361e04f..d8b99ca 100644
--- a/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.html.core; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: htmlmodel.jar
 Bundle-Activator: org.eclipse.wst.html.core.internal.HTMLCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.html.core/build.properties b/bundles/org.eclipse.wst.html.core/build.properties
index f16444e..b2afc9d 100644
--- a/bundles/org.eclipse.wst.html.core/build.properties
+++ b/bundles/org.eclipse.wst.html.core/build.properties
@@ -9,16 +9,16 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = plugin.xml,\
-               *.jar,\
-               html.jar,\
                .options,\
                data/,\
                plugin.properties,\
-               META-INF/
+               META-INF/,\
+               .
 src.includes = plugin.xml,\
                build.xml,\
                .options,\
                data/,\
                plugin.properties,\
-               component.xml
-source.htmlmodel.jar = src/
+               component.xml,\
+               build.properties
+source.. = src/
diff --git a/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
index 9407a36..8a1d0c9 100644
--- a/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.html.ui; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: htmleditor.jar
 Bundle-Activator: org.eclipse.wst.html.ui.internal.HTMLUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.html.ui/build.properties b/bundles/org.eclipse.wst.html.ui/build.properties
index b52e950..b4552b1 100644
--- a/bundles/org.eclipse.wst.html.ui/build.properties
+++ b/bundles/org.eclipse.wst.html.ui/build.properties
@@ -9,17 +9,15 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = plugin.xml,\
-               *.jar,\
-               html.jar,\
                icons/,\
                plugin.properties,\
                templates/,\
-               META-INF/
-source.htmleditor.jar = src/,\
-                        src-html-validation/
+               META-INF/.\
+               .
+source.. = src/,\
+           src-html-validation/
 src.includes = plugin.xml,\
                plugin.properties,\
                icons/,\
                build.xml,\
-               templates/
-output.htmleditor.jar = bin/
+               templates/
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF
index ac20dd0..07bf36a 100644
--- a/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.sse.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.sse.core; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: model.jar
 Bundle-Activator: org.eclipse.wst.sse.core.internal.SSECorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.sse.core/build.properties b/bundles/org.eclipse.wst.sse.core/build.properties
index b645a10..69f8eb9 100644
--- a/bundles/org.eclipse.wst.sse.core/build.properties
+++ b/bundles/org.eclipse.wst.sse.core/build.properties
@@ -10,21 +10,21 @@
 #     Jens Lukowski/Innoopract - initial renaming/restructuring
 #     
 ###############################################################################
-source.model.jar = src-encoding/,\
+source.. = src-encoding/,\
                    src/
 bin.includes = plugin.xml,\
                plugin.properties,\
-               model.jar,\
                .options,\
                config/,\
-               META-INF/
+               META-INF/,\
+               .
 src.includes = DevTimeSupport/,\
                plugin.properties,\
                plugin.xml,\
-               model.jar,\
                .options,\
                schema/,\
                doc/,\
                config/,\
-               component.xml
-output.model.jar = bin/
+               component.xml,\
+               README.txt,\
+               build.properties
diff --git a/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
index 2b794c0..1545546 100644
--- a/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.sse.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.sse.ui; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: editor.jar
 Bundle-Activator: org.eclipse.wst.sse.ui.internal.SSEUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.sse.ui/build.properties b/bundles/org.eclipse.wst.sse.ui/build.properties
index 2bd6af7..2841e39 100644
--- a/bundles/org.eclipse.wst.sse.ui/build.properties
+++ b/bundles/org.eclipse.wst.sse.ui/build.properties
@@ -12,7 +12,7 @@
 ###############################################################################
 bin.includes = plugin.xml,\
                .options,\
-               editor.jar,\
+               .,\
                data/,\
                icons/,\
                jspdebug.properties,\
@@ -32,7 +32,6 @@
                DevTimeSupport/,\
                .options,\
                doc/
-source.editor.jar = src/,\
+source.. = src/,\
                     src-extensions/,\
                     src-contentproperties/
-output.editor.jar = bin/
diff --git a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
index af11fc1..60118fe 100644
--- a/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xml.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.xml.core; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: xmlmodel.jar
 Bundle-Activator: org.eclipse.wst.xml.core.internal.XMLCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xml.core/build.properties b/bundles/org.eclipse.wst.xml.core/build.properties
index 469995a..9bd0e22 100644
--- a/bundles/org.eclipse.wst.xml.core/build.properties
+++ b/bundles/org.eclipse.wst.xml.core/build.properties
@@ -11,18 +11,17 @@
 #     
 ###############################################################################
 bin.includes = plugin.xml,\
-               *.jar,\
-               xml.jar,\
                .options,\
                extensions.xml,\
                plugin.properties,\
-               META-INF/
+               META-INF/,\
+               .
 src.includes = plugin.xml,\
                plugin.properties,\
                extensions.xml,\
                build.xml,\
                .options,\
-               component.xml
-source.xmlmodel.jar = src-contentmodel/,\
-                      src/
-output.xmlmodel.jar = bin/
+               component.xml,\
+               build.properties
+source.. = src-contentmodel/,\
+                      src/
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
index 29da20b..8dab918 100644
--- a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.xml.ui; singleton:=true
 Bundle-Version: 1.0.0
-Bundle-ClassPath: xmleditor.jar
 Bundle-Activator: org.eclipse.wst.xml.ui.internal.XMLUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xml.ui/build.properties b/bundles/org.eclipse.wst.xml.ui/build.properties
index 81c1a4f..8ff8deb 100644
--- a/bundles/org.eclipse.wst.xml.ui/build.properties
+++ b/bundles/org.eclipse.wst.xml.ui/build.properties
@@ -17,14 +17,14 @@
                templates/,\
                xmleditor.jar,\
                examples/,\
-               META-INF/
-source.xmleditor.jar = src/,\
-                       src-multipage/,\
-                       src-wizards/
+               META-INF/,\
+               .
+source.. = src/,\
+           src-multipage/,\
+           src-wizards/
 src.includes = plugin.xml,\
                plugin.properties,\
                icons/,\
                templates/,\
-               examples/
-output.xmleditor.jar = bin/
-jars.compile.order = xmleditor.jar
+               examples/,\
+               build.properties