Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2018-09-21 12:08:57 -0400
committerEike Stepper2018-09-21 12:08:57 -0400
commit02f0ed70b2408cd56c193cd48626297672210a80 (patch)
tree6a4c3138f5af8fc065d77a0d852d4a4ca0d3d4ec
parente9d92e913be6076e6093270974f1b7c2c02be11e (diff)
downloadcdo-02f0ed70b2408cd56c193cd48626297672210a80.tar.gz
cdo-02f0ed70b2408cd56c193cd48626297672210a80.tar.xz
cdo-02f0ed70b2408cd56c193cd48626297672210a80.zip
[Releng] Fix warnings
-rw-r--r--features/org.eclipse.emf.cdo.examples-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.examples-feature/pom.xml2
-rw-r--r--features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.examples-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.examples-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.examples.installer-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.examples.installer-feature/pom.xml2
-rw-r--r--features/org.eclipse.net4j.sdk-feature/feature.xml2
-rw-r--r--features/org.eclipse.net4j.sdk-feature/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/.settings/.api_filters12
-rw-r--r--plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF68
-rw-r--r--plugins/org.eclipse.emf.cdo.common/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOClassInfo.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ObjectExistsConverter.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db4o/.settings/.api_filters19
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionLocksChangedEvent.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSessionInvalidationEvent.java2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.examples.installer/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.http.common/.settings/.api_filters11
-rw-r--r--plugins/org.eclipse.net4j.jvm/.settings/.api_filters32
-rw-r--r--plugins/org.eclipse.net4j.tcp/.settings/.api_filters41
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/aop_libs/aop.jarbin5040 -> 5040 bytes
-rw-r--r--plugins/org.eclipse.net4j.trace.aspectj/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j/.settings/.api_filters27
-rw-r--r--plugins/org.eclipse.net4j/META-INF/MANIFEST.MF32
-rw-r--r--plugins/org.eclipse.net4j/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/InternalBuffer.java1
39 files changed, 146 insertions, 156 deletions
diff --git a/features/org.eclipse.emf.cdo.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
index 0348c52449..1de9f8657b 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.examples"
label="%featureName"
- version="4.3.0.qualifier"
+ version="4.3.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.examples-feature/pom.xml b/features/org.eclipse.emf.cdo.examples-feature/pom.xml
index 2fef8a4efc..9c89c97ab4 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.examples-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.examples</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.3.100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml b/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
index e466c1cd7f..a8dc5dc376 100644
--- a/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.examples.installer"
label="%featureName"
- version="4.2.500.qualifier"
+ version="4.2.600.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml b/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
index e3859b6b66..d5734ddf6d 100644
--- a/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.examples.installer</artifactId>
- <version>4.2.500-SNAPSHOT</version>
+ <version>4.2.600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml
index 6f40db799f..c2c6ef0804 100644
--- a/features/org.eclipse.net4j-feature/feature.xml
+++ b/features/org.eclipse.net4j-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j"
label="%featureName"
- version="4.7.0.qualifier"
+ version="4.7.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j-feature/pom.xml b/features/org.eclipse.net4j-feature/pom.xml
index 80e2745a34..482dc27c2b 100644
--- a/features/org.eclipse.net4j-feature/pom.xml
+++ b/features/org.eclipse.net4j-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j</artifactId>
- <version>4.7.0-SNAPSHOT</version>
+ <version>4.7.100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.examples-feature/feature.xml b/features/org.eclipse.net4j.examples-feature/feature.xml
index 90871e3679..b1769d2d0c 100644
--- a/features/org.eclipse.net4j.examples-feature/feature.xml
+++ b/features/org.eclipse.net4j.examples-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.examples"
label="%featureName"
- version="4.2.500.qualifier"
+ version="4.2.600.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.examples-feature/pom.xml b/features/org.eclipse.net4j.examples-feature/pom.xml
index f800817d9e..420215c6b1 100644
--- a/features/org.eclipse.net4j.examples-feature/pom.xml
+++ b/features/org.eclipse.net4j.examples-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.examples</artifactId>
- <version>4.2.500-SNAPSHOT</version>
+ <version>4.2.600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.examples.installer-feature/feature.xml b/features/org.eclipse.net4j.examples.installer-feature/feature.xml
index d07d827680..869f33544c 100644
--- a/features/org.eclipse.net4j.examples.installer-feature/feature.xml
+++ b/features/org.eclipse.net4j.examples.installer-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.examples.installer"
label="%featureName"
- version="4.2.500.qualifier"
+ version="4.2.600.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.examples.installer-feature/pom.xml b/features/org.eclipse.net4j.examples.installer-feature/pom.xml
index a9dcb4f874..ba386bd5e1 100644
--- a/features/org.eclipse.net4j.examples.installer-feature/pom.xml
+++ b/features/org.eclipse.net4j.examples.installer-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.examples.installer</artifactId>
- <version>4.2.500-SNAPSHOT</version>
+ <version>4.2.600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml
index aa8ac68352..73823c1ca6 100644
--- a/features/org.eclipse.net4j.sdk-feature/feature.xml
+++ b/features/org.eclipse.net4j.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.net4j.sdk"
label="%featureName"
- version="4.7.0.qualifier"
+ version="4.7.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.sdk-feature/pom.xml b/features/org.eclipse.net4j.sdk-feature/pom.xml
index 77651a635f..a12b56883a 100644
--- a/features/org.eclipse.net4j.sdk-feature/pom.xml
+++ b/features/org.eclipse.net4j.sdk-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.net4j.sdk</artifactId>
- <version>4.7.0-SNAPSHOT</version>
+ <version>4.7.100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
index f8933ad1db..c6834ca82c 100644
--- a/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
@@ -262,6 +262,12 @@
<message_argument value="CDORawReplicationContext"/>
</message_arguments>
</filter>
+ <filter id="576782386">
+ <message_arguments>
+ <message_argument value="CDOReplicationInfo"/>
+ <message_argument value="CDORawReplicationContext"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="src/org/eclipse/emf/cdo/spi/common/admin/AbstractCDOAdmin.java" type="org.eclipse.emf.cdo.spi.common.admin.AbstractCDOAdmin">
<filter id="576725006">
@@ -382,5 +388,11 @@
<message_argument value="InternalCDOList"/>
</message_arguments>
</filter>
+ <filter id="576782386">
+ <message_arguments>
+ <message_argument value="CDOList"/>
+ <message_argument value="InternalCDOList"/>
+ </message_arguments>
+ </filter>
</resource>
</component>
diff --git a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
index b6c409399a..5ea7b064df 100644
--- a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.common;singleton:=true
-Bundle-Version: 4.7.0.qualifier
+Bundle-Version: 4.7.100.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,21 +15,21 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibili
org.eclipse.emf.ecore.change;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.common;version="4.7.0",
- org.eclipse.emf.cdo.common.admin;version="4.7.0",
- org.eclipse.emf.cdo.common.branch;version="4.7.0",
- org.eclipse.emf.cdo.common.commit;version="4.7.0",
- org.eclipse.emf.cdo.common.commit.handler;version="4.7.0",
- org.eclipse.emf.cdo.common.id;version="4.7.0",
- org.eclipse.emf.cdo.common.lob;version="4.7.0",
- org.eclipse.emf.cdo.common.lock;version="4.7.0",
- org.eclipse.emf.cdo.common.model;version="4.7.0",
- org.eclipse.emf.cdo.common.protocol;version="4.7.0",
- org.eclipse.emf.cdo.common.revision;version="4.7.0",
- org.eclipse.emf.cdo.common.revision.delta;version="4.7.0",
- org.eclipse.emf.cdo.common.security;version="4.7.0",
- org.eclipse.emf.cdo.common.util;version="4.7.0",
- org.eclipse.emf.cdo.internal.common;version="4.7.0";
+Export-Package: org.eclipse.emf.cdo.common;version="4.7.100",
+ org.eclipse.emf.cdo.common.admin;version="4.7.100",
+ org.eclipse.emf.cdo.common.branch;version="4.7.100",
+ org.eclipse.emf.cdo.common.commit;version="4.7.100",
+ org.eclipse.emf.cdo.common.commit.handler;version="4.7.100",
+ org.eclipse.emf.cdo.common.id;version="4.7.100",
+ org.eclipse.emf.cdo.common.lob;version="4.7.100",
+ org.eclipse.emf.cdo.common.lock;version="4.7.100",
+ org.eclipse.emf.cdo.common.model;version="4.7.100",
+ org.eclipse.emf.cdo.common.protocol;version="4.7.100",
+ org.eclipse.emf.cdo.common.revision;version="4.7.100",
+ org.eclipse.emf.cdo.common.revision.delta;version="4.7.100",
+ org.eclipse.emf.cdo.common.security;version="4.7.100",
+ org.eclipse.emf.cdo.common.util;version="4.7.100",
+ org.eclipse.emf.cdo.internal.common;version="4.7.100";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -39,11 +39,11 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.7.0",
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.server.hibernate",
- org.eclipse.emf.cdo.internal.common.branch;version="4.7.0";
+ org.eclipse.emf.cdo.internal.common.branch;version="4.7.100";
x-friends:="org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.server.hibernate",
- org.eclipse.emf.cdo.internal.common.bundle;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.commit;version="4.7.0";
+ org.eclipse.emf.cdo.internal.common.bundle;version="4.7.100";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.commit;version="4.7.100";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -52,7 +52,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.7.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.id;version="4.7.0";
+ org.eclipse.emf.cdo.internal.common.id;version="4.7.100";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -63,9 +63,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.7.0",
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.admin,
org.eclipse.emf.cdo.server.admin",
- org.eclipse.emf.cdo.internal.common.lock;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.messages;version="4.7.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.model;version="4.7.0";
+ org.eclipse.emf.cdo.internal.common.lock;version="4.7.100";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.messages;version="4.7.100";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.model;version="4.7.100";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -74,7 +74,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.7.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.revision;version="4.7.0";
+ org.eclipse.emf.cdo.internal.common.revision;version="4.7.100";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -83,7 +83,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.7.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.revision.delta;version="4.7.0";
+ org.eclipse.emf.cdo.internal.common.revision.delta;version="4.7.100";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -92,14 +92,14 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.7.0",
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.spi.common;version="4.7.0",
- org.eclipse.emf.cdo.spi.common.admin;version="4.7.0",
- org.eclipse.emf.cdo.spi.common.branch;version="4.7.0",
- org.eclipse.emf.cdo.spi.common.commit;version="4.7.0",
- org.eclipse.emf.cdo.spi.common.id;version="4.7.0",
- org.eclipse.emf.cdo.spi.common.lock;version="4.7.0",
- org.eclipse.emf.cdo.spi.common.model;version="4.7.0",
- org.eclipse.emf.cdo.spi.common.protocol;version="4.7.0",
- org.eclipse.emf.cdo.spi.common.revision;version="4.7.0"
+ org.eclipse.emf.cdo.spi.common;version="4.7.100",
+ org.eclipse.emf.cdo.spi.common.admin;version="4.7.100",
+ org.eclipse.emf.cdo.spi.common.branch;version="4.7.100",
+ org.eclipse.emf.cdo.spi.common.commit;version="4.7.100",
+ org.eclipse.emf.cdo.spi.common.id;version="4.7.100",
+ org.eclipse.emf.cdo.spi.common.lock;version="4.7.100",
+ org.eclipse.emf.cdo.spi.common.model;version="4.7.100",
+ org.eclipse.emf.cdo.spi.common.protocol;version="4.7.100",
+ org.eclipse.emf.cdo.spi.common.revision;version="4.7.100"
Automatic-Module-Name: org.eclipse.emf.cdo.common
Eclipse-RegisterBuddy: org.eclipse.net4j.util
diff --git a/plugins/org.eclipse.emf.cdo.common/pom.xml b/plugins/org.eclipse.emf.cdo.common/pom.xml
index a82ff3f023..d22fd5b8ca 100644
--- a/plugins/org.eclipse.emf.cdo.common/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.common/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.common</artifactId>
- <version>4.7.0-SNAPSHOT</version>
+ <version>4.7.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java
index 131dd4a79d..b5c15ba631 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java
@@ -78,6 +78,8 @@ public interface CDOCommitHistory extends IContainer<CDOCommitInfo>, CDOBranchPr
* the history is not {@link CDOCommitHistory#isFull() fully} loaded, yet.
*
* @author Eike Stepper
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
*/
public interface TriggerLoadElement extends CDOCommitInfo
{
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOClassInfo.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOClassInfo.java
index 7c9eae2271..81dd45b424 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOClassInfo.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/model/InternalCDOClassInfo.java
@@ -25,6 +25,8 @@ import org.eclipse.emf.ecore.InternalEObject.EStore;
*
* @since 4.2
* @author Eike Stepper
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
*/
public interface InternalCDOClassInfo extends CDOClassInfo
{
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.java
index 3350838670..8f4328f5a4 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDOFeatureDelta.java
@@ -18,6 +18,8 @@ import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
*
* @author Simon McDuff
* @since 3.0
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
*/
public interface InternalCDOFeatureDelta extends CDOFeatureDelta
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
index 6be8bc530a..6d6b19a34d 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.examples.installer;singleton:=true
-Bundle-Version: 4.1.600.qualifier
+Bundle-Version: 4.1.700.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml
index fdc776a0bd..25439f4220 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.examples.installer</artifactId>
- <version>4.1.600-SNAPSHOT</version>
+ <version>4.1.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
index 14ab431690..34961c9275 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
@@ -99,7 +99,6 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
}
}
- @SuppressWarnings("unchecked")
protected Text text(Composite parent, FormToolkit toolkit, String label, EAttribute attribute)
{
toolkit.createLabel(parent, label);
@@ -257,7 +256,6 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
return result;
}
- @SuppressWarnings("unchecked")
protected Button checkbox(Composite parent, FormToolkit toolkit, String label, EAttribute attribute)
{
Button result = toolkit.createButton(createDecorationComposite(parent, toolkit, layoutData(parent, SWT.LEFT, false, 2)), label, SWT.CHECK);
@@ -269,7 +267,6 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
return result;
}
- @SuppressWarnings("unchecked")
protected Button button(Composite parent, FormToolkit toolkit, String label, SelectionListener selectionListener)
{
Button result = toolkit.createButton(parent, label, SWT.PUSH);
@@ -281,7 +278,6 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
return result;
}
- @SuppressWarnings("unchecked")
protected ComboViewer combo(Composite parent, FormToolkit toolkit, String label, EAttribute attribute)
{
toolkit.createLabel(parent, label);
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ObjectExistsConverter.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ObjectExistsConverter.java
index 144692bfb4..6721d7dfa7 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ObjectExistsConverter.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ObjectExistsConverter.java
@@ -22,7 +22,6 @@ import org.eclipse.core.databinding.conversion.Converter;
*
* @author Christian W. Damus (CEA LIST)
*/
-@SuppressWarnings({ "rawtypes", "unchecked" })
public class ObjectExistsConverter extends Converter
{
public ObjectExistsConverter()
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
index 791b8e8656..e9615dd407 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
@@ -149,7 +149,6 @@ public class OneToManyBlock
editorActionBars = actionBars;
}
- @SuppressWarnings("unchecked")
public void createControl(Composite parent, FormToolkit toolkit)
{
final EReference reference = getConfiguration().getModelReference();
diff --git a/plugins/org.eclipse.emf.cdo.server.db4o/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.server.db4o/.settings/.api_filters
deleted file mode 100644
index 012c01f428..0000000000
--- a/plugins/org.eclipse.emf.cdo.server.db4o/.settings/.api_filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.emf.cdo.server.db4o" version="2">
- <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSession">
- <filter id="305422471">
- <message_arguments>
- <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSession"/>
- <message_argument value="org.eclipse.emf.cdo.server.db4o_4.0.400"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration">
- <filter id="305422471">
- <message_arguments>
- <message_argument value="org.eclipse.emf.cdo.server.embedded.CDOSessionConfiguration"/>
- <message_argument value="org.eclipse.emf.cdo.server.db4o_4.0.400"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionLocksChangedEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionLocksChangedEvent.java
index 7181b65554..f48adeff37 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionLocksChangedEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionLocksChangedEvent.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.cdo.view.CDOView;
*
* @author Caspar De Groot
* @since 4.1
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
*/
public interface CDOSessionLocksChangedEvent extends CDOSessionEvent, CDOLockChangeInfo
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSessionInvalidationEvent.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSessionInvalidationEvent.java
index f186a28a49..e766eddfcf 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSessionInvalidationEvent.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSessionInvalidationEvent.java
@@ -16,6 +16,8 @@ import org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent;
/**
* @author Eike Stepper
* @since 4.3
+ * @noextend This interface is not intended to be extended by clients.
+ * @noimplement This interface is not intended to be implemented by clients.
*/
public interface InternalCDOSessionInvalidationEvent extends CDOSessionInvalidationEvent
{
diff --git a/plugins/org.eclipse.net4j.examples.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.examples.installer/META-INF/MANIFEST.MF
index f26c15b555..702c28f554 100644
--- a/plugins/org.eclipse.net4j.examples.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.examples.installer/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j.examples.installer;singleton:=true
-Bundle-Version: 4.1.600.qualifier
+Bundle-Version: 4.1.700.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.net4j.examples.installer/pom.xml b/plugins/org.eclipse.net4j.examples.installer/pom.xml
index 51c6a44517..5765cdcdc0 100644
--- a/plugins/org.eclipse.net4j.examples.installer/pom.xml
+++ b/plugins/org.eclipse.net4j.examples.installer/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j.examples.installer</artifactId>
- <version>4.1.600-SNAPSHOT</version>
+ <version>4.1.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j.http.common/.settings/.api_filters b/plugins/org.eclipse.net4j.http.common/.settings/.api_filters
new file mode 100644
index 0000000000..e852f880b6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.http.common/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.net4j.http.common" version="2">
+ <resource path="src/org/eclipse/net4j/http/common/IHTTPConnector.java" type="org.eclipse.net4j.http.common.IHTTPConnector">
+ <filter id="571473929">
+ <message_arguments>
+ <message_argument value="IConnector"/>
+ <message_argument value="IHTTPConnector"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/plugins/org.eclipse.net4j.jvm/.settings/.api_filters b/plugins/org.eclipse.net4j.jvm/.settings/.api_filters
index cf0f3ecaa3..15052b0959 100644
--- a/plugins/org.eclipse.net4j.jvm/.settings/.api_filters
+++ b/plugins/org.eclipse.net4j.jvm/.settings/.api_filters
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.net4j.jvm" version="2">
- <resource path="src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/jvm/JVMAcceptor.java" type="org.eclipse.net4j.internal.jvm.JVMAcceptor">
<filter id="574619656">
<message_arguments>
@@ -25,9 +22,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java" type="org.eclipse.net4j.internal.jvm.JVMAcceptorFactory">
<filter id="643842064">
<message_arguments>
@@ -44,9 +38,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java" type="org.eclipse.net4j.internal.jvm.JVMAcceptorManager">
<filter id="574619656">
<message_arguments>
@@ -76,9 +67,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java" type="org.eclipse.net4j.internal.jvm.JVMClientConnector">
<filter id="643842064">
<message_arguments>
@@ -88,9 +76,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/jvm/JVMConnector.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/jvm/JVMConnector.java" type="org.eclipse.net4j.internal.jvm.JVMConnector">
<filter id="574619656">
<message_arguments>
@@ -99,9 +84,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java" type="org.eclipse.net4j.internal.jvm.JVMConnectorFactory">
<filter id="643842064">
<message_arguments>
@@ -118,9 +100,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java" type="org.eclipse.net4j.internal.jvm.JVMServerConnector">
<filter id="643842064">
<message_arguments>
@@ -144,9 +123,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/jvm/IJVMChannel.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/jvm/IJVMChannel.java" type="org.eclipse.net4j.jvm.IJVMChannel">
<filter id="571473929">
<message_arguments>
@@ -155,4 +131,12 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/net4j/jvm/IJVMConnector.java" type="org.eclipse.net4j.jvm.IJVMConnector">
+ <filter id="571473929">
+ <message_arguments>
+ <message_argument value="IConnector"/>
+ <message_argument value="IJVMConnector"/>
+ </message_arguments>
+ </filter>
+ </resource>
</component>
diff --git a/plugins/org.eclipse.net4j.tcp/.settings/.api_filters b/plugins/org.eclipse.net4j.tcp/.settings/.api_filters
index 1cc951e636..9b7d074e7c 100644
--- a/plugins/org.eclipse.net4j.tcp/.settings/.api_filters
+++ b/plugins/org.eclipse.net4j.tcp/.settings/.api_filters
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.net4j.tcp" version="2">
- <resource path="src/org/eclipse/net4j/internal/tcp/ControlChannel.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/ControlChannel.java" type="org.eclipse.net4j.internal.tcp.ControlChannel">
<filter id="643842064">
<message_arguments>
@@ -19,9 +16,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java" type="org.eclipse.net4j.internal.tcp.TCPAcceptor">
<filter id="574619656">
<message_arguments>
@@ -50,9 +44,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java" type="org.eclipse.net4j.internal.tcp.TCPAcceptorFactory">
<filter id="643842064">
<message_arguments>
@@ -62,9 +53,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/tcp/TCPConnector.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/TCPConnector.java" type="org.eclipse.net4j.internal.tcp.TCPConnector">
<filter id="574619656">
<message_arguments>
@@ -101,9 +89,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java" type="org.eclipse.net4j.internal.tcp.TCPConnectorFactory">
<filter id="643842064">
<message_arguments>
@@ -113,9 +98,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/tcp/TCPSelector.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/TCPSelector.java" type="org.eclipse.net4j.internal.tcp.TCPSelector">
<filter id="574619656">
<message_arguments>
@@ -124,9 +106,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java" type="org.eclipse.net4j.internal.tcp.TCPSelectorFactory">
<filter id="643842064">
<message_arguments>
@@ -143,9 +122,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java" type="org.eclipse.net4j.internal.tcp.TCPServerConnector">
<filter id="643842064">
<message_arguments>
@@ -162,9 +138,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/tcp/ssl/SSLBuffer.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/ssl/SSLBuffer.java" type="org.eclipse.net4j.internal.tcp.ssl.SSLBuffer">
<filter id="643850349">
<message_arguments>
@@ -174,9 +147,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/tcp/ssl/SSLBufferFactory.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/ssl/SSLBufferFactory.java" type="org.eclipse.net4j.internal.tcp.ssl.SSLBufferFactory">
<filter id="643850349">
<message_arguments>
@@ -186,9 +156,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/net4j/internal/tcp/ssl/SSLServerConnector.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/net4j/internal/tcp/ssl/SSLServerConnector.java" type="org.eclipse.net4j.internal.tcp.ssl.SSLServerConnector">
<filter id="643842064">
<message_arguments>
@@ -205,4 +172,12 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/net4j/tcp/ITCPConnector.java" type="org.eclipse.net4j.tcp.ITCPConnector">
+ <filter id="571473929">
+ <message_arguments>
+ <message_argument value="IConnector"/>
+ <message_argument value="ITCPConnector"/>
+ </message_arguments>
+ </filter>
+ </resource>
</component>
diff --git a/plugins/org.eclipse.net4j.trace.aspectj/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.trace.aspectj/META-INF/MANIFEST.MF
index 8c2f0ed015..385b98e577 100644
--- a/plugins/org.eclipse.net4j.trace.aspectj/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.trace.aspectj/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j.trace.aspectj;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -20,4 +20,4 @@ Eclipse-SupplementBundle: org.eclipse.net4j,
org.eclipse.net4j.jvm,
org.eclipse.net4j.tcp,
org.eclipse.net4j.util
-Export-Package: org.eclipse.net4j.trace.aspectj;version="1.0.0";x-internal:=true
+Export-Package: org.eclipse.net4j.trace.aspectj;version="1.0.100";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.trace.aspectj/aop_libs/aop.jar b/plugins/org.eclipse.net4j.trace.aspectj/aop_libs/aop.jar
index 4c76207e02..5293271fbb 100644
--- a/plugins/org.eclipse.net4j.trace.aspectj/aop_libs/aop.jar
+++ b/plugins/org.eclipse.net4j.trace.aspectj/aop_libs/aop.jar
Binary files differ
diff --git a/plugins/org.eclipse.net4j.trace.aspectj/pom.xml b/plugins/org.eclipse.net4j.trace.aspectj/pom.xml
index 992b477b7a..df96034944 100644
--- a/plugins/org.eclipse.net4j.trace.aspectj/pom.xml
+++ b/plugins/org.eclipse.net4j.trace.aspectj/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j.trace.aspectj</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j/.settings/.api_filters b/plugins/org.eclipse.net4j/.settings/.api_filters
index 14ee494c23..a2d1ab5b6b 100644
--- a/plugins/org.eclipse.net4j/.settings/.api_filters
+++ b/plugins/org.eclipse.net4j/.settings/.api_filters
@@ -61,6 +61,12 @@
<message_argument value="IServerConnector"/>
</message_arguments>
</filter>
+ <filter id="576782386">
+ <message_arguments>
+ <message_argument value="IConnector"/>
+ <message_argument value="IServerConnector"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="src/org/eclipse/net4j/signal/SignalProtocol.java" type="org.eclipse.net4j.signal.SignalProtocol">
<filter id="336658481">
@@ -116,9 +122,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/spi/net4j/ChannelMultiplexer.java">
- <filter id="0"/>
- </resource>
<resource path="src/org/eclipse/spi/net4j/ChannelMultiplexer.java" type="org.eclipse.spi.net4j.ChannelMultiplexer">
<filter id="574668824">
<message_arguments>
@@ -180,6 +183,12 @@
<message_argument value="InternalChannel"/>
</message_arguments>
</filter>
+ <filter id="576782386">
+ <message_arguments>
+ <message_argument value="IChannel"/>
+ <message_argument value="InternalChannel"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="src/org/eclipse/spi/net4j/InternalChannelMultiplexer.java" type="org.eclipse.spi.net4j.InternalChannelMultiplexer">
<filter id="403767336">
@@ -206,6 +215,12 @@
<message_argument value="InternalChannelMultiplexer"/>
</message_arguments>
</filter>
+ <filter id="576782386">
+ <message_arguments>
+ <message_argument value="IChannelMultiplexer"/>
+ <message_argument value="InternalChannelMultiplexer"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="src/org/eclipse/spi/net4j/InternalConnector.java" type="org.eclipse.spi.net4j.InternalConnector">
<filter id="576720909">
@@ -214,5 +229,11 @@
<message_argument value="InternalConnector"/>
</message_arguments>
</filter>
+ <filter id="576782386">
+ <message_arguments>
+ <message_argument value="IConnector"/>
+ <message_argument value="InternalConnector"/>
+ </message_arguments>
+ </filter>
</resource>
</component>
diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
index 161fe04d62..2fe2a2bea0 100644
--- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j;singleton:=true
-Bundle-Version: 4.7.0.qualifier
+Bundle-Version: 4.7.100.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,7 +11,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.internal.net4j;version="4.7.0";
+Export-Package: org.eclipse.internal.net4j;version="4.7.100";
x-friends:="org.eclipse.net4j.http.server,
org.eclipse.net4j.jvm,
org.eclipse.net4j.tcp,
@@ -19,7 +19,7 @@ Export-Package: org.eclipse.internal.net4j;version="4.7.0";
org.eclipse.net4j.http.common,
org.eclipse.net4j.http.tests,
org.eclipse.net4j.tests",
- org.eclipse.internal.net4j.buffer;version="4.7.0";
+ org.eclipse.internal.net4j.buffer;version="4.7.100";
x-friends:="org.eclipse.net4j.http.server,
org.eclipse.net4j.jvm,
org.eclipse.net4j.tcp,
@@ -28,18 +28,18 @@ Export-Package: org.eclipse.internal.net4j;version="4.7.0";
org.eclipse.net4j.http.tests,
org.eclipse.net4j.tests,
org.eclipse.net4j.trace",
- org.eclipse.internal.net4j.bundle;version="4.7.0";x-internal:=true,
- org.eclipse.net4j;version="4.7.0",
- org.eclipse.net4j.acceptor;version="4.7.0",
- org.eclipse.net4j.buffer;version="4.7.0",
- org.eclipse.net4j.channel;version="4.7.0",
- org.eclipse.net4j.connector;version="4.7.0",
- org.eclipse.net4j.protocol;version="4.7.0",
- org.eclipse.net4j.signal;version="4.7.0",
- org.eclipse.net4j.signal.confirmation;version="4.7.0",
- org.eclipse.net4j.signal.heartbeat;version="4.7.0",
- org.eclipse.net4j.signal.security;version="4.7.0",
- org.eclipse.net4j.signal.wrapping;version="4.7.0",
- org.eclipse.spi.net4j;version="4.7.0"
+ org.eclipse.internal.net4j.bundle;version="4.7.100";x-internal:=true,
+ org.eclipse.net4j;version="4.7.100",
+ org.eclipse.net4j.acceptor;version="4.7.100",
+ org.eclipse.net4j.buffer;version="4.7.100",
+ org.eclipse.net4j.channel;version="4.7.100",
+ org.eclipse.net4j.connector;version="4.7.100",
+ org.eclipse.net4j.protocol;version="4.7.100",
+ org.eclipse.net4j.signal;version="4.7.100",
+ org.eclipse.net4j.signal.confirmation;version="4.7.100",
+ org.eclipse.net4j.signal.heartbeat;version="4.7.100",
+ org.eclipse.net4j.signal.security;version="4.7.100",
+ org.eclipse.net4j.signal.wrapping;version="4.7.100",
+ org.eclipse.spi.net4j;version="4.7.100"
Eclipse-BuddyPolicy: registered
Automatic-Module-Name: org.eclipse.net4j
diff --git a/plugins/org.eclipse.net4j/pom.xml b/plugins/org.eclipse.net4j/pom.xml
index 2bf211cede..c6b9b5932e 100644
--- a/plugins/org.eclipse.net4j/pom.xml
+++ b/plugins/org.eclipse.net4j/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j</artifactId>
- <version>4.7.0-SNAPSHOT</version>
+ <version>4.7.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java
index bac4282027..1b859c58be 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java
@@ -29,6 +29,7 @@ import org.eclipse.net4j.util.security.IUserAware;
* connection types have to implement org.eclipse.internal.net4j.connector.InternalConnector.
*
* @author Eike Stepper
+ * @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
*/
public interface IConnector extends IChannelMultiplexer, IUserAware, Closeable
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/InternalBuffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/InternalBuffer.java
index 5bc870e0d7..04e60c0c50 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/InternalBuffer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/spi/net4j/InternalBuffer.java
@@ -17,6 +17,7 @@ import org.eclipse.net4j.buffer.IBufferProvider;
* If the meaning of this type isn't clear, there really should be more of a description here...
*
* @author Eike Stepper
+ * @noextend This interface is not intended to be extended by clients.
* @noimplement This interface is not intended to be implemented by clients.
*/
public interface InternalBuffer extends IBuffer

Back to the top