Index: applications/editors/josm/plugins/smed_fw/build.xml
===================================================================
--- applications/editors/josm/plugins/smed_fw/build.xml (revision 23907)
+++ applications/editors/josm/plugins/smed_fw/build.xml (revision 23913)
@@ -40,5 +40,5 @@
** should not be necessary to change the following properties
-->
-
+
@@ -104,4 +104,7 @@
+
+
+
+
Index: applications/editors/josm/plugins/smed_fw/src/smed_fw/RunFW.java
===================================================================
--- applications/editors/josm/plugins/smed_fw/src/smed_fw/RunFW.java (revision 23913)
+++ applications/editors/josm/plugins/smed_fw/src/smed_fw/RunFW.java (revision 23913)
@@ -0,0 +1,78 @@
+package smed_fw;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.felix.framework.Felix;
+import org.apache.felix.framework.cache.BundleCache;
+import org.apache.felix.framework.util.FelixConstants;
+import org.openstreetmap.josm.Main;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
+
+public class RunFW implements BundleActivator{
+
+ private BundleContext context;
+ private Felix felix;
+ private String pluginDirName;
+
+
+ @SuppressWarnings("unchecked")
+ public void init() {
+ Map config = new HashMap();
+ List list = new ArrayList();
+
+
+ File pluginDir = Main.pref.getPluginsDirectory();
+ pluginDirName = pluginDir.getAbsolutePath();
+
+
+
+ list.add(this);
+ // config.put(AutoProcessor.AUTO_START_PROP + ".1",
+ // "file:" + pluginDirName + "/bundle/de.vogella.felix.firstbundle_1.0.0.201010271606.jar");
+ config.put(BundleCache.CACHE_ROOTDIR_PROP, pluginDirName);
+ config.put(Constants.FRAMEWORK_STORAGE_CLEAN,"onFirstInit");
+ config.put(FelixConstants.LOG_LEVEL_PROP, "4");
+ config.put(FelixConstants.SYSTEMBUNDLE_ACTIVATORS_PROP, list);
+
+ // Now create an instance of the framework with
+ // our configurations properties
+ felix = new Felix(config);
+
+ // now start Felix instance
+ try {
+ felix.start();
+ } catch (BundleException e) {
+ System.err.println("Could not generate framework: " + e);
+ e.printStackTrace();
+ }
+ }
+
+
+ @Override
+ 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();
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ System.out.println("Framework gestoppt");
+ context = null;
+ }
+
+ public Bundle[] getBundles() {
+ if(context != null) return context.getBundles();
+
+ return null;
+ }
+}
Index: applications/editors/josm/plugins/smed_fw/src/smed_fw/SmedFW.java
===================================================================
--- applications/editors/josm/plugins/smed_fw/src/smed_fw/SmedFW.java (revision 23907)
+++ applications/editors/josm/plugins/smed_fw/src/smed_fw/SmedFW.java (revision 23913)
@@ -1,64 +1,95 @@
package smed_fw;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
-import org.apache.felix.framework.Felix;
-import org.apache.felix.framework.util.FelixConstants;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.plugins.Plugin;
import org.openstreetmap.josm.plugins.PluginInformation;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-public class SmedFW extends Plugin implements BundleActivator{
+import smed_fw.io.JARFileFilter;
+import smed_fw.io.SmedFWFile;
- private BundleContext context;
- private Felix felix;
+public class SmedFW extends Plugin {
+
+ public static final String FW_BIN_DIR = "bin";
+ public static final String FW_SMED_JAR = "smed_fw.jar";
+ public static final String FW_NAME = "felix.jar";
+ public static final String FW_BUNDLE_LOCATION = "fwplug";
public SmedFW(PluginInformation info) {
super(info);
+
+ JarEntry e = null;
+ BufferedInputStream inp = null;
+ byte[] buffer = new byte[16384];
+ int len;
+
+ String eName = null;
+ String pluginDirName = Main.pref.getPluginsDirectory().getAbsolutePath() + "/";
+ File fwDir = new File(pluginDirName + FW_BIN_DIR);
+
+ if(!fwDir.exists()) fwDir.mkdir();
+
+ SmedFWFile fwplugDir = new SmedFWFile(pluginDirName + FW_BUNDLE_LOCATION);
+ if(!fwplugDir.exists()) fwplugDir.mkdir();
- init();
+ File[] jars = fwplugDir.listFiles(new JARFileFilter());
+
+ // extract framework and plugins
+ try {
+ JarFile file = new JarFile(pluginDirName + FW_SMED_JAR);
+
+ boolean fwFound = false;
+ FileOutputStream pfos = null;
+ Enumeration ent = file.entries();
+ while(ent.hasMoreElements()) {
+ e = ent.nextElement();
+ eName = e.getName();
+
+ if(eName.endsWith(".jar")) {
+ if(eName.equals(FW_NAME)) {
+ pfos = new FileOutputStream(pluginDirName + FW_BIN_DIR + "/" + FW_NAME);
+ fwFound = true;
+ }
+ else {
+ pfos = new FileOutputStream(pluginDirName + FW_BUNDLE_LOCATION + "/" + eName);
+ fwFound = false;
+ }
+ if(fwFound || fwplugDir.needUpdate(jars,eName)) {
+ BufferedOutputStream pos = new BufferedOutputStream(pfos);
+ inp = new BufferedInputStream(file.getInputStream( e ));
+
+ while ((len = inp.read(buffer)) > 0) pos.write(buffer, 0, len);
+
+ pos.flush();
+ pos.close();
+ inp.close();
+ pfos.close();
+ }
+ }
+ }
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+
+ RunFW runFW = new RunFW();
+ runFW.init();
System.out.println("SmedFW (OSGi-Implementation) noch nicht weiter programmiert");
}
-
- private void init() {
- Map config = new HashMap();
- List list = new ArrayList();
-
- list.add(this);
- config.put(FelixConstants.SYSTEMBUNDLE_ACTIVATORS_PROP, list);
-
- // Now create an instance of the framework with
- // our configurations properties
- felix = new Felix(config);
-
- // now start Felix instance
- try {
- felix.start();
- } catch (BundleException e) {
- System.err.println("Could not generate framework: " + e);
- e.printStackTrace();
- }
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- this.context = context;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- context = null;
- }
- public Bundle[] getBundles() {
- if(context != null) return context.getBundles();
-
- return null;
+ public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+ if (oldFrame == null && newFrame != null) {
+ System.out.println("josm zeigt Karte");
+ } else {
+ System.out.println("josm zeigt keine Karte");
+ }
}
Index: applications/editors/josm/plugins/smed_fw/src/smed_fw/io/JARFileFilter.java
===================================================================
--- applications/editors/josm/plugins/smed_fw/src/smed_fw/io/JARFileFilter.java (revision 23913)
+++ applications/editors/josm/plugins/smed_fw/src/smed_fw/io/JARFileFilter.java (revision 23913)
@@ -0,0 +1,13 @@
+package smed_fw.io;
+
+import java.io.File;
+import java.io.FileFilter;
+
+public class JARFileFilter implements FileFilter {
+
+ @Override
+ public boolean accept(File f) {
+ return f.getName().toLowerCase().endsWith(".jar");
+ }
+
+}
Index: applications/editors/josm/plugins/smed_fw/src/smed_fw/io/SmedFWFile.java
===================================================================
--- applications/editors/josm/plugins/smed_fw/src/smed_fw/io/SmedFWFile.java (revision 23913)
+++ applications/editors/josm/plugins/smed_fw/src/smed_fw/io/SmedFWFile.java (revision 23913)
@@ -0,0 +1,36 @@
+package smed_fw.io;
+
+import java.io.File;
+
+public class SmedFWFile extends File{
+
+ public SmedFWFile(String pathname) {
+ super(pathname);
+ }
+
+ /**
+ * show if plugin need update
+ *
+ * @param jars
+ * @param name
+ * @return boolean true/false
+ */
+ public boolean needUpdate(File[] jars, String name) {
+ for(File j : jars) {
+ String jName = j.getName();
+
+ if(jName.length() > 15) { // < 16 isn'nt a SmedFile
+
+ if (jName.substring(16).equals(name.substring(16))) {
+ if(jName.substring(0, 15).compareTo(name.substring(0, 15)) < 0) { // obsolet
+ j.delete();
+ return true;
+ } else return false; // no update needed
+ }
+ }
+ }
+
+ // nothing found -> extract
+ return true;
+ }
+}