summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-06-03 06:40:31 (EDT)
committerEike Stepper2008-06-03 06:40:31 (EDT)
commite678f2bb4459ac1500654620a1887d3e32bff7d9 (patch)
tree426b0cf4467f1cb560a28d1df8e126b9e06c3967
parentd88842543e95827f2acbe649465ae4816a864c1d (diff)
downloadcdo-e678f2bb4459ac1500654620a1887d3e32bff7d9.zip
cdo-e678f2bb4459ac1500654620a1887d3e32bff7d9.tar.gz
cdo-e678f2bb4459ac1500654620a1887d3e32bff7d9.tar.bz2
[234041] Prepare graduation
https://bugs.eclipse.org/bugs/show_bug.cgi?id=234041
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF13
-rw-r--r--plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java5
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/HSQLDBAdapter.java6
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/MYSQLAdapter.java5
-rw-r--r--plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java2
-rw-r--r--plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java2
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java4
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java1
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java1
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java (renamed from plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapter.java)4
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBSchema.java (renamed from plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java)6
-rw-r--r--plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java2
-rw-r--r--plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF3
25 files changed, 53 insertions, 40 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
index c616ca8..eb6bc44 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
@@ -13,4 +13,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.db;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.server;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
Export-Package: org.eclipse.emf.cdo.server.db;version="1.0.0",
- org.eclipse.emf.cdo.server.internal.db;version="1.0.0"
+ org.eclipse.emf.cdo.server.internal.db;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.server.internal.db.bundle;version="1.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
index af6bd86..0d3652b 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/CDODBSchema.java
@@ -14,7 +14,7 @@ import org.eclipse.net4j.db.DBType;
import org.eclipse.net4j.db.ddl.IDBField;
import org.eclipse.net4j.db.ddl.IDBIndex;
import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.ddl.DBSchema;
+import org.eclipse.net4j.spi.db.DBSchema;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index bcc787e..43ff0b5 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -27,8 +27,7 @@ import org.eclipse.net4j.db.IDBAdapter;
import org.eclipse.net4j.db.IDBConnectionProvider;
import org.eclipse.net4j.db.ddl.IDBSchema;
import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.DataSourceConnectionProvider;
-import org.eclipse.net4j.internal.db.ddl.DBSchema;
+import org.eclipse.net4j.spi.db.DBSchema;
import org.eclipse.net4j.util.ImplementationError;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
@@ -97,7 +96,7 @@ public class DBStore extends LongIDStore implements IDBStore
public void setDataSource(DataSource dataSource)
{
- dbConnectionProvider = new DataSourceConnectionProvider(dataSource);
+ dbConnectionProvider = DBUtil.createConnectionProvider(dataSource);
}
public synchronized IDBSchema getDBSchema()
diff --git a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
index 49bc8f6..905e8ad 100644
--- a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
org.eclipse.emf.cdo.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
Export-Package: org.eclipse.emf.cdo.internal.server;version="1.0.0",
- org.eclipse.emf.cdo.internal.server.bundle;x-internal:=true,
+ org.eclipse.emf.cdo.internal.server.bundle;version="1.0.0";x-internal:=true,
org.eclipse.emf.cdo.internal.server.protocol;version="1.0.0";x-friends:="org.eclipse.emf.cdo.tests",
org.eclipse.emf.cdo.server;version="1.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
index 24681eb..1702cf4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
@@ -18,11 +18,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.util.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.cdo;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.edit;bundle-version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.internal.ui;version="1.0.0",
- org.eclipse.emf.cdo.internal.ui.actions;version="1.0.0",
- org.eclipse.emf.cdo.internal.ui.dialogs;version="1.0.0",
- org.eclipse.emf.cdo.internal.ui.editor;version="1.0.0",
- org.eclipse.emf.cdo.internal.ui.preferences;version="1.0.0",
- org.eclipse.emf.cdo.internal.ui.views;version="1.0.0",
+Export-Package: org.eclipse.emf.cdo.internal.ui;version="1.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.actions;version="1.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.bundle;version="1.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.dialogs;version="1.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.editor;version="1.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.preferences;version="1.0.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.views;version="1.0.0";x-internal:=true,
org.eclipse.emf.cdo.ui;version="1.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
index 8b54a86..2fa078f 100644
--- a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.db;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.db.internal.derby;version="1.0.0"
+Export-Package: org.eclipse.net4j.db.internal.derby;version="1.0.0";x-friends:="org.eclipse.net4j.db.tests",
+ org.eclipse.net4j.db.internal.derby.bundle;version="1.0.0";x-internal:=true
Eclipse-RegisterBuddy: org.eclipse.net4j.db
Import-Package: org.apache.derby.jdbc
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java
index 4625ce3..a704eca 100644
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java
+++ b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java
@@ -12,8 +12,7 @@ package org.eclipse.net4j.db.internal.derby;
import org.eclipse.net4j.db.DBType;
import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.internal.db.DBAdapter;
-import org.eclipse.net4j.internal.db.ddl.DBField;
+import org.eclipse.net4j.spi.db.DBAdapter;
/**
* @author Eike Stepper
@@ -49,7 +48,7 @@ public abstract class DerbyAdapter extends DBAdapter
}
@Override
- protected String getTypeName(DBField field)
+ protected String getTypeName(IDBField field)
{
DBType type = field.getType();
switch (type)
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 aea30c7..52e1e54 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.db;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
Export-Package: org.eclipse.net4j.db.hsqldb;version="1.0.0",
- org.eclipse.net4j.db.internal.hsqldb;version="1.0.0",
+ org.eclipse.net4j.db.internal.hsqldb;version="1.0.0";x-internal:=true,
+ org.eclipse.net4j.db.internal.hsqldb.bundle;version="1.0.0";x-internal:=true,
org.hsqldb;version="1.8.0",
org.hsqldb.index;version="1.8.0",
org.hsqldb.jdbc;version="1.8.0",
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/HSQLDBAdapter.java b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/HSQLDBAdapter.java
index 1d0faec..cac1147 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/HSQLDBAdapter.java
+++ b/plugins/org.eclipse.net4j.db.hsqldb/src/org/eclipse/net4j/db/internal/hsqldb/HSQLDBAdapter.java
@@ -11,8 +11,8 @@
package org.eclipse.net4j.db.internal.hsqldb;
import org.eclipse.net4j.db.DBType;
-import org.eclipse.net4j.internal.db.DBAdapter;
-import org.eclipse.net4j.internal.db.ddl.DBField;
+import org.eclipse.net4j.db.ddl.IDBField;
+import org.eclipse.net4j.spi.db.DBAdapter;
import org.hsqldb.jdbcDriver;
import org.hsqldb.jdbc.jdbcDataSource;
@@ -46,7 +46,7 @@ public class HSQLDBAdapter extends DBAdapter
}
@Override
- protected String getTypeName(DBField field)
+ protected String getTypeName(IDBField field)
{
DBType type = field.getType();
switch (type)
diff --git a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
index 5a272ec..3da4c68 100644
--- a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
@@ -20,6 +20,7 @@ Export-Package: com.mysql.jdbc;version="5.1.5",
com.mysql.jdbc.log;version="5.1.5",
com.mysql.jdbc.profiler;version="5.1.5",
com.mysql.jdbc.util;version="5.1.5",
- org.eclipse.net4j.db.internal.mysql;version="1.0.0",
+ org.eclipse.net4j.db.internal.mysql;version="1.0.0";x-internal:=true,
+ org.eclipse.net4j.db.internal.mysql.bundle;version="1.0.0";x-internal:=true,
org.gjt.mm.mysql;version="5.1.5"
Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/MYSQLAdapter.java b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/MYSQLAdapter.java
index 47b0367..441381b 100644
--- a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/MYSQLAdapter.java
+++ b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/internal/mysql/MYSQLAdapter.java
@@ -13,8 +13,7 @@ package org.eclipse.net4j.db.internal.mysql;
import org.eclipse.net4j.db.DBException;
import org.eclipse.net4j.db.DBType;
import org.eclipse.net4j.db.ddl.IDBField;
-import org.eclipse.net4j.internal.db.DBAdapter;
-import org.eclipse.net4j.internal.db.ddl.DBField;
+import org.eclipse.net4j.spi.db.DBAdapter;
import com.mysql.jdbc.Driver;
import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
@@ -79,7 +78,7 @@ public class MYSQLAdapter extends DBAdapter
}
@Override
- protected String getTypeName(DBField field)
+ protected String getTypeName(IDBField field)
{
DBType type = field.getType();
switch (type)
diff --git a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java
index 9ed3211..205f1f5 100644
--- a/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java
+++ b/plugins/org.eclipse.net4j.db.tests/src/org/eclipse/net4j/db/tests/TestSchema.java
@@ -4,7 +4,7 @@ import org.eclipse.net4j.db.DBType;
import org.eclipse.net4j.db.ddl.IDBField;
import org.eclipse.net4j.db.ddl.IDBIndex;
import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.ddl.DBSchema;
+import org.eclipse.net4j.spi.db.DBSchema;
public class TestSchema extends DBSchema
{
diff --git a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
index d76aa75..b42fb0d 100644
--- a/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db/META-INF/MANIFEST.MF
@@ -13,9 +13,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
Export-Package: org.eclipse.net4j.db;version="1.0.0",
org.eclipse.net4j.db.ddl;version="1.0.0",
org.eclipse.net4j.db.dml;version="1.0.0",
- org.eclipse.net4j.internal.db;version="1.0.0",
- org.eclipse.net4j.internal.db.bundle;version="1.0.0",
- org.eclipse.net4j.internal.db.ddl;version="1.0.0",
- org.eclipse.net4j.internal.db.dml;version="1.0.0"
+ org.eclipse.net4j.internal.db;version="1.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.db.bundle;version="1.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.db.ddl;version="1.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.db.dml;version="1.0.0";x-internal:=true,
+ org.eclipse.net4j.spi.db;version="1.0.0"
Bundle-ActivationPolicy: lazy
Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
index abbf859..d7d0676 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBUtil.java
@@ -15,7 +15,7 @@ import org.eclipse.net4j.db.ddl.IDBSchema;
import org.eclipse.net4j.db.ddl.IDBTable;
import org.eclipse.net4j.internal.db.DataSourceConnectionProvider;
import org.eclipse.net4j.internal.db.bundle.OM;
-import org.eclipse.net4j.internal.db.ddl.DBSchema;
+import org.eclipse.net4j.spi.db.DBSchema;
import org.eclipse.net4j.util.ReflectUtil;
import org.eclipse.net4j.util.om.trace.ContextTracer;
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java
index e14fe8c..bf0dbf9 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/ddl/IDBField.java
@@ -43,5 +43,9 @@ public interface IDBField extends IDBSchemaElement
public String getFullName();
+ public String formatPrecision();
+
+ public String formatPrecisionAndScale();
+
public void appendValue(StringBuilder builder, Object value);
}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java
index f80e738..9988537 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DataSourceConnectionProvider.java
@@ -10,6 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.internal.db;
+
import org.eclipse.net4j.db.DBException;
import org.eclipse.net4j.db.IDBConnectionProvider;
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java
index 21662f9..dc62b42 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBTable.java
@@ -16,6 +16,7 @@ import org.eclipse.net4j.db.ddl.IDBField;
import org.eclipse.net4j.db.ddl.IDBIndex;
import org.eclipse.net4j.db.ddl.IDBTable;
import org.eclipse.net4j.db.ddl.IDBIndex.Type;
+import org.eclipse.net4j.spi.db.DBSchema;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapter.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
index 58b1f2a..bf98fb2 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapter.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBAdapter.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.internal.db;
+package org.eclipse.net4j.spi.db;
import org.eclipse.net4j.db.DBException;
import org.eclipse.net4j.db.DBType;
@@ -325,7 +325,7 @@ public abstract class DBAdapter implements IDBAdapter
return getTypeName(field) + (field.isNotNull() ? " NOT NULL" : "");
}
- protected String getTypeName(DBField field)
+ protected String getTypeName(IDBField field)
{
DBType type = field.getType();
switch (type)
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBSchema.java
index 93a0a70..7d8dc8f 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/ddl/DBSchema.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/spi/db/DBSchema.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.internal.db.ddl;
+package org.eclipse.net4j.spi.db;
import org.eclipse.net4j.db.DBException;
import org.eclipse.net4j.db.DBUtil;
@@ -17,6 +17,8 @@ import org.eclipse.net4j.db.IDBConnectionProvider;
import org.eclipse.net4j.db.IDBRowHandler;
import org.eclipse.net4j.db.ddl.IDBSchema;
import org.eclipse.net4j.db.ddl.IDBTable;
+import org.eclipse.net4j.internal.db.ddl.DBSchemaElement;
+import org.eclipse.net4j.internal.db.ddl.DBTable;
import javax.sql.DataSource;
@@ -196,7 +198,7 @@ public class DBSchema extends DBSchemaElement implements IDBSchema
}
}
- void assertUnlocked() throws DBException
+ public void assertUnlocked() throws DBException
{
if (locked)
{
diff --git a/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF
index 22564c7..c7fb87a 100644
--- a/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http.common/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
Export-Package: org.eclipse.net4j.http.common;version="1.0.0";uses:="org.eclipse.net4j.connector",
- org.eclipse.net4j.http.internal.common;version="1.0.0",
+ org.eclipse.net4j.http.internal.common;version="1.0.0";x-friends:="org.eclipse.net4j.http,org.eclipse.net4j.http.server,org.eclipse.net4j.http.tests",
org.eclipse.net4j.http.internal.common.bundle;version="1.0.0";x-friends:="org.eclipse.net4j.http,org.eclipse.net4j.http.server,org.eclipse.net4j.http.tests"
diff --git a/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF
index 5662ed7..bd15108 100644
--- a/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http.server/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resoluti
org.eclipse.equinox.http.registry;bundle-version="[1.0.0,2.0.0)"
Import-Package: javax.servlet;version="[2.4.0,3.0.0)",
javax.servlet.http;version="[2.4.0,3.0.0)"
-Export-Package: org.eclipse.net4j.http.internal.server;version="1.0.0",
+Export-Package: org.eclipse.net4j.http.internal.server;version="1.0.0";x-friends:="org.eclipse.net4j.http.tests",
org.eclipse.net4j.http.internal.server.bundle;version="1.0.0";x-internal:=true,
org.eclipse.net4j.http.server;version="1.0.0"
diff --git a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
index 9286df1..87bc52f 100644
--- a/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.http/META-INF/MANIFEST.MF
@@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resoluti
Import-Package: org.apache.commons.httpclient;version="[3.0.0,4.0.0)",
org.apache.commons.httpclient.methods;version="[3.0.0,4.0.0)"
Export-Package: org.eclipse.net4j.http;version="1.0.0",
- org.eclipse.net4j.internal.http;version="1.0.0",
+ org.eclipse.net4j.internal.http;version="1.0.0";x-friends:="org.eclipse.net4j.http.tests",
org.eclipse.net4j.internal.http.bundle;version="1.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
index 5b357e2..518308d 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JMSSchema.java
@@ -14,7 +14,7 @@ import org.eclipse.net4j.db.DBType;
import org.eclipse.net4j.db.ddl.IDBField;
import org.eclipse.net4j.db.ddl.IDBIndex;
import org.eclipse.net4j.db.ddl.IDBTable;
-import org.eclipse.net4j.internal.db.ddl.DBSchema;
+import org.eclipse.net4j.spi.db.DBSchema;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
index 15c30ce..34a133f 100644
--- a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF
@@ -12,5 +12,6 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.jvm;version="1.0.0",
+Export-Package: org.eclipse.net4j.internal.jvm;version="1.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.jvm.bundle;version="1.0.0";x-internal:=true,
org.eclipse.net4j.jvm;version="1.0.0"
diff --git a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
index 6cc530d..fcf8ff3 100644
--- a/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tcp/META-INF/MANIFEST.MF
@@ -12,5 +12,6 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
org.eclipse.net4j;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
Import-Package: org.osgi.framework;version="1.3.0";resolution:=optional
-Export-Package: org.eclipse.net4j.internal.tcp;version="1.0.0",
+Export-Package: org.eclipse.net4j.internal.tcp;version="1.0.0";x-friends:="org.eclipse.net4j.tests",
+ org.eclipse.net4j.internal.tcp.bundle;version="1.0.0";x-internal:=true,
org.eclipse.net4j.tcp;version="1.0.0"