Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-09-25 01:16:45 -0400
committerslewis2009-09-25 01:16:45 -0400
commita26d3769dda34bf5a39e6cd5af3198864c892d90 (patch)
tree9405eec0a94cf3161c7e7e97cb1d5e52afd34200
parent1c939e18fa78ecf14cf162223d537d39d3b5de68 (diff)
downloadorg.eclipse.ecf-a26d3769dda34bf5a39e6cd5af3198864c892d90.tar.gz
org.eclipse.ecf-a26d3769dda34bf5a39e6cd5af3198864c892d90.tar.xz
org.eclipse.ecf-a26d3769dda34bf5a39e6cd5af3198864c892d90.zip
Added products for both r-osgi and generic provider for hello example host and consumer
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/Hello Service Consumer (generic).product60
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/Hello Service Consumer (r-osgi).product (renamed from examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/Hello Service Consumer.product)0
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties3
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/Activator.java3
4 files changed, 64 insertions, 2 deletions
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/Hello Service Consumer (generic).product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/Hello Service Consumer (generic).product
new file mode 100644
index 000000000..f879e76a6
--- /dev/null
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/Hello Service Consumer (generic).product
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+
+ <configIni use="default">
+ </configIni>
+
+ <launcherArgs>
+ <programArgs>-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console</programArgs>
+ <vmArgs>-Declipse.ignoreApp=true -Dosgi.noShutdown=true
+-DcontainerType=ecf.generic.client</vmArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ </launcherArgs>
+
+ <launcher>
+ <solaris/>
+ <win useIco="false">
+ <bmp/>
+ </win>
+ </launcher>
+
+ <vm>
+ </vm>
+
+ <plugins>
+ <plugin id="javax.servlet"/>
+ <plugin id="org.eclipse.core.contenttype"/>
+ <plugin id="org.eclipse.core.jobs"/>
+ <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
+ <plugin id="org.eclipse.ecf"/>
+ <plugin id="org.eclipse.ecf.discovery"/>
+ <plugin id="org.eclipse.ecf.examples.remoteservices.hello"/>
+ <plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer"/>
+ <plugin id="org.eclipse.ecf.identity"/>
+ <plugin id="org.eclipse.ecf.osgi.services"/>
+ <plugin id="org.eclipse.ecf.osgi.services.discovery"/>
+ <plugin id="org.eclipse.ecf.osgi.services.distribution"/>
+ <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.sharedobject"/>
+ <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
+ <plugin id="org.eclipse.equinox.app"/>
+ <plugin id="org.eclipse.equinox.common"/>
+ <plugin id="org.eclipse.equinox.concurrent"/>
+ <plugin id="org.eclipse.equinox.preferences"/>
+ <plugin id="org.eclipse.equinox.registry"/>
+ <plugin id="org.eclipse.osgi"/>
+ <plugin id="org.eclipse.osgi.services"/>
+ </plugins>
+
+ <configurations>
+ <plugin id="org.eclipse.ecf.examples.remoteservices.hello.consumer" autoStart="true" startLevel="0" />
+ <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
+ </configurations>
+
+</product>
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/Hello Service Consumer.product b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/Hello Service Consumer (r-osgi).product
index d898cd19c..d898cd19c 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/Hello Service Consumer.product
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/Hello Service Consumer (r-osgi).product
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties
index 7e72ccdb3..c9913ddc1 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/build.properties
@@ -7,4 +7,5 @@ bin.includes = META-INF/,\
src.includes = about.html,\
META-INF/,\
bundle.properties,\
- Hello Service Consumer.product
+ Hello Service Consumer (r-osgi).product,\
+ Hello Service Consumer (generic).product
diff --git a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/Activator.java b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/Activator.java
index a05d6c636..8df611499 100644
--- a/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/Activator.java
+++ b/examples/bundles/org.eclipse.ecf.examples.remoteservices.hello.consumer/src/org/eclipse/ecf/internal/examples/remoteservices/hello/consumer/Activator.java
@@ -18,6 +18,7 @@ public class Activator implements BundleActivator, IDistributionConstants, Servi
public static final String CONSUMER_NAME = "org.eclipse.ecf.examples.remoteservices.hello.consumer";
+ private String containerType = System.getProperty("containerType","ecf.r_osgi.peer");
private BundleContext context;
private ServiceTracker containerManagerServiceTracker;
private ServiceTracker helloServiceTracker;
@@ -30,7 +31,7 @@ public class Activator implements BundleActivator, IDistributionConstants, Servi
this.context = context;
// Create R-OSGi Container
IContainerManager containerManager = getContainerManagerService();
- containerManager.getContainerFactory().createContainer("ecf.r_osgi.peer");
+ containerManager.getContainerFactory().createContainer(containerType);
// Create service tracker to track IHello instances that are REMOTE
helloServiceTracker = new ServiceTracker(context,createRemoteFilter(),this);
helloServiceTracker.open();

Back to the top