Jarring plugins
diff --git a/plugins/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF
index 4918855..3108cf0 100644
--- a/plugins/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.common.ui;singleton:=true
 Bundle-Version: 0.7.0.200602241
 Bundle-Activator: org.eclipse.datatools.sqltools.common.ui.internal.Activator
-Bundle-ClassPath: sqltoolscommonui.jar
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -12,7 +11,6 @@
  org.eclipse.jface.text,
  org.eclipse.debug.core,
  com.ibm.icu
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
 Export-Package: org.eclipse.datatools.sqltools.common.ui.preferences,
  org.eclipse.datatools.sqltools.common.ui.util;x-friends:="org.eclipse.datatools.sqltools.sqlscrapbook"
diff --git a/plugins/org.eclipse.datatools.sqltools.common.ui/build.properties b/plugins/org.eclipse.datatools.sqltools.common.ui/build.properties
index 1634ecb..9b7bbca 100644
--- a/plugins/org.eclipse.datatools.sqltools.common.ui/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.common.ui/build.properties
@@ -1,15 +1,14 @@
-source.sqltoolscommonui.jar = src/
-output.sqltoolscommonui.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = META-INF/,\
-               sqltoolscommonui.jar,\
+               .,\
                icons/,\
                about.html,\
                plugin.xml
 
-jars.extra.classpath =
 src.dir = src/
 plugin.version =	0.7.0.200602241
 javadoc.dir =		doc/api/
 download.dir =		./download/
 javac.source =		1.4
-javac.target =		1.4
\ No newline at end of file
+javac.target =		1.4
diff --git a/plugins/org.eclipse.datatools.sqltools.db.derby/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.db.derby/META-INF/MANIFEST.MF
index 14756b5..28c666b 100644
--- a/plugins/org.eclipse.datatools.sqltools.db.derby/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.db.derby/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@
 Bundle-Activator: org.eclipse.datatools.sqltools.db.derby.Activator
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
-Bundle-ClassPath: sqlderby.jar
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.datatools.sqltools.editor.core,
@@ -19,5 +18,4 @@
  org.eclipse.datatools.sqltools.sqleditor,
  org.eclipse.core.resources,
  org.eclipse.debug.core
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.datatools.sqltools.db.derby/build.properties b/plugins/org.eclipse.datatools.sqltools.db.derby/build.properties
index a8bd2b8..655cb84 100644
--- a/plugins/org.eclipse.datatools.sqltools.db.derby/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.db.derby/build.properties
@@ -1,13 +1,12 @@
-source.sqlderby.jar = src/
-output.sqlderby.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
                .,\
-               sqlderby.jar,\
+               .,\
                META-INF/,\
                about.html,\
                icons/
 
-jars.extra.classpath =
 src.dir =		src/
 plugin.version =	0.7.0.200602242
 javadoc.dir =		doc/api/
diff --git a/plugins/org.eclipse.datatools.sqltools.db.generic/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.db.generic/META-INF/MANIFEST.MF
index ed19d3b..3c89bc9 100644
--- a/plugins/org.eclipse.datatools.sqltools.db.generic/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.db.generic/META-INF/MANIFEST.MF
@@ -6,13 +6,11 @@
 Bundle-Activator: org.eclipse.datatools.sqltools.db.generic.internal.GenericPlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
-Bundle-ClassPath: genericdb.jar
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.datatools.sqltools.sql,
  org.eclipse.datatools.sqltools.editor.core
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
 Export-Package: org.eclipse.datatools.sqltools.db.generic;x-internal:=true,
  org.eclipse.datatools.sqltools.db.generic.parser;x-internal:=true,
  org.eclipse.datatools.sqltools.db.generic.service;x-internal:=true,
diff --git a/plugins/org.eclipse.datatools.sqltools.db.generic/build.properties b/plugins/org.eclipse.datatools.sqltools.db.generic/build.properties
index d8989bb..dbfbc5b 100644
--- a/plugins/org.eclipse.datatools.sqltools.db.generic/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.db.generic/build.properties
@@ -1,13 +1,11 @@
-source.genericdb.jar = src/
-output.genericdb.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
-               genericdb.jar,\
+               .,\
                genericdb.jar,\
                META-INF/,\
