summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-05-12 06:12:57 (EDT)
committerEike Stepper2008-05-12 06:12:57 (EDT)
commitc955ae7d447a1be774a7d3b4e1430d4bd4046e9e (patch)
tree40c2efb6f6d765a48fea81f28f983ec2646e1a1e
parentecb94ce60f375a45b7a5a8e76f440195717bad95 (diff)
downloadcdo-c955ae7d447a1be774a7d3b4e1430d4bd4046e9e.zip
cdo-c955ae7d447a1be774a7d3b4e1430d4bd4046e9e.tar.gz
cdo-c955ae7d447a1be774a7d3b4e1430d4bd4046e9e.tar.bz2
[231516] Turn DB adapters from fragments into plugins
https://bugs.eclipse.org/bugs/show_bug.cgi?id=231516
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.classpath1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/build.properties4
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/plugin.properties (renamed from plugins/org.eclipse.net4j.db.hsqldb/fragment.properties)0
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/plugin.xml (renamed from plugins/org.eclipse.net4j.db.hsqldb/fragment.xml)0
-rw-r--r--plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF1
7 files changed, 9 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/.classpath b/plugins/org.eclipse.emf.cdo.tests/.classpath
index 9989588..d2d2655 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.classpath
+++ b/plugins/org.eclipse.emf.cdo.tests/.classpath
@@ -4,6 +4,5 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="net4j"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.net4j.db.hsqldb"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
index c667ec3..b85fb96 100644
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
+ org.eclipse.net4j.db.hsqldb;visibility:=reexport,
org.eclipse.net4j.jvm;resolution:=optional;visibility:=reexport,
org.eclipse.net4j.tcp;resolution:=optional;visibility:=reexport,
org.eclipse.emf.cdo.server;visibility:=reexport,
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
index bf151ab..66e0850 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
@@ -4,11 +4,12 @@ Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.net4j.db.hsqldb;singleton:=true
Bundle-Version: 0.8.0.qualifier
Bundle-Vendor: %providerName
-Bundle-Localization: fragment
+Bundle-Localization: plugin
Bundle-ClassPath: .,
lib/hsqldb.jar
-Fragment-Host: org.eclipse.net4j.db
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.net4j.db;bundle-version="0.8.0";visibility:=reexport
Export-Package: org.eclipse.net4j.db.hsqldb;version="0.8.0",
org.eclipse.net4j.db.internal.hsqldb;version="0.8.0",
org.hsqldb,
@@ -23,4 +24,4 @@ Export-Package: org.eclipse.net4j.db.hsqldb;version="0.8.0",
org.hsqldb.store,
org.hsqldb.types,
org.hsqldb.util
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/build.properties b/plugins/org.eclipse.net4j.db.hsqldb/build.properties
index 786d1d8..514e156 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/build.properties
+++ b/plugins/org.eclipse.net4j.db.hsqldb/build.properties
@@ -18,7 +18,7 @@ bin.includes = META-INF/,\
copyright.txt,\
epl-v10.html,\
license.html,\
- fragment.properties,\
- fragment.xml,\
+ plugin.properties,\
+ plugin.xml,\
lib/,\
lib/hsqldb.jar
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/fragment.properties b/plugins/org.eclipse.net4j.db.hsqldb/plugin.properties
index 75b083e..75b083e 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/fragment.properties
+++ b/plugins/org.eclipse.net4j.db.hsqldb/plugin.properties
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/fragment.xml b/plugins/org.eclipse.net4j.db.hsqldb/plugin.xml
index da4c6c9..da4c6c9 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/fragment.xml
+++ b/plugins/org.eclipse.net4j.db.hsqldb/plugin.xml
diff --git a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
index 803db41..1d538dc 100644
--- a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Export-Package: org.eclipse.net4j.db;version="0.8.0",
org.eclipse.net4j.internal.db.ddl;version="0.8.0",
org.eclipse.net4j.internal.db.dml;version="0.8.0"
Eclipse-LazyStart: true
+Eclipse-BuddyPolicy: registered