Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/ProductValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java2
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java1
-rw-r--r--plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java1
-rw-r--r--plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java1
-rw-r--r--plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java1
-rw-r--r--plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java1
-rw-r--r--plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java1
-rw-r--r--plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java1
-rw-r--r--plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java1
-rw-r--r--plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF7
-rw-r--r--plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java3
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java32
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java34
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java49
-rw-r--r--plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF5
-rw-r--r--plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java (renamed from plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/CredentialsDialog.java)3
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java (renamed from plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/InteractiveCredentialsProvider.java)3
43 files changed, 169 insertions, 49 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
index 040281bb6b..d67ba767a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
@@ -11,4 +11,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Export-Package: org.eclipse.emf.cdo.tests.model1;version="2.0.0",
org.eclipse.emf.cdo.tests.model1.impl;version="2.0.0",
- org.eclipse.emf.cdo.tests.model1.util;version="2.0.0"
+ org.eclipse.emf.cdo.tests.model1.util;version="2.0.0",
+ org.eclipse.emf.cdo.tests.model1.validation;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java
index e141d1eef4..db9de9cb9d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java
@@ -11,6 +11,8 @@ package org.eclipse.emf.cdo.tests.model1.validation;
* and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
* illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface AddressValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java
index e6d86a3858..f632d70a08 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java
@@ -16,6 +16,8 @@ import org.eclipse.emf.common.util.EList;
* and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
* illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface CategoryValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java
index b42cb4aa2d..7d1232c2fa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.common.util.EList;
* and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
* illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface CompanyValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java
index db2cefa06f..84d1be5080 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java
@@ -15,6 +15,8 @@ import org.eclipse.emf.common.util.EList;
* and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
* illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface CustomerValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java
index b8ec396cd6..f233f11d4e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java
@@ -14,6 +14,8 @@ import org.eclipse.emf.cdo.tests.model1.Product;
* anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
* plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface OrderDetailValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java
index 894d386cf2..aad2d30fa1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java
@@ -15,6 +15,8 @@ import org.eclipse.emf.common.util.EList;
* it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
* illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface OrderValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/ProductValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/ProductValidator.java
index 6fd1af6373..70154070fa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/ProductValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/ProductValidator.java
@@ -15,6 +15,8 @@ import org.eclipse.emf.common.util.EList;
* and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
* illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface ProductValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java
index 847e92390b..28f25a5847 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java
@@ -15,6 +15,8 @@ import java.util.Date;
* anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
* plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface PurchaseOrderValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java
index 2281023b35..c75a0e2483 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java
@@ -13,6 +13,8 @@ import org.eclipse.emf.cdo.tests.model1.Customer;
* anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
* plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface SalesOrderValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java
index ff0965911d..afa14d803f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java
@@ -15,6 +15,8 @@ import org.eclipse.emf.common.util.EList;
* and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
* illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
* -Dorg.eclipse.emf.examples.generator.validator=false.
+ *
+ * @since 2.0
*/
public interface SupplierValidator
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index b458fefd1b..0fe4e669f0 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -13,7 +13,6 @@ package org.eclipse.emf.cdo.internal.ui.bundle;
import org.eclipse.emf.cdo.ui.CDOLabelProvider;
import org.eclipse.net4j.Net4jTransportInjector;
-import org.eclipse.net4j.util.internal.ui.security.InteractiveCredentialsProvider;
import org.eclipse.net4j.util.om.OMBundle;
import org.eclipse.net4j.util.om.OMPlatform;
import org.eclipse.net4j.util.om.log.OMLogger;
@@ -22,6 +21,7 @@ import org.eclipse.net4j.util.om.pref.OMPreferences;
import org.eclipse.net4j.util.om.trace.OMTracer;
import org.eclipse.net4j.util.security.ResponseNegotiator;
import org.eclipse.net4j.util.ui.UIActivator;
+import org.eclipse.net4j.util.ui.security.InteractiveCredentialsProvider;
/**
* The <em>Operations & Maintenance</em> class of this bundle.
diff --git a/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
index 59925f9636..8f5d17ba71 100644
--- a/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.chat.ui/META-INF/MANIFEST.MF
@@ -11,5 +11,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.buddies.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.net4j.buddies.chat;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.buddies.chat.internal.ui;version="2.0.0"
+Export-Package: org.eclipse.net4j.buddies.chat.internal.ui;version="2.0.0",
+ org.eclipse.net4j.buddies.chat.internal.ui.bundle;version="2.0.0";x-internal:=true
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
index 7b87ecb1e0..75bac7ea08 100644
--- a/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.chat/META-INF/MANIFEST.MF
@@ -11,5 +11,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.buddies.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Export-Package: org.eclipse.net4j.buddies.chat;version="2.0.0",
- org.eclipse.net4j.buddies.internal.chat;version="2.0.0"
+ org.eclipse.net4j.buddies.internal.chat;version="2.0.0",
+ org.eclipse.net4j.buddies.internal.chat.bundle;version="2.0.0";x-internal:=true
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
index 6a5448e048..eb4e2e489a 100644
--- a/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.server/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
org.eclipse.net4j.buddies.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Export-Package: org.eclipse.net4j.buddies.internal.server;version="2.0.0",
+ org.eclipse.net4j.buddies.internal.server.bundle;version="2.0.0";x-internal:=true,
org.eclipse.net4j.buddies.internal.server.protocol;version="2.0.0",
org.eclipse.net4j.buddies.server;version="2.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
index a8f1beedf4..687c1091ec 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.buddies.ui/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.buddies.chat;bundle-version="[2.0.0,3.0.0)";resolution:=optional
Export-Package: org.eclipse.net4j.buddies.internal.ui;version="2.0.0",
org.eclipse.net4j.buddies.internal.ui.actions;version="2.0.0",
+ org.eclipse.net4j.buddies.internal.ui.bundle;version="2.0.0";x-internal:=true,
org.eclipse.net4j.buddies.internal.ui.dnd;version="2.0.0",
org.eclipse.net4j.buddies.internal.ui.preferences;version="2.0.0",
org.eclipse.net4j.buddies.internal.ui.views;version="2.0.0",
diff --git a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
index b1a46378dd..2ffd8de96c 100644
--- a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
@@ -18,4 +18,5 @@ Import-Package: com.mysql.jdbc,
com.mysql.jdbc.jdbc2.optional,
org.apache.derby.jdbc,
org.hsqldb.jdbc
-Export-Package: org.eclipse.net4j.db.tests;version="2.0.0"
+Export-Package: org.eclipse.net4j.db.tests;version="2.0.0",
+ org.eclipse.net4j.db.tests.bundle;version="2.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
index 6b99f33f2a..39987f3af5 100644
--- a/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.debug/META-INF/MANIFEST.MF
@@ -11,3 +11,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.util.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.net4j.internal.debug;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.debug.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.debug.views;version="2.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
index cf813513c0..827fa5d2b4 100644
--- a/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples/META-INF/MANIFEST.MF
@@ -12,3 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resoluti
org.eclipse.net4j.tcp;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.net4j.jvm;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.net4j.examples.echo;version="2.0.0",
+ org.eclipse.net4j.examples.echo.client;version="2.0.0",
+ org.eclipse.net4j.examples.echo.server;version="2.0.0",
+ org.eclipse.net4j.internal.examples.bundle;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java
index 87a2dbb5cf..e102f1e92f 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java
@@ -12,6 +12,7 @@ package org.eclipse.net4j.examples.echo;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public interface EchoProtocol
{
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java
index 8aadcb3c94..9ad2f613d5 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java
@@ -24,6 +24,7 @@ import org.eclipse.net4j.util.om.trace.PrintTraceHandler;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public class EchoClient
{
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
index 878b240e59..3316f8eee0 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClientProtocol.java
@@ -18,6 +18,7 @@ import org.eclipse.net4j.util.factory.ProductCreationException;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public class EchoClientProtocol extends SignalProtocol implements EchoProtocol
{
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java
index f31af6af8b..ef1fe2a6d9 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoRequest.java
@@ -20,6 +20,7 @@ import java.io.IOException;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public class EchoRequest extends RequestWithConfirmation<String> implements EchoProtocol
{
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java
index f9748bc9fd..a7685dbcba 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoIndication.java
@@ -19,6 +19,7 @@ import java.io.IOException;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public class EchoIndication extends IndicationWithResponse implements EchoProtocol
{
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java
index 759ac5e100..75989910cc 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java
@@ -23,6 +23,7 @@ import org.eclipse.net4j.util.om.trace.PrintTraceHandler;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public class EchoServer
{
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
index 4c7cef67e5..e74fa12fc9 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServerProtocol.java
@@ -18,6 +18,7 @@ import org.eclipse.net4j.util.factory.ProductCreationException;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public class EchoServerProtocol extends SignalProtocol implements EchoProtocol
{
diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java
index 312e094416..2ccd5f15ab 100644
--- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/internal/examples/bundle/OM.java
@@ -20,6 +20,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer;
* The <em>Operations & Maintenance</em> class of this bundle.
*
* @author Eike Stepper
+ * @since 2.0
*/
public abstract class OM
{
diff --git a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
index 0c3538bcc5..51ee2b64ad 100644
--- a/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.admin/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.jms;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Export-Package: org.eclipse.net4j.jms.admin;version="2.0.0",
- org.eclipse.net4j.jms.internal.admin;version="2.0.0",
- org.eclipse.net4j.jms.internal.admin.protocol;version="2.0.0"
+ org.eclipse.net4j.jms.internal.admin;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.jms.internal.admin.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.jms.internal.admin.protocol;version="2.0.0";x-internal:=true
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
index 91bbd332cd..95fcd81112 100644
--- a/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.api/META-INF/MANIFEST.MF
@@ -7,4 +7,9 @@ Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: lib/jms.jar
-Export-Package: javax.jms;version="1.1.0"
+Export-Package: com.sun.messaging;x-internal:=true,
+ com.sun.messaging.jmq;x-internal:=true,
+ com.sun.messaging.jmq.resources;x-internal:=true,
+ com.sun.messaging.jmq.util;x-internal:=true,
+ com.sun.messaging.jms;x-internal:=true,
+ javax.jms;version="1.1.0"
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
index d9ca2b7345..ab01b7fe5d 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/META-INF/MANIFEST.MF
@@ -13,5 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.jms.server;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.net4j.db;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Import-Package: javax.jms;version="1.1.0"
-Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="2.0.0",
+Export-Package: org.eclipse.net4j.jms.server.internal.jdbc;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.jms.server.internal.jdbc.bundle;version="2.0.0";x-internal:=true,
org.eclipse.net4j.jms.server.jdbc;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
index 1cc4e42544..678ebf4c85 100644
--- a/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.server/META-INF/MANIFEST.MF
@@ -12,8 +12,9 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.jms;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Import-Package: javax.jms;version="1.1.0"
-Export-Package: org.eclipse.net4j.jms.internal.server;version="2.0.0",
- org.eclipse.net4j.jms.internal.server.protocol;version="2.0.0",
- org.eclipse.net4j.jms.internal.server.protocol.admin;version="2.0.0",
- org.eclipse.net4j.jms.internal.server.store;version="2.0.0",
+Export-Package: org.eclipse.net4j.jms.internal.server;version="2.0.0";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.internal.server.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.jms.internal.server.protocol;version="2.0.0";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.internal.server.protocol.admin;version="2.0.0";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
+ org.eclipse.net4j.jms.internal.server.store;version="2.0.0";x-friends:="org.eclipse.net4j.jms.server.jdbc,org.eclipse.net4j.jms.tests",
org.eclipse.net4j.jms.server;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
index f7d71e0d78..aa4b795705 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.channel.IChannel;
import org.eclipse.net4j.internal.jms.MessageImpl;
import org.eclipse.net4j.jms.internal.server.bundle.OM;
import org.eclipse.net4j.jms.internal.server.protocol.JMSServerMessageRequest;
+import org.eclipse.net4j.jms.server.IServerConsumer;
import org.eclipse.net4j.jms.server.IStoreTransaction;
import org.eclipse.net4j.util.io.IOUtil;
@@ -23,7 +24,7 @@ import java.util.concurrent.ConcurrentMap;
/**
* @author Eike Stepper
*/
-public class ServerConsumer
+public class ServerConsumer implements IServerConsumer
{
private ServerSession session;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
index 8f84e2025a..9f3447608c 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
@@ -14,9 +14,13 @@ import org.eclipse.net4j.internal.jms.MessageImpl;
import org.eclipse.net4j.jms.internal.server.ServerConsumer;
import org.eclipse.net4j.jms.internal.server.ServerDestination;
import org.eclipse.net4j.jms.internal.server.bundle.OM;
+import org.eclipse.net4j.jms.server.IDestination;
+import org.eclipse.net4j.jms.server.IServerConsumer;
import org.eclipse.net4j.jms.server.IStoreTransaction;
import org.eclipse.net4j.util.om.trace.ContextTracer;
+import javax.jms.Message;
+
/**
* @author Eike Stepper
*/
@@ -104,98 +108,98 @@ public abstract class AbstractTransaction implements IStoreTransaction
return consumer;
}
- public void destinationAdded(ServerDestination destination)
+ public void destinationAdded(IDestination destination)
{
if (TRACER.isEnabled())
{
TRACER.trace("Adding destination " + destination);
}
- doDestinationAdded(destination);
+ doDestinationAdded((ServerDestination)destination);
if (TRACER.isEnabled())
{
TRACER.trace("Added destination " + destination);
}
}
- public void destinationRemoved(ServerDestination destination)
+ public void destinationRemoved(IDestination destination)
{
if (TRACER.isEnabled())
{
TRACER.trace("Removing destination " + destination);
}
- doDestinationRemoved(destination);
+ doDestinationRemoved((ServerDestination)destination);
if (TRACER.isEnabled())
{
TRACER.trace("Removed destination " + destination);
}
}
- public void consumerAdded(ServerConsumer consumer)
+ public void consumerAdded(IServerConsumer consumer)
{
if (TRACER.isEnabled())
{
TRACER.trace("Adding consumer " + consumer);
}
- doConsumerAdded(consumer);
+ doConsumerAdded((ServerConsumer)consumer);
if (TRACER.isEnabled())
{
TRACER.trace("Added consumer " + consumer);
}
}
- public void consumerRemoved(ServerConsumer consumer)
+ public void consumerRemoved(IServerConsumer consumer)
{
if (TRACER.isEnabled())
{
TRACER.trace("Removing consumer " + consumer);
}
- doConsumerRemoved(consumer);
+ doConsumerRemoved((ServerConsumer)consumer);
if (TRACER.isEnabled())
{
TRACER.trace("Removed consumer " + consumer);
}
}
- public void messageReceived(MessageImpl message)
+ public void messageReceived(Message message)
{
if (TRACER.isEnabled())
{
TRACER.trace("Logging received message " + message);
}
- doMessageReceived(message);
+ doMessageReceived((MessageImpl)message);
if (TRACER.isEnabled())
{
TRACER.trace("Logged received message " + message);
}
}
- public void messageSent(MessageImpl message, long consumerID)
+ public void messageSent(Message message, long consumerID)
{
if (TRACER.isEnabled())
{
TRACER.trace("Logging sent message " + message);
}
- doMessageSent(message, consumerID);
+ doMessageSent((MessageImpl)message, consumerID);
if (TRACER.isEnabled())
{
TRACER.trace("Logged sent message " + message);
}
}
- public void messageAcknowledged(MessageImpl message, long consumerID)
+ public void messageAcknowledged(Message message, long consumerID)
{
if (TRACER.isEnabled())
{
TRACER.trace("Logging acknowledged message " + message);
}
- doMessageAcknowledged(message, consumerID);
+ doMessageAcknowledged((MessageImpl)message, consumerID);
if (TRACER.isEnabled())
{
TRACER.trace("Logged acknowledged message " + message);
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
new file mode 100644
index 0000000000..a2c0aeb079
--- /dev/null
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IServerConsumer.java
@@ -0,0 +1,34 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.jms.server;
+
+import org.eclipse.net4j.channel.IChannel;
+
+/**
+ * @author Eike Stepper
+ * @since 2.0
+ */
+public interface IServerConsumer
+{
+ public long getID();
+
+ public IDestination getDestination();
+
+ public String getMessageSelector();
+
+ public ISession getSession();
+
+ public IChannel getChannel();
+
+ public boolean isNoLocal();
+
+ public boolean isDurable();
+}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
index 767c52431f..46a6bc1e4a 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/server/IStoreTransaction.java
@@ -10,9 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.jms.server;
-import org.eclipse.net4j.internal.jms.MessageImpl;
-import org.eclipse.net4j.jms.internal.server.ServerConsumer;
-import org.eclipse.net4j.jms.internal.server.ServerDestination;
+import javax.jms.Message;
/**
* @author Eike Stepper
@@ -21,23 +19,50 @@ public interface IStoreTransaction
{
public String[] getDestinationNames();
- public ServerDestination getDestination(String name);
+ /**
+ * @since 2.0
+ */
+ public IDestination getDestination(String name);
public long[] getConsumerIDs();
- public ServerConsumer getConsumer(long id);
+ /**
+ * @since 2.0
+ */
+ public IServerConsumer getConsumer(long id);
- public void destinationAdded(ServerDestination destination);
+ /**
+ * @since 2.0
+ */
+ public void destinationAdded(IDestination destination);
- public void destinationRemoved(ServerDestination destination);
+ /**
+ * @since 2.0
+ */
+ public void destinationRemoved(IDestination destination);
- public void consumerAdded(ServerConsumer consumer);
+ /**
+ * @since 2.0
+ */
+ public void consumerAdded(IServerConsumer consumer);
- public void consumerRemoved(ServerConsumer consumer);
+ /**
+ * @since 2.0
+ */
+ public void consumerRemoved(IServerConsumer consumer);
- public void messageReceived(MessageImpl message);
+ /**
+ * @since 2.0
+ */
+ public void messageReceived(Message message);
- public void messageSent(MessageImpl message, long consumerID);
+ /**
+ * @since 2.0
+ */
+ public void messageSent(Message message, long consumerID);
- public void messageAcknowledged(MessageImpl message, long consumerID);
+ /**
+ * @since 2.0
+ */
+ public void messageAcknowledged(Message message, long consumerID);
}
diff --git a/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
index 90d95199d7..315b12b7e6 100644
--- a/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms.tests/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.jms.server;bundle-version="[2.0.0,3.0.0)",
org.eclipse.net4j.jms.server.jdbc;bundle-version="[2.0.0,3.0.0)"
Import-Package: javax.jms;version="1.1.0"
+Export-Package: org.eclipse.net4j.jms.tests;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
index d64d388725..74c5844412 100644
--- a/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.jms/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Import-Package: javax.jms;version="1.1.0"
Export-Package: org.eclipse.net4j.internal.jms;version="2.0.0",
+ org.eclipse.net4j.internal.jms.bundle;version="2.0.0";x-internal:=true,
org.eclipse.net4j.internal.jms.protocol;version="2.0.0",
org.eclipse.net4j.internal.jms.util;version="2.0.0",
org.eclipse.net4j.jms;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
index b2258482a9..6b81dfefaa 100644
--- a/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.tests/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j.jvm;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.junit;bundle-version="[3.8.0,4.0.0)";visibility:=reexport
Export-Package: org.eclipse.net4j.tests;version="2.0.0",
+ org.eclipse.net4j.tests.bundle;version="2.0.0";x-internal:=true,
org.eclipse.net4j.tests.signal;version="2.0.0",
org.eclipse.net4j.util.tests;version="2.0.0",
org.eclipse.net4j.util.tests.cache;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
index f61e71fa78..7235d8e1b0 100644
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
@@ -12,5 +12,6 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.net4j.util.ui;bundle-version="[1.0.0,3.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.internal.ui;version="2.0.0",
- org.eclipse.net4j.internal.ui.views;version="2.0.0"
+Export-Package: org.eclipse.net4j.internal.ui;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.ui.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.internal.ui.views;version="2.0.0";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
index ab4ec8ac64..39f93599fb 100644
--- a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
@@ -12,14 +12,15 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
org.eclipse.net4j.util;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.util.internal.ui;version="2.0.0",
- org.eclipse.net4j.util.internal.ui.actions;version="2.0.0",
- org.eclipse.net4j.util.internal.ui.security;version="2.0.0",
- org.eclipse.net4j.util.internal.ui.views;version="2.0.0",
+Export-Package: org.eclipse.net4j.util.internal.ui;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.actions;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.bundle;version="2.0.0";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.views;version="2.0.0";x-internal:=true,
org.eclipse.net4j.util.ui;version="2.0.0",
org.eclipse.net4j.util.ui.actions;version="2.0.0",
org.eclipse.net4j.util.ui.dnd;version="2.0.0",
org.eclipse.net4j.util.ui.prefs;version="2.0.0",
org.eclipse.net4j.util.ui.proposals;version="2.0.0",
+ org.eclipse.net4j.util.ui.security;version="2.0.0",
org.eclipse.net4j.util.ui.views;version="2.0.0",
org.eclipse.net4j.util.ui.widgets;version="2.0.0"
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
index 055dfced0b..219c01f823 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.util.ui;
-import org.eclipse.net4j.util.internal.ui.security.InteractiveCredentialsProvider;
import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
+import org.eclipse.net4j.util.ui.security.InteractiveCredentialsProvider;
import org.eclipse.jface.fieldassist.FieldDecoration;
import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/CredentialsDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java
index a192ba4835..80118bb1e9 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/CredentialsDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/CredentialsDialog.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.internal.ui.security;
+package org.eclipse.net4j.util.ui.security;
import org.eclipse.net4j.util.internal.ui.bundle.OM;
import org.eclipse.net4j.util.security.IPasswordCredentials;
@@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.Text;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public class CredentialsDialog extends BaseDialog<Viewer>
{
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/InteractiveCredentialsProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java
index 992093b098..17a29f80e2 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/security/InteractiveCredentialsProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/security/InteractiveCredentialsProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.internal.ui.security;
+package org.eclipse.net4j.util.ui.security;
import org.eclipse.net4j.util.security.IPasswordCredentials;
import org.eclipse.net4j.util.security.IPasswordCredentialsProvider;
@@ -19,6 +19,7 @@ import org.eclipse.swt.widgets.Shell;
/**
* @author Eike Stepper
+ * @since 2.0
*/
public class InteractiveCredentialsProvider implements IPasswordCredentialsProvider
{

Back to the top