-               about.html,\
-               grammar/
+               about.html
 
-jars.extra.classpath =
 src.dir =		src/
 plugin.version =	0.7.0.200602242
 javadoc.dir =		doc/api/
diff --git a/plugins/org.eclipse.datatools.sqltools.debugger.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.debugger.core/META-INF/MANIFEST.MF
index 26e7056..3055141 100644
--- a/plugins/org.eclipse.datatools.sqltools.debugger.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.debugger.core/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: Eclipse Data Tools Platform SQL Debugger Framework
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.debugger.core;singleton:=true
 Bundle-Version: 0.7.0.200602242
-Bundle-ClassPath: sqldebugcore.jar
 Bundle-Activator: org.eclipse.datatools.sqltools.debugger.core.internal.DebuggerCorePlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
@@ -19,8 +18,7 @@
  org.eclipse.datatools.sqltools.routineeditor,
  org.eclipse.datatools.sqltools.common.ui,
  org.eclipse.ui.ide
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
 Export-Package: org.eclipse.datatools.sqltools.debugger.breakpoint,
  org.eclipse.datatools.sqltools.debugger.core,
  org.eclipse.datatools.sqltools.debugger.model
diff --git a/plugins/org.eclipse.datatools.sqltools.debugger.core/build.properties b/plugins/org.eclipse.datatools.sqltools.debugger.core/build.properties
index bfca9cb..f0a64a4 100644
--- a/plugins/org.eclipse.datatools.sqltools.debugger.core/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.debugger.core/build.properties
@@ -1,11 +1,11 @@
-source.sqldebugcore.jar = src/
-output.sqldebugcore.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = META-INF/,\
                plugin.xml,\
-               sqldebugcore.jar,\
-               about.html
+               .,\
+               about.html,\
+               icons/
 
-jars.extra.classpath =
 src.dir =		src/
 plugin.version =	0.7.0.200602242
 javadoc.dir =		doc/api/
diff --git a/plugins/org.eclipse.datatools.sqltools.editor.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.editor.core/META-INF/MANIFEST.MF
index 7fa40e1..63e30d8 100644
--- a/plugins/org.eclipse.datatools.sqltools.editor.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.editor.core/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@
 Bundle-Version: 0.7.0.200602242
 Bundle-Activator: org.eclipse.datatools.sqltools.core.EditorCorePlugin
 Bundle-Localization: plugin
-Bundle-ClassPath: sqleditorframe.jar
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.editors,
@@ -21,8 +20,7 @@
  com.ibm.icu,
  org.eclipse.core.resources,
  org.eclipse.datatools.modelbase.sql.query
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
 Export-Package: org.eclipse.datatools.sqltools.core,
  org.eclipse.datatools.sqltools.core.dbitem,
  org.eclipse.datatools.sqltools.core.profile,
diff --git a/plugins/org.eclipse.datatools.sqltools.editor.core/build.properties b/plugins/org.eclipse.datatools.sqltools.editor.core/build.properties
index a25fc32..b6c81f7 100644
--- a/plugins/org.eclipse.datatools.sqltools.editor.core/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.editor.core/build.properties
@@ -1,13 +1,12 @@
-source.sqleditorframe.jar = src/
-output.sqleditorframe.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = META-INF/,\
-               sqleditorframe.jar,\
+               .,\
                plugin.xml,\
                .settings/,\
                schema/,\
                about.html
 
-jars.extra.classpath =
 src.dir =		src/
 plugin.version =	0.7.0.200602242
 javadoc.dir =		doc/api/
diff --git a/plugins/org.eclipse.datatools.sqltools.plan/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.plan/META-INF/MANIFEST.MF
index 564af14..5af928e 100644
--- a/plugins/org.eclipse.datatools.sqltools.plan/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.plan/META-INF/MANIFEST.MF
@@ -10,8 +10,6 @@
  org.eclipse.core.runtime,
  org.eclipse.draw2d,
  org.eclipse.datatools.sqltools.common.ui
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
 Export-Package: org.eclipse.datatools.sqltools.plan,
  org.eclipse.datatools.sqltools.plan.treeplan
