diff options
author | slewis | 2014-04-29 02:55:15 +0000 |
---|---|---|
committer | slewis | 2014-04-29 02:55:15 +0000 |
commit | 3d17306256336bee5d0ea37160afeae03e727124 (patch) | |
tree | eef1796288d5669d463a2ab554103c1f370b509c | |
parent | cff997664622e240913cd89945b6d6e12d7d66f5 (diff) | |
download | org.eclipse.ecf-3d17306256336bee5d0ea37160afeae03e727124.tar.gz org.eclipse.ecf-3d17306256336bee5d0ea37160afeae03e727124.tar.xz org.eclipse.ecf-3d17306256336bee5d0ea37160afeae03e727124.zip |
For Raspberry Pi demo, changed jmdns out for jslp, fixed .sh startup
script (for Rpi/Linux)
Change-Id: Ib8cdf381a02f2b3eda5fcc33b0be8d8828ae2994
3 files changed, 28 insertions, 19 deletions
diff --git a/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/feature.xml b/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/feature.xml index f82860580..c751ecf7f 100644 --- a/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/feature.xml +++ b/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/feature.xml @@ -108,13 +108,6 @@ unpack="false"/> <plugin - id="org.eclipse.ecf.provider.jmdns" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.ecf.remoteservice" download-size="0" install-size="0" @@ -198,4 +191,18 @@ version="0.0.0" unpack="false"/> + <plugin + id="ch.ethz.iks.slp" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ecf.provider.jslp" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> diff --git a/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/products/RaspberryPiManagmentHost.product b/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/products/RaspberryPiManagmentHost.product index 9408ae28e..c9f2e5e23 100644 --- a/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/products/RaspberryPiManagmentHost.product +++ b/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/products/RaspberryPiManagmentHost.product @@ -73,6 +73,7 @@ </features> <configurations> + <plugin id="ch.ethz.iks.slp" 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" /> @@ -88,6 +89,7 @@ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy" autoStart="true" startLevel="5" /> <plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.ecf.provider.jmdns" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.ecf.provider.jslp" autoStart="true" startLevel="0" /> <plugin id="org.eclipse.ecf.provider.remoteservice" 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" /> diff --git a/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/rootfiles/rpimgmthost.sh b/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/rootfiles/rpimgmthost.sh index 5fb5c32b6..fdfe0f727 100644 --- a/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/rootfiles/rpimgmthost.sh +++ b/examples/bundles/org.eclipse.ecf.examples.raspberrypi.management.host.feature/rootfiles/rpimgmthost.sh @@ -1,21 +1,21 @@ #!/bin/bash JAVAPROG=java -GENERICHOSTNAME=localhost -GENERICPORT=3288 if [ "$#" -eq "0" ];then - echo "No arguments supplied. Usage: rpimgmthost.sh <hostname> [<port]" + echo "No arguments supplied. Usage: rpimgmthost.sh hostname port" exit 1 -elif [ "$#" -eq "1" ] -then - GENERICHOSTNAME=$1 - echo "Generic Server Hostname set to ${GENERICHOSTNAME}" fi +GENERICHOSTNAME="${1}" +if [ "${2}" != "" ];then + GENERICPORT="${2}" +else + GENERICPORT=3288 +fi +echo "Hostname: ${GENERICHOSTNAME}" +echo "Port: ${GENERICPORT}" JAVAPROPS="-Decf.generic.server.hostname=${GENERICHOSTNAME} -Decf.generic.server.port=${GENERICPORT} -Declipse.ignoreApp=true -Dosgi.noShutdown=true" echo "javaprops=${JAVAPROPS}" EQUINOXJAR=plugins/org.eclipse.osgi_3.10.0.v20140407-2102.jar -echo "equinoxjar=${EQUINOXJAR}" -ARGS="-configuration file:configuration -os linux -ws gtk -arch arm -console -consoleLog -debug" -echo "program args=${ARGS}" -echo "------------executing java-----------" -${JAVAPROG} ${JAVAPROPS} -jar ${EQUINOXJAR} ${ARGS} +echo "equinox=${EQUINOXJAR}" +PROGARGS="-configuration file:configuration -os linux -ws gtk -arch arm -console -consoleLog -debug" +${JAVAPROG} ${JAVAPROPS} -jar ${EQUINOXJAR} ${PROGARGS} |