X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.detached.launcher%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fdetached%2Flauncher%2Ffelix.properties;h=d2d2d888e3302535ea37ee62f23811725fe72634;hb=cdbbb88bcb735919c4e23bc2aeafd3b4354d1975;hp=7ac5502b9990dfb76bb21fee7cdec2e163bbc121;hpb=e9bf6784cb0121a665e7d9b4af8a4e4381dadb8a;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties b/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
index 7ac5502b9..d2d2d888e 100644
--- a/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
+++ b/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
@@ -1,9 +1,6 @@
  
 # Argeo Specific Context Properties
-argeo.slc.mavenBase=file:${user.home}/.m2/repository/
-
-argeo.scl.autoui.uiclass=org.argeo.slc.testui.SwingTestUi
-argeo.slc.autoui.uiargs=noExitOnClose
+argeo.slc.mavenBase=file:${user.home}/.m2/repository
 
 #
 # Framework config properties.
@@ -13,28 +10,36 @@ 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.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.apache.commons.logging \
+ org.w3c.dom, \
+ org.apache.commons.io; version=1.4.0, \
+ org.apache.commons.io.filefilter; version=1.4.0, \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.stream \
  ${jre-${java.specification.version}} 
 
 #org.osgi.framework.bootdelegation=sun.*,com.sun.*
 #felix.cache.profile=foo
-#felix.auto.start.1= \
-# file:bundle/org.apache.felix.shell-1.0.2.jar \
-# file:bundle/org.apache.felix.shell.tui-1.0.2.jar \
-# file:bundle/org.apache.felix.bundlerepository-1.2.0.jar
 
 felix.auto.start.1= \
- reference:file:${user.dir}/../sandbox/argeo.slc.jemmytest/bin/ \
- reference:file:${user.dir}/../org.argeo.slc.detached/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
+ file:${slc.detached.jar} \
+ file:${slc.home}/lib/detached/org.apache.felix.shell-1.0.2.jar \
+ file:${slc.home}/lib/detached/org.apache.felix.shell.tui-1.0.2.jar \
+ file:${slc.home}/lib/detached/com.springsource.org.apache.commons.logging-1.1.1.jar \
+ file:${slc.home}/lib/detached/com.springsource.org.apache.log4j-1.2.15.jar \
+ file:${slc.home}/lib/detached/org.springframework.aop-2.5.6.A.jar \
+ file:${slc.home}/lib/detached/org.springframework.beans-2.5.6.A.jar \
+ file:${slc.home}/lib/detached/org.springframework.context-2.5.6.A.jar \
+ file:${slc.home}/lib/detached/org.springframework.core-2.5.6.A.jar \
+ file:${slc.home}/lib/org.argeo.dep.jemmy.nb61-0.2.2.jar \
+ ${slc.detached.userBundles}
+
+#felix.auto.start.1= \
+# reference:file:${user.dir}/../sandbox/argeo.slc.jemmytest/bin/ \
+# reference:file:${user.dir}/../org.argeo.slc.detached/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
 # ${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"