Changeset 24031 in osm

Timestamp:

2010-11-02T21:25:29+01:00 (15 years ago)

Author:

postfix

Message:

'smed with embeddes felix and DS'

Location:

applications/editors/josm/plugins/smed_fw

Files:

• build.xml (modified) (1 diff)
• src/smed_fw/RunFW.java (modified) (3 diffs)
• src/smed_fw/SmedFW.java (modified) (3 diffs)

applications/editors/josm/plugins/smed_fw/build.xml

@@ -31 +31 @@
 
         <!-- 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" />

applications/editors/josm/plugins/smed_fw/src/smed_fw/RunFW.java

@@ -17 +17 @@
 import org.osgi.framework.Constants;
 
+import smed_fw.io.JARFileFilter;
+
 public class RunFW implements BundleActivator{
         
@@ -31 +33 @@
         
                 File pluginDir = Main.pref.getPluginsDirectory();
-        pluginDirName = pluginDir.getAbsolutePath();
+                pluginDirName = pluginDir.getAbsolutePath()+ "/";
                 
         
@@ -60 +62 @@
         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();
+                        }
+                }
         }
 

applications/editors/josm/plugins/smed_fw/src/smed_fw/SmedFW.java

@@ -6 +6 @@
 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 +34 @@
         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 +70 @@
                                 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 ));