Use SLC Detached (aka. SLC AutoUI) as a bundle.

Move servers config to end bundle.

git-svn-id: https://svn.argeo.org/slc/trunk@1649 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.autoui.launcher/src/main/java/org/argeo/slc/autoui/launcher/Main.java b/org.argeo.slc.autoui.launcher/src/main/java/org/argeo/slc/autoui/launcher/Main.java
index ec1801be1e624a78845c39fb1162aae1d1bf9751..1d719cf299d5de9e8a92d4a76f68ded1e7b6d932 100644 (file)
--- a/org.argeo.slc.autoui.launcher/src/main/java/org/argeo/slc/autoui/launcher/Main.java
+++ b/org.argeo.slc.autoui.launcher/src/main/java/org/argeo/slc/autoui/launcher/Main.java
@@ -95,7 +95,7 @@ public class Main {
                // Add activator to process auto-start/install properties.
                list.add(new AutoActivator(config));
                // Add our own activator.
-               list.add(new AutoUiActivator());
+               //list.add(new AutoUiActivator());
 
                // Now create an instance of the framework.
                Felix felix = new Felix(config, list);

diff --git a/org.argeo.slc.autoui.launcher/src/main/resources/org/argeo/slc/autoui/launcher/felix.properties b/org.argeo.slc.autoui.launcher/src/main/resources/org/argeo/slc/autoui/launcher/felix.properties
index 698b8712b18c87c65c8dd6fae2494ff14ffff71b..701eee94a387b369fcd44c788cf5bb2dbef73da5 100644 (file)
--- a/org.argeo.slc.autoui.launcher/src/main/resources/org/argeo/slc/autoui/launcher/felix.properties
+++ b/org.argeo.slc.autoui.launcher/src/main/resources/org/argeo/slc/autoui/launcher/felix.properties
@@ -13,14 +13,13 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
  org.osgi.service.startlevel; version=1.1.0, \
  org.osgi.service.url; version=1.0.0, \
  org.osgi.util.tracker; version=1.3.3, \
- org.argeo.slc.autoui; version=0.10.3.SNAPSHOT, \
- org.argeo.slc.testui, \
- org.apache.commons.logging, \
+ org.springframework.beans.factory,\
  org.springframework.beans.factory.support,\
  org.springframework.beans.factory.xml,\
  org.springframework.context,\
  org.springframework.context.support,\
- org.springframework.core.io \
+ org.springframework.core.io, \
+ org.apache.commons.logging \
  ${jre-${java.specification.version}} 
 
 #org.osgi.framework.bootdelegation=sun.*,com.sun.*
@@ -31,10 +30,11 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
 # file:bundle/org.apache.felix.bundlerepository-1.2.0.jar
 
 felix.auto.start.1= \
+ reference:file:/home/mbaudier/dev/src/slc/sandbox/argeo.slc.jemmytest/bin/ \
+ reference:file:/home/mbaudier/dev/src/slc/org.argeo.slc.autoui/bin/ \
  ${argeo.slc.mavenBase}org/apache/felix/org.apache.felix.shell/1.0.2/org.apache.felix.shell-1.0.2.jar \
  ${argeo.slc.mavenBase}org/apache/felix/org.apache.felix.shell.tui/1.0.2/org.apache.felix.shell.tui-1.0.2.jar \
- ${argeo.slc.mavenBase}org/argeo/dep/jemmy/org.argeo.dep.jemmy.nb61/0.2.2/org.argeo.dep.jemmy.nb61-0.2.2.jar \
- reference:file:/home/mbaudier/dev/src/slc/sandbox/argeo.slc.jemmytest/bin/
+ ${argeo.slc.mavenBase}org/argeo/dep/jemmy/org.argeo.dep.jemmy.nb61/0.2.2/org.argeo.dep.jemmy.nb61-0.2.2.jar
 # ${argeo.slc.mavenBase}org/argeo/slc/sandbox/org.argeo.slc.sandbox.jemmytest/0.1.2-SNAPSHOT/org.argeo.slc.sandbox.jemmytest-0.1.2-SNAPSHOT.jar"