diff options
14 files changed, 249 insertions, 50 deletions
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.ws.edef.noreg.product b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.ws.edef.noreg.product new file mode 100644 index 000000000..9e441f2e4 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.ws.edef.noreg.product @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="MyCorp Remote TimeService Consumer ROSGI Websockets DS No Registry EDEF Filediscovery" uid="com.mycorp.examples.timeservice.consumer.rosgi.ws.ds.edef.noreg.product" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="false"> + + <configIni use="default"> + </configIni> + + <launcherArgs> + <programArgs>-consoleLog -console + </programArgs> + <vmArgs>-Declipse.ignoreApp=true +-Dosgi.noShutdown=true +-DverboseRemoteServiceAdmin=true +-Dservice.exported.configs=ecf.r_osgi.peer.ws +-Dch.ethz.iks.r_osgi.transport.http.listen=false + </vmArgs> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + </vmArgsMac> + </launcherArgs> + + <windowImages/> + + <launcher> + <solaris/> + <win useIco="false"> + <bmp/> + </win> + </launcher> + + <vm> + </vm> + + <plugins> + <plugin id="ch.ethz.iks.r_osgi.remote"/> + <plugin id="ch.ethz.iks.r_osgi.transport.http"/> + <plugin id="com.mycorp.examples.timeservice"/> + <plugin id="com.mycorp.examples.timeservice.consumer.ds"/> + <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws"/> + <plugin id="java_websocket"/> + <plugin id="org.apache.felix.gogo.command"/> + <plugin id="org.apache.felix.gogo.runtime"/> + <plugin id="org.apache.felix.gogo.shell"/> + <plugin id="org.eclipse.core.jobs"/> + <plugin id="org.eclipse.ecf"/> + <plugin id="org.eclipse.ecf.console"/> + <plugin id="org.eclipse.ecf.discovery"/> + <plugin id="org.eclipse.ecf.identity"/> + <plugin id="org.eclipse.ecf.osgi.services.distribution"/> + <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin"/> + <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy"/> + <plugin id="org.eclipse.ecf.provider"/> + <plugin id="org.eclipse.ecf.provider.r_osgi"/> + <plugin id="org.eclipse.ecf.remoteservice"/> + <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/> + <plugin id="org.eclipse.ecf.sharedobject"/> + <plugin id="org.eclipse.equinox.common"/> + <plugin id="org.eclipse.equinox.concurrent"/> + <plugin id="org.eclipse.equinox.console"/> + <plugin id="org.eclipse.equinox.ds"/> + <plugin id="org.eclipse.equinox.event"/> + <plugin id="org.eclipse.equinox.util"/> + <plugin id="org.eclipse.osgi"/> + <plugin id="org.eclipse.osgi.services"/> + <plugin id="org.eclipse.osgi.services.remoteserviceadmin"/> + <plugin id="org.objectweb.asm" version="3.3.1"/> + </plugins> + + <configurations> + <plugin id="ch.ethz.iks.r_osgi.remote" autoStart="true" startLevel="0" /> + <plugin id="ch.ethz.iks.r_osgi.transport.http" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.consumer.ds" autoStart="true" startLevel="0" /> + <plugin id="com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws" autoStart="false" startLevel="0" /> + <plugin id="java_websocket" autoStart="true" startLevel="0" /> + <plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" /> + <plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" /> + <plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.core.jobs" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.console" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.discovery" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.identity" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.osgi.services.distribution" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.provider.r_osgi" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.remoteservice" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.remoteservice.asyncproxy" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.sharedobject" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.concurrent" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.util" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" /> + <plugin id="org.objectweb.asm" autoStart="true" startLevel="0" /> + </configurations> + +</product> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.edef.txt b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.edef.txt index df70c8054..dee9e3cc7 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.edef.txt +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.edef.txt @@ -16,53 +16,3 @@ This should result in the discover and use of the TimeService...with output on t osgi> start com.mycorp.examples.timeservice.consumer.filediscovery osgi> Discovered ITimeService via DS Current time is: 1425262293841 -Discovered ITimeServiceAsync via DS -Current time via future.get is: 1425262293906 - -The OSGi console 'start' command can also use the bundleId rather than the symbolic id, but in that case -the bundleId has to be found first. The easiest way to find the bundleId in the console is to use the 'short status'/ss command...e.g. - -osgi> ss -"Framework is launched." - - -id State Bundle -0 ACTIVE org.eclipse.osgi_3.10.0.v20140407-2102 -1 ACTIVE org.eclipse.ecf.identity_3.4.0.qualifier -2 ACTIVE org.eclipse.equinox.concurrent_1.1.0.v20130327-1442 -5 ACTIVE org.eclipse.core.contenttype_3.4.200.v20140207-1251 -6 ACTIVE org.eclipse.ecf.remoteservice_8.5.0.qualifier -7 ACTIVE org.apache.felix.gogo.runtime_0.10.0.v201209301036 -8 ACTIVE com.mycorp.examples.timeservice.consumer.ds_1.0.0.qualifier -9 ACTIVE org.eclipse.equinox.registry_3.5.400.v20140324-1548 -10 ACTIVE javax.xml_1.3.4.v201005080400 -11 ACTIVE org.eclipse.ecf.osgi.services.remoteserviceadmin_4.2.0.qualifier -12 ACTIVE org.eclipse.ecf.console_1.0.0.qualifier -13 ACTIVE org.eclipse.ecf.discovery_5.0.0.qualifier -14 ACTIVE org.eclipse.equinox.common_3.6.200.v20130402-1505 -15 ACTIVE org.apache.felix.gogo.shell_0.10.0.v201212101605 -16 ACTIVE org.eclipse.equinox.preferences_3.5.200.v20140224-1527 -18 ACTIVE org.eclipse.core.jobs_3.6.0.v20140407-1602 -19 ACTIVE org.eclipse.ecf.remoteservice.asyncproxy_2.0.0.qualifier -20 ACTIVE org.eclipse.equinox.ds_1.4.200.v20131126-2331 -21 ACTIVE org.eclipse.ecf_3.4.0.qualifier -22 ACTIVE org.eclipse.equinox.console_1.1.0.v20140131-1639 -23 ACTIVE org.eclipse.ecf.osgi.services.distribution_2.1.0.qualifier -24 ACTIVE org.eclipse.osgi.services_3.4.0.v20140312-2051 -25 ACTIVE org.eclipse.equinox.util_1.0.500.v20130404-1337 -26 ACTIVE com.mycorp.examples.timeservice_1.1.0.qualifier -27 ACTIVE org.eclipse.ecf.sharedobject_2.5.0.qualifier -28 ACTIVE org.eclipse.ecf.provider.remoteservice_4.1.0.qualifier -29 ACTIVE org.eclipse.osgi.services.remoteserviceadmin_1.6.0.qualifier -30 ACTIVE org.eclipse.equinox.event_1.3.100.v20140115-1647 -31 ACTIVE org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy_1.0.0.qualifier -32 ACTIVE org.apache.felix.gogo.command_0.10.0.v201209301215 -33 ACTIVE org.eclipse.ecf.provider_4.5.0.qualifier -34 RESOLVED com.mycorp.examples.timeservice.consumer.filediscovery_1.2.0.qualifier - -Then the start command can be given with for the com.mycorp.examples.timeservice.consumer.filediscovery bundleId -given in the first column. For example: - -osgi> start 34 - - diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.ws.noreg.txt b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.ws.noreg.txt new file mode 100644 index 000000000..0f36c22b1 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.ws.noreg.txt @@ -0,0 +1,21 @@ +README for TimeServiceConsumer.rosgi.ds.wss.noreg.product + +Using EDEF Filediscovery to trigger TimeServiceConsumer discovery + +When using the EDEF product configurations to trigger the discovery of the remote service, +it's necessary to manually start (via the console) the bundle with symbolic +ID=com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws + +To run the example within Eclipse + +1) Launch the TimeService host (e.g. TimeServiceHost.ds.generic.noreg.product, from Eclipse product configuration editor Overview tab) +2) Launch the TimeService consumer (TimeServiceConsumer.ds.rosgi.wss.noreg.product, from Eclipse product configuration editor Overview tab) +3) In the consumer console, start the filediscovery/EDEF bundle..e.g.: + +osgi> start com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws + +This should result in the discover and use of the TimeService...with output on the consumer similar to the following: + +osgi> start com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws +osgi> Discovered ITimeService via DS +Current time is: 1425262293841 diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.wss.noreg.readme b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.wss.noreg.txt index 91f56c6b7..94a2d4e7a 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/TimeServiceConsumer.ds.rosgi.wss.noreg.readme +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.ds/launch/readme.TimeServiceConsumer.ds.rosgi.wss.noreg.txt @@ -26,3 +26,4 @@ c:\eclipsehome\security\server.ks + diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.classpath b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.classpath new file mode 100644 index 000000000..64c5e31b7 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.gitignore b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.gitignore new file mode 100644 index 000000000..5e56e040e --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.gitignore @@ -0,0 +1 @@ +/bin diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.project b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.project new file mode 100644 index 000000000..64db3f31a --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.settings/org.eclipse.jdt.core.prefs b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..af0f20f97 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.settings/org.eclipse.pde.core.prefs b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.settings/org.eclipse.pde.core.prefs new file mode 100644 index 000000000..f29e940a0 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +pluginProject.extensions=false +resolve.requirebundle=false diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/META-INF/MANIFEST.MF new file mode 100644 index 000000000..def77a63a --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/META-INF/MANIFEST.MF @@ -0,0 +1,8 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: ECF TimeService Example EDEF Filediscovery for Consumer +Bundle-SymbolicName: com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: MYCORP +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Remote-Service: timeserviceendpointdescription.xml diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/about.html b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/about.html new file mode 100644 index 000000000..4c79781a5 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 25, 2008</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p> + +</body> +</html>
\ No newline at end of file diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/build.properties b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/src/foo.txt b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/src/foo.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/src/foo.txt diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/timeserviceendpointdescription.xml b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/timeserviceendpointdescription.xml new file mode 100644 index 000000000..77eccd530 --- /dev/null +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rosgi.ws/timeserviceendpointdescription.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0"> + <endpoint-description> + <property name="ecf.endpoint.id" value-type="String" value="r-osgi.ws://localhost" /> + <property name="ecf.endpoint.id.ns" value-type="String" value="ecf.namespace.r_osgi.ws" /> + <property name="ecf.endpoint.ts" value-type="Long" value="0" /> + <property name="endpoint.framework.uuid" value-type="String" value="0" /> + <property name="endpoint.id" value-type="String" value="0" /> + <property name="endpoint.package.version.com.mycorp.examples.timeservice" value-type="String" value="1.0.0" /> + <property name="endpoint.service.id" value-type="Long" value="0" /> + <property name="objectClass" value-type="String"> + <array> + <value>com.mycorp.examples.timeservice.ITimeService</value> + </array> + </property> + <property name="remote.configs.supported" value-type="String"> + <array> + <value>ecf.r_osgi.peer.ws</value> + </array> + </property> + <property name="remote.intents.supported" value-type="String"> + <array> + <value>passByValue</value> + <value>exactlyOnce</value> + <value>ordered</value> + </array> + </property> + <property name="service.id" value-type="Long" value="0" /> + <property name="service.imported" value-type="String" value="true" /> + <property name="service.imported.configs" value-type="String"> + <array> + <value>ecf.r_osgi.peer.ws</value> + </array> + </property> + <property name="service.scope" value-type="String" value="singleton" /> + </endpoint-description> +</endpoint-descriptions> |