Skip to content

Commit

Permalink
Fix up Kura launcher and rebuild web UI 2 during setup
Browse files Browse the repository at this point in the history
This change brings a new Kura launcher configuration, based on the
existing Kura Linux launcher, but fixing the path issues so that
the launcher can be started without the need to "select" any resource
in the IDE first.

Also is the Web UI 2 being rebuild during the initial setup phase and
a launcher is provided so that it can easily be rebuilt later on.

In addition the "soda.comm" and "web" bundle are not imported anymore.
The can be imported manually at a later time, but right now, in the
default setup, the cause some trouble because the "soda.comm" library
is not assembled in a way that Eclipse PDE can handle for starting, so
resources are missing and the web UI has the same bundle name so two
conflicting Web UIs exist.

Signed-off-by: Jens Reimann <jreimann@redhat.com>
  • Loading branch information
ctron committed Jul 15, 2016
1 parent afafd60 commit 656ba1b
Show file tree
Hide file tree
Showing 4 changed files with 136 additions and 2 deletions.
11 changes: 11 additions & 0 deletions kura/setups/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>setups</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
77 changes: 77 additions & 0 deletions kura/setups/launchers/Eclipse Kura Emulator (Linux).launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher">
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="automaticAdd" value="false"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="true"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Eclipse Kura Emulator (Linux)"/>
<booleanAttribute key="default" value="true"/>
<booleanAttribute key="default_auto_start" value="true"/>
<intAttribute key="default_start_level" value="4"/>
<booleanAttribute key="includeOptional" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.service.http.port=8080 -Dkura.have.net.admin=false -Dorg.osgi.framework.storage=/tmp/osgi/framework_storage -Dosgi.clean=true -Dosgi.noShutdown=true -Declipse.ignoreApp=true -Dorg.eclipse.kura.mode=emulator -Dkura.configuration=file:${project_loc:org.eclipse.kura.emulator}/src/main/resources/kura.properties -Ddpa.configuration=/tmp/kura/dpa.properties -Dlog4j.configuration=file:${project_loc:org.eclipse.kura.emulator}/src/main/resources/log4j.properties -Dkura.data=${project_loc:distrib}/kura/data -Dkura.snapshots=${project_loc:distrib}/kura/snapshots -Ddb.service.hsqldb.url=jdbc:hsqldb:file:${project_loc:distrib}/kura/data/db/data;hsqldb.lock_file=false"/>
<booleanAttribute key="pde.generated.config" value="true"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="target_bundles" value="com.google.protobuf@default:default,com.gwt.user*1.0.0@default:default,javax.servlet@default:default,jdk.dio@default:default,log4j.apache-log4j-extras@default:false,log4j@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang3@default:default,org.apache.commons.net@default:default,org.apache.felix.dependencymanager@default:default,org.apache.felix.deploymentadmin@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.io@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.metatype@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.paho.client.mqttv3@default:default,org.eclipse.soda.dk.comm*1.2.1@default:default,org.hamcrest.core@default:default,org.hsqldb.hsqldb@default:default,org.json@default:default,org.junit@default:default,org.usb4java@default:default,osgi.cmpn@default:default,slf4j.api@default:default,slf4j.log4j12@default:false,usb4java-javax@default:default,usb4java-javax@default:default"/>
<stringAttribute key="timestamp" value="1449054439069"/>
<booleanAttribute key="tracing" value="false"/>
<mapAttribute key="tracingOptions">
<mapEntry key="org.eclipse.equinox.ds/debug" value="true"/>
<mapEntry key="org.eclipse.equinox.ds/instantiate_all" value="true"/>
<mapEntry key="org.eclipse.equinox.ds/performance" value="false"/>
<mapEntry key="org.eclipse.equinox.ds/print_on_console" value="true"/>
<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
<mapEntry key="org.eclipse.osgi/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/objectPool/adds" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/objectPool/dups" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/cachedmanifest" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/uses" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
</mapAttribute>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<stringAttribute key="workspace_bundles" value="com.codeminders.hidapi@default:default,org.eclipse.kura.api@default:true,org.eclipse.kura.core.certificates@default:default,org.eclipse.kura.core.cloud@default:default,org.eclipse.kura.core.comm@default:default,org.eclipse.kura.core.configuration@default:default,org.eclipse.kura.core.crypto@default:default,org.eclipse.kura.core.deployment@default:default,org.eclipse.kura.core.log@default:default,org.eclipse.kura.core.net@default:default,org.eclipse.kura.core.status@default:default,org.eclipse.kura.core@default:true,org.eclipse.kura.deployment.agent@default:default,org.eclipse.kura.deployment.update@default:default,org.eclipse.kura.emulator.clock@default:default,org.eclipse.kura.emulator.gpio@default:default,org.eclipse.kura.emulator.net@default:default,org.eclipse.kura.emulator.position@default:default,org.eclipse.kura.emulator.usb@default:default,org.eclipse.kura.emulator.watchdog@default:default,org.eclipse.kura.emulator@default:true,org.eclipse.kura.example.beacon.scanner@default:default,org.eclipse.kura.example.publisher@default:default,org.eclipse.kura.raspberrypi.sensehat.example@default:default,org.eclipse.kura.raspberrypi.sensehat@default:default,org.eclipse.kura.web@default:default,org.usb4java@default:default,usb4java-javax@default:default"/>
</launchConfiguration>
17 changes: 17 additions & 0 deletions kura/setups/launchers/Rebuild Web UI 2.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean package"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES"/>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
<intAttribute key="M2_THREADS" value="1"/>
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:org.eclipse.kura.web2}"/>
</launchConfiguration>
33 changes: 31 additions & 2 deletions kura/setups/user.setup
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
xmlns:launching="http://www.eclipse.org/oomph/setup/launching/1.0"
xmlns:maven="http://www.eclipse.org/oomph/setup/maven/1.0"
xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
xmlns:resources="http://www.eclipse.org/oomph/resources/1.0"
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/launching/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Launching.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/resources/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Resources.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/launching/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Launching.ecore http://www.eclipse.org/oomph/setup/maven/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Maven.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/resources/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Resources.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
name="iot.kura"
label="Eclipse Kura">
<setupTask
Expand Down Expand Up @@ -74,6 +75,8 @@
name="org.sonatype.tycho.m2e.feature.feature.group"/>
<requirement
name="org.eclipse.m2e.wtp.feature.feature.group"/>
<requirement
name="org.eclipse.oomph.setup.projects.feature.group"/>
<repository
url="http://mtoolkit.tigris.org/updates/stable"/>
<repository
Expand Down Expand Up @@ -119,6 +122,12 @@
rootFolder="${git.clone.location}/target-platform">
<projectFactory
xsi:type="resources:MavenProjectFactory"/>
<predicate
xsi:type="predicates:NotPredicate">
<operand
xsi:type="predicates:NamePredicate"
pattern="org.eclipse.soda.dk.comm"/>
</predicate>
</sourceLocator>
</setupTask>
<setupTask
Expand Down Expand Up @@ -203,11 +212,31 @@
xsi:type="setup:CompoundTask"
filter="(kura.developerType=developer)"
name="Developer">
<setupTask
xsi:type="projects:ProjectsImportTask">
<sourceLocator
rootFolder="${git.clone.location}/kura/setups">
<projectFactory
xsi:type="resources:EclipseProjectFactory"/>
</sourceLocator>
</setupTask>
<setupTask
xsi:type="maven:MavenImportTask">
<sourceLocator
rootFolder="${git.clone.location}/kura"
locateNestedProjects="true"/>
locateNestedProjects="true">
<predicate
xsi:type="predicates:NotPredicate">
<operand
xsi:type="predicates:NamePredicate"
pattern="org.eclipse.kura.web"/>
</predicate>
</sourceLocator>
</setupTask>
<setupTask
xsi:type="launching:LaunchTask"
launcher="setups/launchers/Rebuild Web UI 2.launch">
<description>Rebuild the Kura Web UI 2</description>
</setupTask>
</setupTask>
</setupTask>
Expand Down

0 comments on commit 656ba1b

Please sign in to comment.