-Bundle-ClassPath: sqlplan.jar
diff --git a/plugins/org.eclipse.datatools.sqltools.plan/build.properties b/plugins/org.eclipse.datatools.sqltools.plan/build.properties
index b747c42..02b3819 100644
--- a/plugins/org.eclipse.datatools.sqltools.plan/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.plan/build.properties
@@ -1,12 +1,12 @@
-source.sqlplan.jar = src/
-output.sqlplan.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = META-INF/,\
-               sqlplan.jar,\
+               .,\
                plugin.xml,\
                about.html,\
-               schema/
+               schema/,\
+               icons/
 
-jars.extra.classpath =
 src.dir =		src/
 plugin.version =	0.7.0.200602241
 javadoc.dir =		doc/api/
diff --git a/plugins/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF
index b6b3b28..572f461 100644
--- a/plugins/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@
 Bundle-Version: 0.7.0.200602241
 Bundle-Activator: org.eclipse.datatools.sqltools.result.internal.ResultsViewPlugin
 Bundle-Vendor: Eclipse.org
-Bundle-ClassPath: sqlresult.jar
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -19,5 +18,4 @@
  org.apache.lucene,
  com.ibm.icu
 Export-Package: org.eclipse.datatools.sqltools.result
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.datatools.sqltools.result/build.properties b/plugins/org.eclipse.datatools.sqltools.result/build.properties
index 557f4fd..c3f03d5 100644
--- a/plugins/org.eclipse.datatools.sqltools.result/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.result/build.properties
@@ -1,13 +1,12 @@
-source.sqlresult.jar = src/
-output.sqlresult.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = META-INF/,\
-               sqlresult.jar,\
+               .,\
                about.html,\
                icons/,\
                plugin.properties,\
                plugin.xml
                
-jars.extra.classpath =
 src.dir =		src/
 plugin.version =	0.7.0.200602241
 javadoc.dir =		doc/api/
diff --git a/plugins/org.eclipse.datatools.sqltools.routineeditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.routineeditor/META-INF/MANIFEST.MF
index 26e8a60..d075bdf 100644
--- a/plugins/org.eclipse.datatools.sqltools.routineeditor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.routineeditor/META-INF/MANIFEST.MF
@@ -21,11 +21,9 @@
  org.eclipse.debug.ui,
  org.eclipse.datatools.sqltools.common.ui,
  org.eclipse.ui.ide
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
 Export-Package: org.eclipse.datatools.sqltools.routineeditor,
  org.eclipse.datatools.sqltools.routineeditor.launching;x-friends:="org.eclipse.datatools.sqltools.debugger.core",
  org.eclipse.datatools.sqltools.routineeditor.result,
  org.eclipse.datatools.sqltools.routineeditor.ui.launching;x-internal:=true,
  org.eclipse.datatools.sqltools.routineeditor.util;x-internal:=true
-Bundle-ClassPath: routineeditor.jar
diff --git a/plugins/org.eclipse.datatools.sqltools.routineeditor/build.properties b/plugins/org.eclipse.datatools.sqltools.routineeditor/build.properties
index 92ce1c0..528ce7d 100644
--- a/plugins/org.eclipse.datatools.sqltools.routineeditor/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.routineeditor/build.properties
@@ -1,16 +1,15 @@
-source.routineeditor.jar = src/
-output.routineeditor.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = META-INF/,\
-               routineeditor.jar,\
+               .,\
                plugin.xml,\
                plugin.properties,\
-               routineeditor.jar,\
                about.html,\
-               schema/
-jars.extra.classpath =
+               schema/,\
+               icons/
 src.dir =		src/
 plugin.version =	0.7.0.200603101
 javadoc.dir =		doc/api/
 download.dir =		./download/
 javac.source =		1.4
