Index: /applications/editors/josm/plugins/smed_fw/build.xml
===================================================================
--- /applications/editors/josm/plugins/smed_fw/build.xml	(revision 24030)
+++ /applications/editors/josm/plugins/smed_fw/build.xml	(revision 24031)
@@ -31,5 +31,5 @@
 
 	<!-- enter the SVN commit message -->
-	<property name="commit.message" value="make it actual" />
+	<property name="commit.message" value="smed with embeddes felix and DS" />
 	<!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
 	<property name="plugin.main.version" value="3514" />
Index: /applications/editors/josm/plugins/smed_fw/src/smed_fw/RunFW.java
===================================================================
--- /applications/editors/josm/plugins/smed_fw/src/smed_fw/RunFW.java	(revision 24030)
+++ /applications/editors/josm/plugins/smed_fw/src/smed_fw/RunFW.java	(revision 24031)
@@ -17,4 +17,6 @@
 import org.osgi.framework.Constants;
 
+import smed_fw.io.JARFileFilter;
+
 public class RunFW implements BundleActivator{
 	
@@ -31,5 +33,5 @@
 	
 		File pluginDir = Main.pref.getPluginsDirectory();
-        pluginDirName = pluginDir.getAbsolutePath();
+		pluginDirName = pluginDir.getAbsolutePath()+ "/";
 		
         
@@ -60,7 +62,17 @@
 	public void start(BundleContext context) throws Exception {
 		this.context = context;
-		// Bundle b = context.installBundle("file:" + pluginDirName + "/bundle/de.vogella.felix.firstbundle_1.0.0.201010271606.jar");
-		Bundle b = context.installBundle("file:" + pluginDirName + "/bundle/de.vogella.felix.firstbundle_1.0.0.201010271606.jar");
-		b.start();
+		Bundle b = null;
+		// Bundle b = context.installBundle("file:" + pluginDirName + "bundle/de.vogella.felix.firstbundle_1.0.0.201010271606.jar");
+		// Bundle b = context.installBundle("file:" + pluginDirName + "bundle/de.vogella.felix.firstbundle_1.0.0.201010271606.jar");
+		// b.start();
+		File plugDir = new File(pluginDirName + SmedFW.FW_BUNDLE_LOCATION);
+		
+		File[] plugins = plugDir.listFiles(new JARFileFilter());
+		if(plugins != null) {
+			for(File p : plugins) {
+				b = context.installBundle("file:" + p.getAbsolutePath());
+				b.start();
+			}
+		}
 	}
 
Index: /applications/editors/josm/plugins/smed_fw/src/smed_fw/SmedFW.java
===================================================================
--- /applications/editors/josm/plugins/smed_fw/src/smed_fw/SmedFW.java	(revision 24030)
+++ /applications/editors/josm/plugins/smed_fw/src/smed_fw/SmedFW.java	(revision 24031)
@@ -6,5 +6,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -32,4 +34,8 @@
         byte[] buffer = new byte[16384];
         int len;
+        List<String> lib = new ArrayList<String>();
+        
+        lib.add("org.apache.felix.scr-1.4.0.jar");
+        lib.add("osgi.cmpn-4.2.1.jar");
 
         String eName = null;
@@ -64,5 +70,5 @@
                 		fwFound = false;
                 	}
-                	if(fwFound || fwplugDir.needUpdate(jars,eName)) {
+                	if(fwFound || lib.contains(eName)|| fwplugDir.needUpdate(jars,eName)) {
                 		BufferedOutputStream pos = new BufferedOutputStream(pfos);
                 		inp = new BufferedInputStream(file.getInputStream( e ));