[191763], [191766] Updated .project file to remove extraneous builder and updated MANIFEST.MF and build.properties to single-jar the plugin
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.query/.project b/plugins/org.eclipse.datatools.modelbase.sql.query/.project
index bf000f7..743737b 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.query/.project
+++ b/plugins/org.eclipse.datatools.modelbase.sql.query/.project
@@ -20,11 +20,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>com.ibm.sse.model.structuredbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.query/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.modelbase.sql.query/META-INF/MANIFEST.MF
index 7bfe354..a1a64a7 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.query/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.modelbase.sql.query/META-INF/MANIFEST.MF
@@ -2,8 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.datatools.modelbase.sql.query; singleton:=true
-Bundle-Version: 1.0.0.200706071
-Bundle-ClassPath: sqlquerymodel.jar
+Bundle-Version: 1.0.0.200706151
Bundle-Activator: org.eclipse.datatools.modelbase.sql.query.util.SQLQueryModelPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,7 +10,7 @@
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
com.ibm.icu;bundle-version="[3.4.0,4.0.0)"
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
Export-Package:
org.eclipse.datatools.modelbase.sql.query,
org.eclipse.datatools.modelbase.sql.query.helper,
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.query/build.properties b/plugins/org.eclipse.datatools.modelbase.sql.query/build.properties
index 10130a4..8d28916 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.query/build.properties
+++ b/plugins/org.eclipse.datatools.modelbase.sql.query/build.properties
@@ -1,13 +1,14 @@
-source.sqlquerymodel.jar = src/
-output.sqlquerymodel.jar = bin/
-bin.includes = plugin.xml,\
- sqlquerymodel.jar,\
- plugin.properties,\
- META-INF/
-
-jars.extra.classpath =
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ model/,\
+ .,\
+ plugin.xml,\
+ about.html,\
+ plugin.properties
+
src.dir = src/
-plugin.version = 1.0.0.200706071
+plugin.version = 1.0.0.200706151
javadoc.dir = doc/api/
download.dir = ./download/
javac.source = 1.4
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/.project b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/.project
index 210e0ba..bca1bce 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/.project
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/.project
@@ -20,11 +20,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>com.ibm.sse.model.structuredbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/META-INF/MANIFEST.MF
index ebde9d4..8d7edf8 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/META-INF/MANIFEST.MF
@@ -2,8 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.datatools.modelbase.sql.xml.query; singleton:=true
-Bundle-Version: 1.0.0.200706071
-Bundle-ClassPath: sqlxmlquerymodel.jar
+Bundle-Version: 1.0.0.200706151
Bundle-Activator: org.eclipse.datatools.modelbase.sql.xml.query.util.SQLXMLQueryModelPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,7 +10,7 @@
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.datatools.modelbase.sql.query;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)";visibility:=reexport
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
Export-Package:
org.eclipse.datatools.modelbase.sql.xml.query,
org.eclipse.datatools.modelbase.sql.xml.query.impl,
diff --git a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/build.properties b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/build.properties
index d8ec717..2698c1d 100644
--- a/plugins/org.eclipse.datatools.modelbase.sql.xml.query/build.properties
+++ b/plugins/org.eclipse.datatools.modelbase.sql.xml.query/build.properties
@@ -1,14 +1,14 @@
-source.sqlxmlquerymodel.jar = src/
-output.sqlxmlquerymodel.jar = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- sqlxmlquerymodel.jar,\
- META-INF/,\
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ model/,\
+ .,\
+ plugin.xml,\
+ about.html,\
plugin.properties
-jars.extra.classpath =
src.dir = src/
-plugin.version = 1.0.0.200706071
+plugin.version = 1.0.0.200706151
javadoc.dir = doc/api/
download.dir = ./download/
javac.source = 1.4