-javac.target =		1.4
\ No newline at end of file
+javac.target =		1.4
diff --git a/plugins/org.eclipse.datatools.sqltools.sql/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.sql/META-INF/MANIFEST.MF
index 05586b2..025c52f 100644
--- a/plugins/org.eclipse.datatools.sqltools.sql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.sql/META-INF/MANIFEST.MF
@@ -3,15 +3,13 @@
 Bundle-Name: Eclipse Data Tools Platform SQL Core Plug-in
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.sql
 Bundle-Version: 0.7.0.200602241
-Bundle-ClassPath: sqltools.jar
 Bundle-Activator: org.eclipse.datatools.sqltools.sql.internal.SQLActivator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.jface.text;visibility:=reexport,
  org.eclipse.ui.editors
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
 Export-Package: org.eclipse.datatools.sqltools.sql,
  org.eclipse.datatools.sqltools.sql.parser;x-internal:=true,
  org.eclipse.datatools.sqltools.sql.parser.ast;x-internal:=true,
diff --git a/plugins/org.eclipse.datatools.sqltools.sql/build.properties b/plugins/org.eclipse.datatools.sqltools.sql/build.properties
index 3961fe7..89cc2cf 100644
--- a/plugins/org.eclipse.datatools.sqltools.sql/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.sql/build.properties
@@ -1,11 +1,10 @@
-source.sqltools.jar = src/
-output.sqltools.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = META-INF/,\
-               sqltools.jar,\
+               .,\
                icons/,\
                about.html
 
-jars.extra.classpath =
 src.dir =		src/
 plugin.version =	0.7.0.200602241
 javadoc.dir =		doc/api/
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF
index 58283f3..91a3279 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: Eclipse Data Tools Platform SQL Editor
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.sqleditor; singleton:=true
 Bundle-Version: 0.7.0.200603101
-Bundle-ClassPath: sqleditor.jar
 Bundle-Activator: org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorPlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
@@ -33,5 +32,4 @@
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
  com.ibm.icu
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/build.properties b/plugins/org.eclipse.datatools.sqltools.sqleditor/build.properties
index aec4520..b67f267 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.sqleditor/build.properties
@@ -1,7 +1,7 @@
-jars.compile.order = sqleditor.jar
-source.sqleditor.jar = src/
-output.sqleditor.jar = bin/
-bin.includes = sqleditor.jar,\
+jars.compile.order = .
+source.. = src/
+output.. = bin/
+bin.includes = .,\
                schema/,\
                icons/,\
                plugin.xml,\
@@ -9,7 +9,6 @@
                about.html,\
                META-INF/
                
-jars.extra.classpath =
 src.dir =		src/
 plugin.version =	0.7.0.200603101
 javadoc.dir =		doc/api/
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/META-INF/MANIFEST.MF
index bd3ffbc..9c529af 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.sqlscrapbook; singleton:=true
 Bundle-Version: 0.7.0.200603101
-Bundle-ClassPath: sqlscrapbook.jar
 Bundle-Activator: org.eclipse.datatools.sqltools.internal.sqlscrapbook.SqlscrapbookPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -32,6 +31,5 @@
  org.eclipse.datatools.connectivity.db.generic,
  org.eclipse.datatools.connectivity.ui,
  org.eclipse.datatools.connectivity.db.generic.ui
-Eclipse-AutoStart: true
-Eclipse-AutoStop: true
+Eclipse-LazyStart: true
 
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/build.properties b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/build.properties
index d2aa7c3..5232a3c 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/build.properties
+++ b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/build.properties
@@ -1,14 +1,13 @@
-jars.compile.order = sqlscrapbook.jar
-source.sqlscrapbook.jar = src/
-output.sqlscrapbook.jar = bin/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
-               sqlscrapbook.jar,\
+               .,\
                plugin.properties,\
                images/,\
                about.html,\
                META-INF/
 
-jars.extra.classpath =
 src.dir =		src/
 plugin.version =	0.7.0.200603101
 javadoc.dir =		doc/api/