Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2014-04-11 19:17:17 -0400
committerslewis2014-04-11 19:17:17 -0400
commita3e8a7bb05ca0546489d72d5da9337a9581d6e15 (patch)
tree76903120e5672525f3974b9e8269e40cb52df5f6
parenteb2f9dd129ad0bc1dfb6b50cdf870160a0cc2eb6 (diff)
downloadorg.eclipse.ecf-a3e8a7bb05ca0546489d72d5da9337a9581d6e15.tar.gz
org.eclipse.ecf-a3e8a7bb05ca0546489d72d5da9337a9581d6e15.tar.xz
org.eclipse.ecf-a3e8a7bb05ca0546489d72d5da9337a9581d6e15.zip
updates and fixes to hello example remote service applications
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/META-INF/MANIFEST.MF2
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF2
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/HelloConsumerApplication.java17
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator$HelloTrackerCustomizer$1.classbin2093 -> 0 bytes
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator$HelloTrackerCustomizer.classbin6375 -> 0 bytes
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator.classbin2461 -> 0 bytes
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/src/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator.java20
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/META-INF/MANIFEST.MF2
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/src/org/eclipse/ecf/examples/internal/remoteservices/hello/ds/consumer/HelloClientComponent.java11
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/META-INF/MANIFEST.MF4
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/OSGI-INF/hello.xml2
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/products/Hello Service DS Host (zeroconf,generic).product32
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF4
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/META-INF/MANIFEST.MF4
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/src/org/eclipse/ecf/examples/remoteservices/hello/IHelloAsync.java12
-rw-r--r--releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml16
16 files changed, 75 insertions, 53 deletions
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/META-INF/MANIFEST.MF
index 7d26f3354..4c89d6eda 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer.rs/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Bundle-ActivationPolicy: lazy
Bundle-Localization: bundle
Import-Package: org.eclipse.ecf.core,
org.eclipse.ecf.core.identity;version="3.0.0",
- org.eclipse.ecf.examples.remoteservices.hello;version="3.0.0",
+ org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0",
org.eclipse.ecf.remoteservice,
org.eclipse.ecf.remoteservice.asyncproxy;version="1.0.0",
org.eclipse.ecf.remoteservice.events,
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF
index 7a9e3b753..2ff8655aa 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5,
CDC-1.1/Foundation-1.1
Import-Package: org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.core.identity;version="3.0.0",
- org.eclipse.ecf.examples.remoteservices.hello;version="3.0.0",
+ org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0",
org.eclipse.ecf.osgi.services.distribution;version="1.0.0",
org.eclipse.ecf.remoteservice,
org.eclipse.ecf.remoteservice.events,
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/HelloConsumerApplication.java b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/HelloConsumerApplication.java
index bc8fe36ff..d6ae77818 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/HelloConsumerApplication.java
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/HelloConsumerApplication.java
@@ -10,6 +10,9 @@
*****************************************************************************/
package org.eclipse.ecf.internal.examples.remoteservices.hello.consumer;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.ecf.core.IContainerFactory;
@@ -184,7 +187,7 @@ public class HelloConsumerApplication implements IApplication,
// Call asynchronously with future
System.out.println("STARTING async remote call via future...");
- IFuture future = helloA.helloAsync(CONSUMER_NAME + " via async proxy with future");
+ Future<String> future = helloA.helloAsync(CONSUMER_NAME + " via async proxy with future");
System.out.println("LOCAL async future invocation complete");
System.out.println();
try {
@@ -194,7 +197,7 @@ public class HelloConsumerApplication implements IApplication,
Thread.sleep(200);
}
// Now it's done, so this will not block
- Object result = future.get();
+ String result = future.get();
System.out.println("COMPLETED remote call with future SUCCEEDED with result="+result);
System.out.println();
} catch (OperationCanceledException e) {
@@ -205,6 +208,10 @@ public class HelloConsumerApplication implements IApplication,
System.out.println("COMPLETED remote call with callback INTERRUPTED with exception="+e);
System.out.println();
e.printStackTrace();
+ } catch (ExecutionException e) {
+ System.out.println("COMPLETED remote call with callback INTERRUPTED with exception="+e);
+ System.out.println();
+ e.printStackTrace();
}
// Call other helloMessage method
@@ -226,7 +233,7 @@ public class HelloConsumerApplication implements IApplication,
Thread.sleep(200);
}
// Now it's done, so this will not block
- Object result = future.get();
+ String result = future.get();
System.out.println("COMPLETED remote call with future SUCCEEDED with result="+result);
System.out.println();
} catch (OperationCanceledException e) {
@@ -237,6 +244,10 @@ public class HelloConsumerApplication implements IApplication,
System.out.println("COMPLETED remote call with callback INTERRUPTED with exception="+e);
System.out.println();
e.printStackTrace();
+ } catch (ExecutionException e) {
+ System.out.println("COMPLETED remote call with callback INTERRUPTED with exception="+e);
+ System.out.println();
+ e.printStackTrace();
}
}
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator$HelloTrackerCustomizer$1.class b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator$HelloTrackerCustomizer$1.class
deleted file mode 100644
index 2621e2aca..000000000
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator$HelloTrackerCustomizer$1.class
+++ /dev/null
Binary files differ
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator$HelloTrackerCustomizer.class b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator$HelloTrackerCustomizer.class
deleted file mode 100644
index 84486b06b..000000000
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator$HelloTrackerCustomizer.class
+++ /dev/null
Binary files differ
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator.class b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator.class
deleted file mode 100644
index 9ed2ef43a..000000000
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/bin/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator.class
+++ /dev/null
Binary files differ
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/src/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator.java b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/src/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator.java
index 6a64df589..8d58e2fcb 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/src/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator.java
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer2/src/org/eclipse/ecf/examples/internal/remoteservices/hello/consumer2/Activator.java
@@ -10,13 +10,15 @@
*****************************************************************************/
package org.eclipse.ecf.examples.internal.remoteservices.hello.consumer2;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.ecf.examples.remoteservices.hello.HelloMessage;
import org.eclipse.ecf.examples.remoteservices.hello.IHello;
import org.eclipse.ecf.examples.remoteservices.hello.IHelloAsync;
import org.eclipse.ecf.osgi.services.distribution.IDistributionConstants;
import org.eclipse.ecf.remoteservice.IAsyncCallback;
-import org.eclipse.equinox.concurrent.future.IFuture;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
@@ -94,7 +96,7 @@ public class Activator implements BundleActivator, IDistributionConstants {
// Call asynchronously with future
System.out.println("STARTING async remote call via future...");
- IFuture future = helloA.helloAsync(CONSUMER_NAME + " via async proxy with future");
+ Future<String> future = helloA.helloAsync(CONSUMER_NAME + " via async proxy with future");
System.out.println("LOCAL async future invocation complete");
System.out.println();
try {
@@ -104,7 +106,7 @@ public class Activator implements BundleActivator, IDistributionConstants {
Thread.sleep(200);
}
// Now it's done, so this will not block
- Object result = future.get();
+ String result = future.get();
System.out.println("COMPLETED remote call with future SUCCEEDED with result="+result);
System.out.println();
} catch (OperationCanceledException e) {
@@ -115,6 +117,10 @@ public class Activator implements BundleActivator, IDistributionConstants {
System.out.println("COMPLETED remote call with callback INTERRUPTED with exception="+e);
System.out.println();
e.printStackTrace();
+ } catch (ExecutionException e) {
+ System.out.println("COMPLETED remote call with callback INTERRUPTED with exception="+e);
+ System.out.println();
+ e.printStackTrace();
}
// Call other helloMessage method
@@ -136,7 +142,7 @@ public class Activator implements BundleActivator, IDistributionConstants {
Thread.sleep(200);
}
// Now it's done, so this will not block
- Object result = future.get();
+ String result = future.get();
System.out.println("COMPLETED remote call with future SUCCEEDED with result="+result);
System.out.println();
} catch (OperationCanceledException e) {
@@ -147,10 +153,12 @@ public class Activator implements BundleActivator, IDistributionConstants {
System.out.println("COMPLETED remote call with callback INTERRUPTED with exception="+e);
System.out.println();
e.printStackTrace();
+ } catch (ExecutionException e) {
+ System.out.println("COMPLETED remote call with callback INTERRUPTED with exception="+e);
+ System.out.println();
+ e.printStackTrace();
}
-
}
-
}
public void modifiedService(ServiceReference<IHello> reference,
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/META-INF/MANIFEST.MF
index 23f824a85..790a5863b 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: %bundleProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
J2SE-1.4,
CDC-1.1/Foundation-1.1
-Import-Package: org.eclipse.ecf.examples.remoteservices.hello;version="3.0.0",
+Import-Package: org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0",
org.eclipse.ecf.remoteservice,
org.eclipse.ecf.remoteservice.events,
org.eclipse.equinox.app;version="1.0.0",
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/src/org/eclipse/ecf/examples/internal/remoteservices/hello/ds/consumer/HelloClientComponent.java b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/src/org/eclipse/ecf/examples/internal/remoteservices/hello/ds/consumer/HelloClientComponent.java
index dea199bb1..89940d62b 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/src/org/eclipse/ecf/examples/internal/remoteservices/hello/ds/consumer/HelloClientComponent.java
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.consumer/src/org/eclipse/ecf/examples/internal/remoteservices/hello/ds/consumer/HelloClientComponent.java
@@ -9,6 +9,9 @@
******************************************************************************/
package org.eclipse.ecf.examples.internal.remoteservices.hello.ds.consumer;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.ecf.examples.remoteservices.hello.IHello;
@@ -58,7 +61,7 @@ public class HelloClientComponent {
// Call asynchronously with future
System.out.println("STARTING async remote call via future...");
- IFuture future = helloA.helloAsync(CONSUMER_NAME + " via async proxy with future");
+ Future<String> future = helloA.helloAsync(CONSUMER_NAME + " via async proxy with future");
System.out.println("LOCAL async future invocation complete");
System.out.println();
try {
@@ -68,7 +71,7 @@ public class HelloClientComponent {
Thread.sleep(200);
}
// Now it's done, so this will not block
- Object result = future.get();
+ String result = future.get();
System.out.println("COMPLETED remote call with future SUCCEEDED with result="+result);
System.out.println();
} catch (OperationCanceledException e) {
@@ -79,6 +82,10 @@ public class HelloClientComponent {
System.out.println("COMPLETED remote call with callback INTERRUPTED with exception="+e);
System.out.println();
e.printStackTrace();
+ } catch (ExecutionException e) {
+ System.out.println("COMPLETED remote call with callback INTERRUPTED with exception="+e);
+ System.out.println();
+ e.printStackTrace();
}
}
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/META-INF/MANIFEST.MF
index 2d080803d..942604730 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.ds.host;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
Bundle-Vendor: %bundleProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
J2SE-1.4,
CDC-1.1/Foundation-1.1
-Import-Package: org.eclipse.ecf.examples.remoteservices.hello;version="3.0.0",
+Import-Package: org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0",
org.eclipse.equinox.app;version="1.1.0"
Service-Component: OSGI-INF/hello.xml
Bundle-Localization: bundle
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/OSGI-INF/hello.xml b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/OSGI-INF/hello.xml
index 81a128631..ea0f057c6 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/OSGI-INF/hello.xml
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/OSGI-INF/hello.xml
@@ -3,7 +3,7 @@
<implementation class="org.eclipse.ecf.examples.internal.remoteservices.hello.ds.host.HelloComponent"/>
<property name="service.exported.interfaces" type="String" value="*"/>
<property name="service.exported.configs" type="String" value="ecf.generic.server"/>
- <property name="ecf.exported.containerfactoryargs" type="String" value="ecftcp://localhost:3787/server"/>
+ <property name="ecf.generic.server.id" type="String" value="ecftcp://localhost:3787/server"/>
<service>
<provide interface="org.eclipse.ecf.examples.remoteservices.hello.IHello"/>
</service>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/products/Hello Service DS Host (zeroconf,generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/products/Hello Service DS Host (zeroconf,generic).product
index d047405c4..eb2a11f7f 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/products/Hello Service DS Host (zeroconf,generic).product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.ds.host/products/Hello Service DS Host (zeroconf,generic).product
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="ECF Remote Service Example DS Host" uid="org.eclipse.ecf.examples.remoteservices.hello.ds.host.product" application="org.eclipse.ecf.examples.remoteservices.hello.ds.host.HelloHostDS" version="2.0.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="ECF Remote Service Example DS Host" uid="org.eclipse.ecf.examples.remoteservices.hello.ds.host.product" application="org.eclipse.ecf.examples.remoteservices.hello.ds.host.HelloHostDS" version="2.1.0.qualifier" useFeatures="false" includeLaunchers="false">
<configIni use="default">
</configIni>
<launcherArgs>
- <programArgs>-console -consoleLog</programArgs>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ <programArgs>-console -consoleLog
+ </programArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
</launcherArgs>
<windowImages/>
@@ -42,7 +44,8 @@
<plugin id="org.eclipse.ecf.provider"/>
<plugin id="org.eclipse.ecf.provider.jmdns"/>
<plugin id="org.eclipse.ecf.provider.remoteservice"/>
- <plugin id="org.eclipse.ecf.remoteservice"/> <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/>
+ <plugin id="org.eclipse.ecf.remoteservice"/>
+ <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" version="2.0.0"/>
<plugin id="org.eclipse.ecf.sharedobject"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
@@ -59,15 +62,18 @@
</plugins>
<configurations>
- <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.ecf" autoStart="true" startLevel="1" />
- <plugin id="org.eclipse.ecf.osgi.services.distribution" autoStart="true" startLevel="1" />
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="1" />
- <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy" autoStart="true" startLevel="1" />
- <plugin id="org.eclipse.equinox.app" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
+ <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="1" />
+ <plugin id="org.eclipse.ecf.discovery" autoStart="true" startLevel="1" />
+ <plugin id="org.eclipse.ecf.osgi.services.distribution" autoStart="true" startLevel="3" />
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="3" />
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy" autoStart="true" startLevel="3" />
+ <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.app" autoStart="true" startLevel="4" />
+ <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="1" />
+ <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="3" />
+ <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.registry" autoStart="true" startLevel="1" />
+ <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
</configurations>
</product>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF
index 7b7d39b76..ed142c040 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.host/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello.host;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.examples.remoteservices.hello.host.Activator
Bundle-Vendor: %bundleProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
@@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.4,
CDC-1.1/Foundation-1.1
Import-Package: org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.core.identity;version="3.0.0",
- org.eclipse.ecf.examples.remoteservices.hello;version="3.0.0",
+ org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0",
org.eclipse.ecf.examples.remoteservices.hello.impl;version="3.0.0",
org.eclipse.ecf.osgi.services.distribution;version="1.0.0",
org.eclipse.equinox.app;version="1.0.0",
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/META-INF/MANIFEST.MF
index e13141189..8f84a1531 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.ecf.examples.remoteservices.hello
-Bundle-Version: 3.0.100.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: %bundleProvider
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
J2SE-1.4,
CDC-1.1/Foundation-1.1
-Export-Package: org.eclipse.ecf.examples.remoteservices.hello;version="3.0.0",
+Export-Package: org.eclipse.ecf.examples.remoteservices.hello;version="4.0.0",
org.eclipse.ecf.examples.remoteservices.hello.impl;version="3.0.0"
Bundle-Localization: bundle
Import-Package: org.eclipse.ecf.remoteservice,
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/src/org/eclipse/ecf/examples/remoteservices/hello/IHelloAsync.java b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/src/org/eclipse/ecf/examples/remoteservices/hello/IHelloAsync.java
index e2282a3b7..4f71d6511 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/src/org/eclipse/ecf/examples/remoteservices/hello/IHelloAsync.java
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello/src/org/eclipse/ecf/examples/remoteservices/hello/IHelloAsync.java
@@ -9,8 +9,9 @@
******************************************************************************/
package org.eclipse.ecf.examples.remoteservices.hello;
+import java.util.concurrent.Future;
+
import org.eclipse.ecf.remoteservice.IAsyncCallback;
-import org.eclipse.equinox.concurrent.future.IFuture;
/**
* @since 2.0
@@ -18,15 +19,18 @@ import org.eclipse.equinox.concurrent.future.IFuture;
public interface IHelloAsync {
public void helloAsync(String from, IAsyncCallback<String> callback);
- public IFuture helloAsync(String from);
+ /**
+ * @since 4.0
+ */
+ public Future<String> helloAsync(String from);
/**
* @since 3.0
*/
public void helloMessageAsync(HelloMessage message, IAsyncCallback<String> callback);
/**
- * @since 3.0
+ * @since 4.0
*/
- public IFuture helloMessageAsync(HelloMessage message);
+ public Future<String> helloMessageAsync(HelloMessage message);
}
diff --git a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml
index 73d2a8d3c..085c05391 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.examples.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.remoteservice.examples.feature"
label="ECF OSGi Remote Services Examples"
- version="1.2.0.qualifier"
+ version="1.3.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/ecf">
@@ -69,13 +69,6 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
unpack="false"/>
<plugin
- id="org.eclipse.ecf.examples.remoteservices.hello.ds.host"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.ecf.examples.remoteservices.hello.host"
download-size="0"
install-size="0"
@@ -97,13 +90,6 @@ https://wiki.eclipse.org/ECF#OSGi_Remote_Services
unpack="false"/>
<plugin
- id="org.eclipse.ecf.examples.remoteservices.hello.consumer2"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="com.mycorp.examples.timeservice"
download-size="0"
install-size="0"

Back to the top