You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ds...@apache.org on 2010/09/01 17:18:02 UTC

svn commit: r991568 [1/2] - in /felix/trunk/sigil/eclipse: core/src/org/apache/felix/sigil/eclipse/ core/src/org/apache/felix/sigil/eclipse/internal/model/repository/ core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/ core/src/org/apa...

Author: dsavage
Date: Wed Sep  1 15:18:01 2010
New Revision: 991568

URL: http://svn.apache.org/viewvc?rev=991568&view=rev
Log:
further work on FELIX-1355 - now able to browse repositories defined by projects
involved refactoring of IRepositoryModel and associated classes

Added:
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/ExtensionUtils.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryConfig.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryManager.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseBundleRepository.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/GlobalRepositoryConfig.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/GlobalRepositoryManager.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IEclipseBundleRepository.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IRepositoryCache.java
      - copied, changed from r991152, felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IRepositoryMap.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/ProjectRepositoryConfig.java
      - copied, changed from r991152, felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryConfig.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/ProjectRepositoryManager.java
      - copied, changed from r991152, felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryManager.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/RepositoryCache.java
      - copied, changed from r991152, felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/RepositoryMap.java
Removed:
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/GlobalRepositoryManager.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/eclipse/SigilRepositoryManager.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryConfig.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryManager.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IRepositoryMap.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/RepositoryMap.java
Modified:
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryPreferences.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryFactory.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/SigilProjectManager.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryPreferences.java
    felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java
    felix/trunk/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java
    felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/repository/RepositoriesView.java
    felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/repository/RepositoryTypeSelectionPage.java
    felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java
    felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/views/RepositoryViewPart.java
    felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/util/ModelLabelProvider.java
    felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/wizard/repository/RepositoryWizardPage.java

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/SigilCore.java Wed Sep  1 15:18:01 2010
@@ -34,7 +34,6 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.felix.sigil.common.config.IBldProject;
 import org.apache.felix.sigil.common.core.BldCore;
 import org.apache.felix.sigil.common.model.ICapabilityModelElement;
-import org.apache.felix.sigil.common.model.ModelElementFactory;
 import org.apache.felix.sigil.common.model.eclipse.ISigilBundle;
 import org.apache.felix.sigil.common.repository.IBundleRepository;
 import org.apache.felix.sigil.common.repository.IRepositoryManager;
@@ -43,14 +42,15 @@ import org.apache.felix.sigil.common.rep
 import org.apache.felix.sigil.eclipse.install.IOSGiInstallManager;
 import org.apache.felix.sigil.eclipse.internal.install.OSGiInstallManager;
 import org.apache.felix.sigil.eclipse.internal.model.project.SigilModelRoot;
-import org.apache.felix.sigil.eclipse.internal.model.project.SigilProject;
 import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryPreferences;
-import org.apache.felix.sigil.eclipse.internal.repository.eclipse.GlobalRepositoryManager;
-import org.apache.felix.sigil.eclipse.internal.repository.manager.RepositoryMap;
+import org.apache.felix.sigil.eclipse.internal.repository.manager.GlobalRepositoryManager;
+import org.apache.felix.sigil.eclipse.internal.repository.manager.IEclipseBundleRepository;
+import org.apache.felix.sigil.eclipse.internal.repository.manager.RepositoryCache;
 import org.apache.felix.sigil.eclipse.internal.resources.ProjectResourceListener;
 import org.apache.felix.sigil.eclipse.internal.resources.SigilProjectManager;
 import org.apache.felix.sigil.eclipse.model.project.ISigilModelRoot;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryPreferences;
 import org.apache.felix.sigil.eclipse.model.util.JavaHelper;
 import org.eclipse.core.resources.ICommand;
@@ -76,7 +76,6 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
 
 /**
  * The activator class controls the plug-in life cycle
@@ -142,15 +141,11 @@ public class SigilCore extends AbstractU
     // The shared instance
     private static SigilCore plugin;
 
-    private ServiceTracker descriptorTracker;
-    private ServiceTracker registryTracker;
-    private ServiceTracker serializerTracker;
-    private static IRepositoryPreferences repositoryPrefs;
+    private static RepositoryPreferences repositoryPrefs;
     private static SigilProjectManager projectManager;
     private static OSGiInstallManager installs;
     private static ISigilModelRoot modelRoot;
     private static GlobalRepositoryManager globalRepositoryManager;
-    private static RepositoryMap repositoryMap;
 
     /**
      * Returns the shared instance
@@ -268,18 +263,17 @@ public class SigilCore extends AbstractU
     {
         super.start(context);
 
-        modelRoot = new SigilModelRoot();
+        RepositoryCache repositoryCache = new RepositoryCache();
+        projectManager = new SigilProjectManager(repositoryCache);
 
-        repositoryPrefs = new RepositoryPreferences();
+        modelRoot = new SigilModelRoot();
 
         installs = new OSGiInstallManager();
 
-        repositoryMap = new RepositoryMap();
-        globalRepositoryManager = new GlobalRepositoryManager(repositoryMap);
+        repositoryPrefs = new RepositoryPreferences();
+        globalRepositoryManager = new GlobalRepositoryManager(repositoryCache);
         globalRepositoryManager.initialise();
 
-        projectManager = new SigilProjectManager();
-
         registerModelElements(context);
         registerResourceListeners();
     }
@@ -293,26 +287,11 @@ public class SigilCore extends AbstractU
      */
     public void stop(BundleContext context) throws Exception
     {
-        if (descriptorTracker != null)
-        {
-            descriptorTracker.close();
-            descriptorTracker = null;
-        }
-
-        if (registryTracker != null)
-        {
-            registryTracker.close();
-            registryTracker = null;
-        }
-
-        if (serializerTracker != null)
-        {
-            serializerTracker.close();
-            serializerTracker = null;
-        }
-
         globalRepositoryManager.destroy();
         globalRepositoryManager = null;
+        
+        projectManager.destroy();
+        projectManager = null;
 
         plugin = null;
 
@@ -404,8 +383,6 @@ public class SigilCore extends AbstractU
     {
         // trick to get eclipse to lazy load BldCore for model elements
         BldCore.getLicenseManager();
-        ModelElementFactory.getInstance().register(ISigilProjectModel.class,
-            SigilProject.class, "project", "sigil", null);
     }
 
     public static IOSGiInstallManager getInstallManager()
@@ -428,7 +405,7 @@ public class SigilCore extends AbstractU
         if ( model == null ) return globalRepositoryManager;
         try
         {
-            return projectManager.getRepositoryManager(model, repositoryMap);
+            return projectManager.getRepositoryManager(model);
         }
         catch (CoreException e)
         {
@@ -436,6 +413,16 @@ public class SigilCore extends AbstractU
             return globalRepositoryManager;
         }        
     }
+    
+    /**
+     * @param rep
+     * @return
+     */
+    public static IRepositoryModel getRepositoryModel(IBundleRepository rep)
+    {
+        IEclipseBundleRepository cast = (IEclipseBundleRepository) rep;
+        return cast.getModel();
+    }    
 
     public static IRepositoryPreferences getRepositoryPreferences()
     {

Added: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/ExtensionUtils.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/ExtensionUtils.java?rev=991568&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/ExtensionUtils.java (added)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/ExtensionUtils.java Wed Sep  1 15:18:01 2010
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.felix.sigil.eclipse.internal.model.repository;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.swt.graphics.Image;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author dave
+ *
+ */
+public class ExtensionUtils
+{
+    public static List<IRepositoryType> loadRepositoryTypes()
+    {
+        List<IRepositoryType> repositories = new ArrayList<IRepositoryType>();
+
+        IExtensionRegistry registry = Platform.getExtensionRegistry();
+
+        IExtensionPoint p = registry.getExtensionPoint(SigilCore.REPOSITORY_PROVIDER_EXTENSION_POINT_ID);
+
+        for (IExtension e : p.getExtensions())
+        {
+            for (IConfigurationElement c : e.getConfigurationElements())
+            {
+                repositories.add(toRepositoryType(e, c));
+            }
+        }
+
+        return repositories;
+    }
+    
+    /**
+     * @param ext 
+     * @param conf
+     * @return
+     */
+    public static IRepositoryType toRepositoryType(IExtension ext, IConfigurationElement conf)
+    {
+        String id = conf.getAttribute("id");
+        String type = conf.getAttribute("type");
+        boolean dynamic = Boolean.valueOf(conf.getAttribute("dynamic"));
+        String icon = conf.getAttribute("icon");
+        String provider = conf.getAttribute("alias");                
+        Image image = (icon == null || icon.trim().length() == 0) ? null
+            : loadImage(ext, icon);
+        return new RepositoryType(id, provider, type, dynamic, image);
+    }
+    
+    @SuppressWarnings("unchecked")
+    private static Image loadImage(IExtension ext, String icon)
+    {
+        int i = icon.lastIndexOf("/");
+        String path = i == -1 ? "/" : icon.substring(0, i);
+        String name = i == -1 ? icon : icon.substring(i + 1);
+
+        Bundle b = Platform.getBundle(ext.getContributor().getName());
+
+        Enumeration<URL> en = b.findEntries(path, name, false);
+        Image image = null;
+
+        if (en.hasMoreElements())
+        {
+            try
+            {
+                image = SigilCore.loadImage(en.nextElement());
+            }
+            catch (IOException e)
+            {
+                SigilCore.error("Failed to load image", e);
+            }
+        }
+        else
+        {
+            SigilCore.error("No such image " + icon + " in bundle " + b.getSymbolicName());
+        }
+
+        return image;
+    }
+    
+}

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryModel.java Wed Sep  1 15:18:01 2010
@@ -19,31 +19,46 @@
 
 package org.apache.felix.sigil.eclipse.internal.model.repository;
 
+import java.util.Properties;
+
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
-import org.eclipse.jface.preference.PreferenceStore;
 
 public class RepositoryModel implements IRepositoryModel
 {
-    private String id;
+    public static final String NAME = "name";
 
-    private String name;
+    private String id;
 
     private IRepositoryType type;
 
-    private PreferenceStore preferences;
+    private Properties properties = new Properties();
+    
+    private Throwable throwable;
 
-    public RepositoryModel(String id, String name, IRepositoryType type, PreferenceStore preferences)
+    public RepositoryModel(String id, IRepositoryType type)
     {
         this.id = id;
-        this.name = name;
         this.type = type;
-        this.preferences = preferences;
     }
 
-    public PreferenceStore getPreferences()
+    /**
+     * @param exception 
+     * @param id2
+     * @param type2
+     * @param properties2
+     */
+    public RepositoryModel(String id, IRepositoryType type, Properties properties, Exception exception)
     {
-        return preferences;
+        this.id = id;
+        this.type = type;
+        this.properties = properties;
+        this.throwable = exception;
+    }
+
+    public Properties getProperties()
+    {
+        return properties;
     }
 
     public IRepositoryType getType()
@@ -58,12 +73,16 @@ public class RepositoryModel implements 
 
     public String getName()
     {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
+        if ( getType().isDynamic() ) {
+            String name = properties.getProperty(NAME);
+            if ( name == null ) {
+                name = id;
+            }
+            return name;
+        }
+        else {
+            return getType().getName();
+        }
     }
 
     @Override
@@ -88,6 +107,15 @@ public class RepositoryModel implements 
 
     public String toString()
     {
-        return type.getId() + ":" + id + ":" + name;
+        return type.getId() + ":" + id + ":" + getName();
     }
+
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel#getProblem()
+     */
+    public Throwable getProblem()
+    {
+        return throwable;
+    }
+
 }
\ No newline at end of file

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryPreferences.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryPreferences.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryPreferences.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryPreferences.java Wed Sep  1 15:18:01 2010
@@ -20,33 +20,29 @@
 package org.apache.felix.sigil.eclipse.internal.model.repository;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.UUID;
 
+import org.apache.felix.sigil.common.config.IRepositoryConfig;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryPreferences;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
 import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
 import org.apache.felix.sigil.eclipse.preferences.PrefsUtils;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceStore;
-import org.eclipse.swt.graphics.Image;
-import org.osgi.framework.Bundle;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
 
 public class RepositoryPreferences implements IRepositoryPreferences
 {
@@ -58,19 +54,13 @@ public class RepositoryPreferences imple
     private static final String LOC = ".loc";
     private static final String TIMESTAMP = ".timestamp";
 
-    private static final HashMap<String, String> migrationTable = new HashMap<String, String>();
-    
-    static {
-        migrationTable.put("org.apache.felix.sigil.core.file", "filesystem");
-    }
-
     public List<IRepositoryModel> loadRepositories()
     {
         IPreferenceStore prefs = SigilCore.getDefault().getPreferenceStore();
 
         ArrayList<IRepositoryModel> repositories = new ArrayList<IRepositoryModel>();
 
-        for (RepositoryType type : loadRepositoryTypes())
+        for (IRepositoryType type : loadRepositoryTypes())
         {
             String typeID = type.getId();
 
@@ -159,40 +149,13 @@ public class RepositoryPreferences imple
         }
         prefs.setValue(REPOSITORY_ORDER, PrefsUtils.listToString(ids));
     }
-
-    public List<RepositoryType> loadRepositoryTypes()
-    {
-        List<RepositoryType> repositories = new ArrayList<RepositoryType>();
-
-        IExtensionRegistry registry = Platform.getExtensionRegistry();
-
-        IExtensionPoint p = registry.getExtensionPoint(SigilCore.REPOSITORY_PROVIDER_EXTENSION_POINT_ID);
-
-        for (IExtension e : p.getExtensions())
-        {
-            for (IConfigurationElement c : e.getConfigurationElements())
-            {
-                String id = c.getAttribute("id");
-                String type = c.getAttribute("type");
-                boolean dynamic = Boolean.valueOf(c.getAttribute("dynamic"));
-                String icon = c.getAttribute("icon");
-                String provider = c.getAttribute("alias");                
-                Image image = (icon == null || icon.trim().length() == 0) ? null
-                    : loadImage(e, icon);
-                repositories.add(new RepositoryType(id, provider, type, dynamic, image));
-            }
-        }
-
-        return repositories;
-    }
+    
 
     public IRepositoryModel newRepositoryElement(IRepositoryType type)
     {
         String id = UUID.randomUUID().toString();
-        PreferenceStore prefs = new PreferenceStore();
-        RepositoryModel element = new RepositoryModel(id, "", type, prefs);
-        prefs.setFilename(makeFileName(element));
-        prefs.setValue("id", id);
+        RepositoryModel element = new RepositoryModel(id, type);
+        element.getProperties().setProperty("id", id);
         return element;
     }
 
@@ -264,7 +227,7 @@ public class RepositoryPreferences imple
         }
     }
 
-    private static void saveRepositoryPreferences(List<IRepositoryModel> repositories,
+    private void saveRepositoryPreferences(List<IRepositoryModel> repositories,
         HashMap<IRepositoryType, List<IRepositoryModel>> mapped) throws CoreException
     {
         for (IRepositoryModel rep : repositories)
@@ -272,7 +235,7 @@ public class RepositoryPreferences imple
             try
             {
                 createDir(makeFileName(rep));
-                rep.getPreferences().save();
+                toPreferenceStore(rep).save();
                 List<IRepositoryModel> list = mapped.get(rep.getType());
                 if (list == null)
                 {
@@ -299,10 +262,6 @@ public class RepositoryPreferences imple
     {
         String key = makeKey(element);
         prefs.setValue(key + LOC, makeFileName(element));
-        if (element.getType().isDynamic())
-        {
-            prefs.setValue(key + NAME, element.getName());
-        }
         prefs.setValue(key + TIMESTAMP, now());
     }
 
@@ -331,13 +290,10 @@ public class RepositoryPreferences imple
         return path.toOSString();
     }
 
-    private static RepositoryModel loadRepository(String id, String key,
-        RepositoryType type, IPreferenceStore prefs)
+    private RepositoryModel loadRepository(String id, String key,
+        IRepositoryType type, IPreferenceStore prefs)
     {
-        String name = type.isDynamic() ? prefs.getString(key + NAME) : type.getType();
-
-        PreferenceStore repPrefs = new PreferenceStore();
-        RepositoryModel element = new RepositoryModel(id, name, type, repPrefs);
+        RepositoryModel element = new RepositoryModel(id, type);
 
         String loc = prefs.getString(key + LOC);
 
@@ -346,54 +302,78 @@ public class RepositoryPreferences imple
             loc = makeFileName(element);
         }
 
-        repPrefs.setFilename(loc);
-
         if (new File(loc).exists())
         {
+            FileInputStream in = null; 
             try
             {
-                repPrefs.load();
+                in = new FileInputStream(loc);
+                Properties props = element.getProperties();
+                props.load(in);
+                
+                if (type.isDynamic() && !props.containsKey(RepositoryModel.NAME)) {
+                    String name = prefs.getString(key + NAME);
+                    props.setProperty(RepositoryModel.NAME, name);
+                }
+                
+                if (!props.containsKey(IRepositoryConfig.REPOSITORY_PROVIDER)) {
+                    props.put(IRepositoryConfig.REPOSITORY_PROVIDER, type.getProvider());
+                }
+
             }
             catch (IOException e)
             {
                 SigilCore.error("Failed to load properties for repository " + key, e);
             }
+            finally {
+                if ( in != null ) {
+                    try
+                    {
+                        in.close();
+                    }
+                    catch (IOException e)
+                    {
+                        SigilCore.error("Failed to close properties file " + loc, e);
+                    }
+                }
+            }
         }
 
-        repPrefs.setValue("id", id);
+        element.getProperties().setProperty("id", id);
 
         return element;
     }
 
-    @SuppressWarnings("unchecked")
-    private static Image loadImage(IExtension ext, String icon)
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.eclipse.model.repository.IRepositoryPreferences#loadRepositoryTypes()
+     */
+    public List<IRepositoryType> loadRepositoryTypes()
     {
-        int i = icon.lastIndexOf("/");
-        String path = i == -1 ? "/" : icon.substring(0, i);
-        String name = i == -1 ? icon : icon.substring(i + 1);
-
-        Bundle b = Platform.getBundle(ext.getContributor().getName());
+        return ExtensionUtils.loadRepositoryTypes();
+    }
 
-        Enumeration<URL> en = b.findEntries(path, name, false);
-        Image image = null;
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.eclipse.model.repository.IRepositoryPreferences#getPreferenceStore(org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel)
+     */
+    public PreferenceStore toPreferenceStore(final IRepositoryModel model)
+    {
+        PreferenceStore store = new PreferenceStore();
+        store.setFilename(makeFileName(model));
+        
+        for (Map.Entry<Object, Object> e : model.getProperties().entrySet()) {
+            store.setValue((String) e.getKey(), (String) e.getValue());
+        }
+        
+        store.setValue("provider", model.getType().getProvider());
 
-        if (en.hasMoreElements())
-        {
-            try
+        store.addPropertyChangeListener(new IPropertyChangeListener()
+        {            
+            public void propertyChange(PropertyChangeEvent event)
             {
-                image = SigilCore.loadImage(en.nextElement());
+                model.getProperties().setProperty(event.getProperty(), (String) event.getNewValue());
             }
-            catch (IOException e)
-            {
-                SigilCore.error("Failed to load image", e);
-            }
-        }
-        else
-        {
-            SigilCore.error("No such image " + icon + " in bundle " + b.getSymbolicName());
-        }
-
-        return image;
+        });
+        
+        return store;
     }
-
 }

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/model/repository/RepositoryType.java Wed Sep  1 15:18:01 2010
@@ -39,7 +39,7 @@ public class RepositoryType implements I
         this.icon = icon;
     }
 
-    public String getType()
+    public String getName()
     {
         return type;
     }

Added: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryConfig.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryConfig.java?rev=991568&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryConfig.java (added)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryConfig.java Wed Sep  1 15:18:01 2010
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.felix.sigil.eclipse.internal.repository.manager;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.felix.sigil.common.config.IRepositoryConfig;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+/**
+ * @author dave
+ *
+ */
+public abstract class AbstractEclipseRepositoryConfig implements IRepositoryConfig
+{
+
+    protected abstract IRepositoryConfig[] getConfigs();
+    
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.common.config.IRepositoryConfig#getAllRepositories()
+     */
+    public List<String> getAllRepositories()
+    {
+        ArrayList<String> list = new ArrayList<String>();
+        for (IRepositoryConfig c : getConfigs()) {
+            list.addAll(c.getAllRepositories());
+        }
+        list.addAll(readRepositoryNames());
+        return list;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.common.config.IRepositoryConfig#getRepositoryConfig(java.lang.String)
+     */
+    public Properties getRepositoryConfig(String name)
+    {
+        Properties props = null;
+        for(IRepositoryConfig c : getConfigs()) {
+            props = c.getRepositoryConfig(name);
+            if ( props != null ) {
+                if ( !props.containsKey(RepositoryModel.NAME)) {
+                    props.setProperty(RepositoryModel.NAME, name);
+                }
+                break;
+            }
+        }
+        if ( props == null ) {
+            props = readRepositoryConfig(name);
+        }
+        return props;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.common.config.IRepositoryConfig#getRepositoryDefinition(java.lang.String)
+     */
+    public URI getRepositoryDefinition(String name)
+    {
+        URI def = null;
+        for(IRepositoryConfig c : getConfigs()) {
+            def = c.getRepositoryDefinition(name);
+            if ( def != null ) {
+                break;
+            }
+        }
+        if ( def == null ) {
+            if ( readRepositoryNames().contains(name) ) {
+                def = URI.create("sigil:eclipse:preferences");
+            }
+        }
+        return def;
+    }
+
+    /**
+     * @return
+     */
+    static List<String> readRepositoryNames()
+    {
+        List<IRepositoryModel> models = findRepositories();
+        ArrayList<String> repos = new ArrayList<String>(models.size());
+        for (IRepositoryModel repo : models)
+        {
+            String id = repo.getId();
+            repos.add(id);
+        }
+        
+        return repos;
+    }
+
+    static Properties readRepositoryConfig(String name) {
+        for (IRepositoryModel repo : findRepositories())
+        {
+            String id = repo.getId();
+            if ( name.equals(id) ) {
+                return repo.getProperties();
+            }
+        }
+        
+        // ok not found
+        return null;
+    }
+    
+    private static final List<IRepositoryModel> findRepositories()
+    {
+        return SigilCore.getRepositoryPreferences().loadRepositories();
+    }    
+}

Added: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryManager.java?rev=991568&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryManager.java (added)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/AbstractEclipseRepositoryManager.java Wed Sep  1 15:18:01 2010
@@ -0,0 +1,177 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.felix.sigil.eclipse.internal.repository.manager;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.felix.sigil.common.config.IRepositoryConfig;
+import org.apache.felix.sigil.common.repository.AbstractRepositoryManager;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+/**
+ * @author dave
+ *
+ */
+public abstract class AbstractEclipseRepositoryManager extends AbstractRepositoryManager implements IPropertyChangeListener
+{
+    private final IRepositoryConfig config;
+    private final IRepositoryCache repositoryCache;
+    
+    public AbstractEclipseRepositoryManager(IRepositoryConfig config, IRepositoryCache repositoryMap)
+    {
+        this.config = config;
+        this.repositoryCache = repositoryMap;
+    }
+    
+    public IRepositoryConfig getConfig() {
+        return config;
+    }
+    
+    @Override
+    public void initialise()
+    {
+        super.initialise();
+        SigilCore.getDefault().getPreferenceStore().addPropertyChangeListener(this);
+    }
+
+    public void destroy()
+    {
+        IPreferenceStore prefs = SigilCore.getDefault().getPreferenceStore();
+        if (prefs != null)
+        {
+            prefs.removePropertyChangeListener(this);
+        }
+    }    
+
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.common.repository.AbstractRepositoryManager#loadRepositories()
+     */
+    @Override
+    protected void loadRepositories()
+    {
+        List<IBundleRepository> list = new ArrayList<IBundleRepository>();
+        scanRepositories(config.getRepositoryPath(), list);
+        setRepositories(list.toArray(new IBundleRepository[list.size()]));
+    }
+    
+    /**
+     * @param list 
+     * @param config2
+     * @param i
+     */
+    private void scanRepositories(List<String> path, List<IBundleRepository> list)
+    {
+        for (String name : path)
+        {
+            if ( IRepositoryConfig.WILD_CARD.equals(name) ) {
+                HashSet<String> defined = new HashSet<String>();
+                for (String n : path) {
+                    if (!IRepositoryConfig.WILD_CARD.equals(n)) {
+                        defined.add(n);
+                    }
+                }
+                List<String> subpath = new LinkedList<String>();
+                for (String key : config.getAllRepositories()) {
+                    if (!defined.contains(key))
+                    {
+                        subpath.add(key);
+                    }
+                }
+                scanRepositories(subpath, list);
+            }
+            else {
+                Properties props = config.getRepositoryConfig(name);
+                if (props != null) {
+                    String uid = config.getRepositoryDefinition(name).toString() + '#' + name;
+                    IBundleRepository repo = buildRepository(uid, props);
+                    
+                    if ( repo != null ) {
+                        list.add(repo);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @param repo
+     * @return 
+     */
+    private IBundleRepository buildRepository(String uid, Properties repo)
+    {
+        String disabled = repo.getProperty("disabled", "false");
+        if (Boolean.parseBoolean(disabled.trim())) return null;
+        
+        String optStr = repo.getProperty("optional", "false");
+        boolean optional = Boolean.parseBoolean(optStr.trim());
+
+        String alias = repo.getProperty(IRepositoryConfig.REPOSITORY_PROVIDER);
+        if (alias == null)
+        {
+            String msg = "provider not specified for repository: " + uid;
+            
+            if (optional)            
+                SigilCore.log(msg);
+            else
+                SigilCore.warn(msg);
+            
+            return null;
+        }
+
+        try
+        {
+            IRepositoryProvider instance = EclipseRepositoryFactory.getProvider(alias);
+            IBundleRepository repository = repositoryCache.getRepository(uid, repo, instance);
+            return repository;
+        }
+        catch (Exception e)
+        {
+            String msg = "failed to create repository: ";
+            
+            if (optional)            
+                SigilCore.log(msg + e);
+            else
+                SigilCore.warn(msg, e);
+        }
+        
+        return null;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
+     */
+    public void propertyChange(PropertyChangeEvent event)
+    {
+        if (event.getProperty().equals("repository.order"))
+        {
+            loadRepositories();
+        }
+    }
+
+}

Added: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseBundleRepository.java?rev=991568&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseBundleRepository.java (added)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseBundleRepository.java Wed Sep  1 15:18:01 2010
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.felix.sigil.eclipse.internal.repository.manager;
+
+import java.util.HashSet;
+import java.util.Properties;
+
+import org.apache.felix.sigil.common.repository.AbstractBundleRepository;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IBundleRepositoryListener;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.IRepositoryVisitor;
+import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
+
+/**
+ * @author dave
+ *
+ */
+public class EclipseBundleRepository extends AbstractBundleRepository implements IEclipseBundleRepository
+{
+    
+    private final IRepositoryProvider provider;
+    private final Properties properties;
+    private final IRepositoryType type;
+    
+    private final HashSet<IBundleRepositoryListener> listeners = new HashSet<IBundleRepositoryListener>();
+    
+    private Exception exception;
+    private IBundleRepository delegate;
+
+    /**
+     * @param provider
+     * @param type 
+     * @param id
+     * @param properties
+     */
+    public EclipseBundleRepository(IRepositoryProvider provider, IRepositoryType type, String id, Properties properties)
+    {
+        super(id);
+        this.provider = provider;
+        this.type = type;
+        this.properties = properties;
+    }
+    
+    private synchronized IBundleRepository getDelegate() {
+        if (delegate == null && exception == null) {
+            try
+            {
+                delegate = provider.createRepository(getId(), properties);
+                for (IBundleRepositoryListener listener : listeners) {
+                    delegate.addBundleRepositoryListener(listener);
+                }
+                exception = null;
+            }
+            catch (Exception e)
+            {
+                delegate = null;
+                exception = e;
+            }
+        }
+        
+        return delegate;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.common.repository.IBundleRepository#accept(org.apache.felix.sigil.common.repository.IRepositoryVisitor, int)
+     */
+    public void accept(IRepositoryVisitor visitor, int options)
+    {
+        IBundleRepository delegate = getDelegate();
+        if ( delegate != null ) {
+            delegate.accept(visitor, options);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.common.repository.IBundleRepository#addBundleRepositoryListener(org.apache.felix.sigil.common.repository.IBundleRepositoryListener)
+     */
+    public synchronized void addBundleRepositoryListener(IBundleRepositoryListener listener)
+    {
+        IBundleRepository delegate = getDelegate();
+        if ( delegate != null ) {
+            delegate.addBundleRepositoryListener(listener);
+        }
+        else {
+            listeners.add(listener);
+        }
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.common.repository.IBundleRepository#removeBundleRepositoryListener(org.apache.felix.sigil.common.repository.IBundleRepositoryListener)
+     */
+    public synchronized void removeBundleRepositoryListener(IBundleRepositoryListener listener)
+    {
+        IBundleRepository delegate = getDelegate();
+        if ( delegate != null ) {
+            delegate.removeBundleRepositoryListener(listener);
+        }
+        else {
+            listeners.remove(listener);
+        }
+    }    
+
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.common.repository.IBundleRepository#refresh()
+     */
+    public void refresh()
+    {
+        IBundleRepository delegate = getDelegate();
+        if ( delegate == null ) {
+            exception = null;
+            getDelegate();
+        }
+        else {
+            delegate.refresh();
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.eclipse.internal.repository.manager.IEclipseBundleRepository#getModel()
+     */
+    public IRepositoryModel getModel()
+    {
+        return new RepositoryModel(getId(), type, properties, exception);
+    }
+
+}

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryFactory.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryFactory.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryFactory.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryFactory.java Wed Sep  1 15:18:01 2010
@@ -19,8 +19,13 @@
 
 package org.apache.felix.sigil.eclipse.internal.repository.manager;
 
+import java.util.Properties;
+
+import org.apache.felix.sigil.common.repository.IBundleRepository;
 import org.apache.felix.sigil.common.repository.IRepositoryProvider;
 import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.internal.model.repository.ExtensionUtils;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryType;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
@@ -35,6 +40,28 @@ import org.eclipse.core.runtime.Platform
 public class EclipseRepositoryFactory
 {
 
+    static class EclipseRepositoryProviderWrapper implements IRepositoryProvider {
+        private final IRepositoryProvider delegate;
+        private final IRepositoryType type;
+
+        /**
+         * @param provider
+         * @param type 
+         */
+        public EclipseRepositoryProviderWrapper(IRepositoryProvider provider, IRepositoryType type)
+        {
+            this.delegate = provider;
+            this.type = type;
+        }
+
+        /* (non-Javadoc)
+         * @see org.apache.felix.sigil.common.repository.IRepositoryProvider#createRepository(java.lang.String, java.util.Properties)
+         */
+        public IBundleRepository createRepository(String id, Properties properties)
+        {
+            return new EclipseBundleRepository(delegate, type, id, properties);
+        }
+    }
     /**
      * @param alias
      * @return
@@ -52,11 +79,14 @@ public class EclipseRepositoryFactory
                 if (alias.equals(c.getAttribute("alias")))
                 {
                     IRepositoryProvider provider = (IRepositoryProvider) c.createExecutableExtension("class");
-                    return provider;
+                    IRepositoryType type = ExtensionUtils.toRepositoryType(e, c);
+                    return new EclipseRepositoryProviderWrapper(provider, type);
                 }
             }
         }
 
         return null;
     }
+    
+    
 }

Added: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/GlobalRepositoryConfig.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/GlobalRepositoryConfig.java?rev=991568&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/GlobalRepositoryConfig.java (added)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/GlobalRepositoryConfig.java Wed Sep  1 15:18:01 2010
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.felix.sigil.eclipse.internal.repository.manager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.felix.sigil.common.config.IRepositoryConfig;
+import org.apache.felix.sigil.eclipse.SigilCore;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.eclipse.core.runtime.CoreException;
+
+/**
+ * @author dave
+ *
+ */
+public class GlobalRepositoryConfig extends AbstractEclipseRepositoryConfig
+{
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.common.config.IRepositoryConfig#getRepositoryPath()
+     */
+    public List<String> getRepositoryPath()
+    {
+        return Collections.singletonList(IRepositoryConfig.WILD_CARD);
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.eclipse.internal.repository.manager.AbstractEclipseRepositoryConfig#getConfigs()
+     */
+    @Override
+    protected IRepositoryConfig[] getConfigs()
+    {
+        ArrayList<IRepositoryConfig> list = new ArrayList<IRepositoryConfig>(); 
+        for (ISigilProjectModel p : SigilCore.getRoot().getProjects() ) {
+            try
+            {
+                IRepositoryConfig c = p.getRepositoryConfig();
+                list.add( c );
+            }
+            catch (CoreException e)
+            {
+                SigilCore.error("Failed to read repository config", e);
+            }            
+        }
+        return list.toArray( new IRepositoryConfig[list.size()] );
+    }
+}

Added: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/GlobalRepositoryManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/GlobalRepositoryManager.java?rev=991568&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/GlobalRepositoryManager.java (added)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/GlobalRepositoryManager.java Wed Sep  1 15:18:01 2010
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.felix.sigil.eclipse.internal.repository.manager;
+
+/**
+ * @author dave
+ *
+ */
+public class GlobalRepositoryManager extends AbstractEclipseRepositoryManager
+{
+
+    /**
+     * @param repositoryMap
+     */
+    public GlobalRepositoryManager(IRepositoryCache repositoryMap)
+    {
+        super(new GlobalRepositoryConfig(), repositoryMap);
+    }
+
+}

Added: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IEclipseBundleRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IEclipseBundleRepository.java?rev=991568&view=auto
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IEclipseBundleRepository.java (added)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IEclipseBundleRepository.java Wed Sep  1 15:18:01 2010
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.felix.sigil.eclipse.internal.repository.manager;
+
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
+
+/**
+ * @author dave
+ *
+ */
+public interface IEclipseBundleRepository extends IBundleRepository
+{
+    IRepositoryModel getModel();
+}

Copied: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IRepositoryCache.java (from r991152, felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IRepositoryMap.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IRepositoryCache.java?p2=felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IRepositoryCache.java&p1=felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IRepositoryMap.java&r1=991152&r2=991568&rev=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IRepositoryMap.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/IRepositoryCache.java Wed Sep  1 15:18:01 2010
@@ -19,39 +19,32 @@
 
 package org.apache.felix.sigil.eclipse.internal.repository.manager;
 
+import java.util.Collection;
 import java.util.Properties;
 
 import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
 
 /**
  * @author dave
  *
  */
-public interface IRepositoryMap
+public interface IRepositoryCache
 {
-
-    public static class RepositoryCache
-    {
-        public final Properties pref;
-        public final IBundleRepository repo;
-
-        public RepositoryCache(Properties pref, IBundleRepository repo)
-        {
-            this.pref = pref;
-            this.repo = repo;
-        }
-    }
-
     /**
+     * @param sponsor
      * @param uid
+     * @param props
+     * @param instance
      * @return
+     * @throws RepositoryException
      */
-    RepositoryCache get(String uid);
+    IBundleRepository getRepository(String uid, Properties props,
+        IRepositoryProvider instance) throws RepositoryException;
 
     /**
-     * @param uid
-     * @param cache
+     * @param flush
      */
-    void put(String uid, RepositoryCache cache);
-
+    void discard(Collection<String> ids);
 }

Copied: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/ProjectRepositoryConfig.java (from r991152, felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryConfig.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/ProjectRepositoryConfig.java?p2=felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/ProjectRepositoryConfig.java&p1=felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryConfig.java&r1=991152&r2=991568&rev=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryConfig.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/ProjectRepositoryConfig.java Wed Sep  1 15:18:01 2010
@@ -19,68 +19,26 @@
 
 package org.apache.felix.sigil.eclipse.internal.repository.manager;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Properties;
-
 import org.apache.felix.sigil.common.config.IRepositoryConfig;
-import org.apache.felix.sigil.eclipse.SigilCore;
-import org.apache.felix.sigil.eclipse.model.repository.IRepositoryModel;
-import org.eclipse.jface.preference.IPreferenceStore;
 
 /**
  * @author dave
  *
  */
-public class EclipseRepositoryConfig implements IRepositoryConfig
+public class ProjectRepositoryConfig extends AbstractEclipseRepositoryConfig
 {
 
     private final IRepositoryConfig projectConfig;
     
-    public EclipseRepositoryConfig(IRepositoryConfig projectConfig) {
+    public ProjectRepositoryConfig(IRepositoryConfig projectConfig) {
         this.projectConfig = projectConfig;
     }
     
-    /* (non-Javadoc)
-     * @see org.apache.felix.sigil.common.config.IRepositoryConfig#getAllRepositories()
-     */
-    public List<String> getAllRepositories()
-    {
-        ArrayList<String> list = new ArrayList<String>(projectConfig.getAllRepositories());
-        list.addAll(readRepositoryNames());
-        return list;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.felix.sigil.common.config.IRepositoryConfig#getRepositoryConfig(java.lang.String)
-     */
-    public Properties getRepositoryConfig(String name)
-    {
-        Properties props = projectConfig.getRepositoryConfig(name);
-        if ( props == null ) {
-            props = readRepositoryConfig(name);
-        }
-        return props;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.felix.sigil.common.config.IRepositoryConfig#getRepositoryDefinition(java.lang.String)
-     */
-    public URI getRepositoryDefinition(String name)
-    {
-        URI def = projectConfig.getRepositoryDefinition(name);
-        if ( def == null ) {
-            if ( readRepositoryNames().contains(name) ) {
-                def = URI.create("sigil:eclipse:preferences");
-            }
-        }
-        return def;
+    protected IRepositoryConfig[] getConfigs() {
+        return new IRepositoryConfig[] { projectConfig };
     }
-
+    
     /* (non-Javadoc)
      * @see org.apache.felix.sigil.common.config.IRepositoryConfig#getRepositoryPath()
      */
@@ -89,87 +47,4 @@ public class EclipseRepositoryConfig imp
         return projectConfig.getRepositoryPath();
     }
 
-    /**
-     * @return
-     */
-    private static List<String> readRepositoryNames()
-    {
-        List<IRepositoryModel> models = findRepositories();
-        ArrayList<String> repos = new ArrayList<String>(models.size());
-        for (IRepositoryModel repo : models)
-        {
-            String id = repo.getId();
-            repos.add(id);
-        }
-        
-        return repos;
-    }
-
-    private static Properties readRepositoryConfig(String name) {
-        IPreferenceStore prefs = SigilCore.getDefault().getPreferenceStore();
-
-        for (IRepositoryModel repo : findRepositories())
-        {
-            try
-            {
-                String id = repo.getId();
-                if ( name.equals(id) ) {
-                    Properties pref = null;
-                    if (repo.getType().isDynamic())
-                    {
-                        String instance = "repository." + repo.getType().getId() + "." + id;
-                        String loc = prefs.getString(instance + ".loc");
-                        pref = loadPreferences(loc);                     
-                    }
-                    else
-                    {
-                        pref = new Properties();
-                    }
-                    
-                    if (!pref.containsKey(IRepositoryConfig.REPOSITORY_PROVIDER)) {
-                        pref.put(IRepositoryConfig.REPOSITORY_PROVIDER, repo.getType().getProvider());
-                    }
-                    return pref;
-                }
-            }
-            catch (IOException e)
-            {
-                SigilCore.error("Failed to load repository for " + repo, e);
-            }
-        }
-        
-        // ok not found
-        return null;
-    }
-    
-    private static final List<IRepositoryModel> findRepositories()
-    {
-        return SigilCore.getRepositoryPreferences().loadRepositories();
-    }
-    
-    private static final Properties loadPreferences(String loc) throws FileNotFoundException,
-    IOException
-    {
-        FileInputStream in = null;
-        try
-        {
-            Properties pref = new Properties();
-            pref.load(new FileInputStream(loc));
-            return pref;
-        }
-        finally
-        {
-            if (in != null)
-            {
-                try
-                {
-                    in.close();
-                }
-                catch (IOException e)
-                {
-                    SigilCore.error("Failed to close file", e);
-                }
-            }
-        }
-    }    
 }

Copied: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/ProjectRepositoryManager.java (from r991152, felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/ProjectRepositoryManager.java?p2=felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/ProjectRepositoryManager.java&p1=felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryManager.java&r1=991152&r2=991568&rev=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/EclipseRepositoryManager.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/ProjectRepositoryManager.java Wed Sep  1 15:18:01 2010
@@ -19,188 +19,23 @@
 
 package org.apache.felix.sigil.eclipse.internal.repository.manager;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
 
-import org.apache.felix.sigil.common.config.IRepositoryConfig;
-import org.apache.felix.sigil.common.repository.AbstractRepositoryManager;
-import org.apache.felix.sigil.common.repository.IBundleRepository;
-import org.apache.felix.sigil.common.repository.IRepositoryProvider;
-import org.apache.felix.sigil.common.repository.RepositoryException;
-import org.apache.felix.sigil.eclipse.SigilCore;
-import org.apache.felix.sigil.eclipse.internal.repository.manager.IRepositoryMap.RepositoryCache;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
+import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
+import org.eclipse.core.runtime.CoreException;
 
 /**
  * @author dave
  *
  */
-public class EclipseRepositoryManager extends AbstractRepositoryManager implements IPropertyChangeListener
+public class ProjectRepositoryManager extends AbstractEclipseRepositoryManager
 {
-    private final IRepositoryConfig config;
-    private final IRepositoryMap repositoryMap;
-    
     /**
-     * @param config
+     * @param model
      * @param repositoryMap2 
+     * @throws CoreException 
      */
-    public EclipseRepositoryManager(IRepositoryConfig config, IRepositoryMap repositoryMap)
+    public ProjectRepositoryManager(ISigilProjectModel model, IRepositoryCache repositoryMap) throws CoreException
     {
-        this.config = new EclipseRepositoryConfig(config);
-        this.repositoryMap = repositoryMap;
+        super(new ProjectRepositoryConfig(model.getRepositoryConfig()), repositoryMap);
     }
-    
-    @Override
-    public void initialise()
-    {
-        super.initialise();
-        SigilCore.getDefault().getPreferenceStore().addPropertyChangeListener(this);
-    }
-
-    public void destroy()
-    {
-        IPreferenceStore prefs = SigilCore.getDefault().getPreferenceStore();
-        if (prefs != null)
-        {
-            prefs.removePropertyChangeListener(this);
-        }
-    }    
-
-    /* (non-Javadoc)
-     * @see org.apache.felix.sigil.common.repository.AbstractRepositoryManager#loadRepositories()
-     */
-    @Override
-    protected void loadRepositories()
-    {
-        List<IBundleRepository> list = new ArrayList<IBundleRepository>();
-        scanRepositories(config.getRepositoryPath(), list);
-        setRepositories(list.toArray(new IBundleRepository[list.size()]));
-    }
-    
-    /**
-     * @param list 
-     * @param config2
-     * @param i
-     */
-    private void scanRepositories(List<String> path, List<IBundleRepository> list)
-    {
-        for (String name : path)
-        {
-            if ( IRepositoryConfig.WILD_CARD.equals(name) ) {
-                HashSet<String> defined = new HashSet<String>();
-                for (String n : path) {
-                    if (!IRepositoryConfig.WILD_CARD.equals(n)) {
-                        defined.add(n);
-                    }
-                }
-                List<String> subpath = new LinkedList<String>();
-                for (String key : config.getAllRepositories()) {
-                    if (!defined.contains(key))
-                    {
-                        subpath.add(key);
-                    }
-                }
-                scanRepositories(subpath, list);
-            }
-            else {
-                Properties props = config.getRepositoryConfig(name);
-                if (props != null) {
-                    String uid = config.getRepositoryDefinition(name).toString() + '#' + name;
-                    IBundleRepository repo = buildRepository(uid, name, props);
-                    
-                    if ( repo != null ) {
-                        list.add(repo);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * @param repo
-     * @return 
-     */
-    private IBundleRepository buildRepository(String uid, String name, Properties repo)
-    {
-        String disabled = repo.getProperty("disabled");
-        if ("true".equalsIgnoreCase(disabled == null ? null : disabled.trim())) return null;
-        
-        String optStr = repo.getProperty("optional", "false");
-        boolean optional = Boolean.parseBoolean(optStr.trim());
-
-        String alias = repo.getProperty(IRepositoryConfig.REPOSITORY_PROVIDER);
-        if (alias == null)
-        {
-            String msg = "provider not specified for repository: " + name;
-            
-            if (optional)            
-                SigilCore.log(msg);
-            else
-                SigilCore.warn(msg);
-            
-            return null;
-        }
-
-        try
-        {
-            IRepositoryProvider instance = EclipseRepositoryFactory.getProvider(alias);
-            IBundleRepository repository = loadRepository(uid, name, repo, instance);
-            return repository;
-        }
-        catch (Exception e)
-        {
-            String msg = "failed to create repository: ";
-            
-            if (optional)            
-                SigilCore.log(msg + e);
-            else
-                SigilCore.warn(msg, e);
-        }
-        
-        return null;
-    }
-    
-    private IBundleRepository loadRepository(String uid, String id, Properties pref,
-        IRepositoryProvider provider) throws RepositoryException
-    {
-        try
-        {
-            if (pref == null)
-            {
-                pref = new Properties();
-            }
-
-            RepositoryCache cache = repositoryMap.get(uid);
-
-            if (cache == null || !cache.pref.equals(pref))
-            {
-                IBundleRepository repo = provider.createRepository(id, pref);
-                cache = new RepositoryCache(pref, repo);
-                repositoryMap.put(uid, cache);
-            }
-
-            return cache.repo;
-        }
-        catch (RuntimeException e)
-        {
-            throw new RepositoryException("Failed to build repositories", e);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-     */
-    public void propertyChange(PropertyChangeEvent event)
-    {
-        if (event.getProperty().equals("repository.order"))
-        {
-            loadRepositories();
-        }
-    }
-    
 }

Copied: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/RepositoryCache.java (from r991152, felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/RepositoryMap.java)
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/RepositoryCache.java?p2=felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/RepositoryCache.java&p1=felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/RepositoryMap.java&r1=991152&r2=991568&rev=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/RepositoryMap.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/repository/manager/RepositoryCache.java Wed Sep  1 15:18:01 2010
@@ -22,11 +22,27 @@ package org.apache.felix.sigil.eclipse.i
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Properties;
 
+import org.apache.felix.sigil.common.repository.IBundleRepository;
+import org.apache.felix.sigil.common.repository.IRepositoryProvider;
+import org.apache.felix.sigil.common.repository.RepositoryException;
 
-public class RepositoryMap implements IRepositoryMap
+public class RepositoryCache implements IRepositoryCache
 {
-    private HashMap<String, RepositoryCache> cachedRepositories = new HashMap<String, RepositoryCache>();
+    public static class RepositoryStore
+    {
+        public final Properties pref;
+        public final IBundleRepository repo;
+
+        public RepositoryStore(Properties pref, IBundleRepository repo)
+        {
+            this.pref = pref;
+            this.repo = repo;
+        }
+    }
+
+    private HashMap<String, RepositoryStore> cachedRepositories = new HashMap<String, RepositoryStore>();
 
     public synchronized void retainAll(Collection<String> ids)
     {
@@ -39,14 +55,49 @@ public class RepositoryMap implements IR
         }
     }
 
-    public synchronized RepositoryCache get(String id)
+    public IBundleRepository getRepository(String uid, Properties pref,
+        IRepositoryProvider provider) throws RepositoryException
+    {
+        try
+        {
+            if (pref == null)
+            {
+                pref = new Properties();
+            }
+
+            RepositoryStore cache = get(uid);
+
+            if (cache == null || !cache.pref.equals(pref))
+            {
+                IBundleRepository repo = provider.createRepository(uid, pref);
+                cache = new RepositoryStore(pref, repo);
+                put(uid, cache);
+            }
+
+            return cache.repo;
+        }
+        catch (RuntimeException e)
+        {
+            throw new RepositoryException("Failed to build repositories", e);
+        }
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.felix.sigil.eclipse.internal.repository.manager.IRepositoryCache#discard(java.util.Collection)
+     */
+    public void discard(Collection<String> ids)
+    {
+        cachedRepositories.keySet().removeAll(ids);
+    }
+    
+
+    private RepositoryStore get(String id)
     {
         return cachedRepositories.get(id);
     }
 
-    public synchronized void put(String id, RepositoryCache cache)
+    private void put(String id, RepositoryStore cache)
     {
         cachedRepositories.put(id, cache);
     }
-
 }

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/SigilProjectManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/SigilProjectManager.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/SigilProjectManager.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/internal/resources/SigilProjectManager.java Wed Sep  1 15:18:01 2010
@@ -18,22 +18,28 @@
  */
 package org.apache.felix.sigil.eclipse.internal.resources;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.apache.felix.sigil.common.config.IRepositoryConfig;
+import org.apache.felix.sigil.common.repository.IBundleRepository;
 import org.apache.felix.sigil.common.repository.IRepositoryManager;
 import org.apache.felix.sigil.eclipse.SigilCore;
 import org.apache.felix.sigil.eclipse.internal.model.project.SigilProject;
-import org.apache.felix.sigil.eclipse.internal.repository.manager.EclipseRepositoryManager;
-import org.apache.felix.sigil.eclipse.internal.repository.manager.IRepositoryMap;
+import org.apache.felix.sigil.eclipse.internal.repository.manager.ProjectRepositoryManager;
+import org.apache.felix.sigil.eclipse.internal.repository.manager.IRepositoryCache;
 import org.apache.felix.sigil.eclipse.model.project.ISigilProjectModel;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 
 public class SigilProjectManager
 {
-    private static HashMap<IProject, ISigilProjectModel> projects = new HashMap<IProject, ISigilProjectModel>();
-    private static HashMap<ISigilProjectModel, EclipseRepositoryManager> repositoryManagers = new HashMap<ISigilProjectModel, EclipseRepositoryManager>();
+    private final HashMap<IProject, ISigilProjectModel> projects = new HashMap<IProject, ISigilProjectModel>();
+    private final HashMap<ISigilProjectModel, ProjectRepositoryManager> repositoryManagers = new HashMap<ISigilProjectModel, ProjectRepositoryManager>();    
+    private final IRepositoryCache repositoryCache;
+    
+    public SigilProjectManager(IRepositoryCache repositoryCache) {
+        this.repositoryCache = repositoryCache;
+    }
 
     public ISigilProjectModel getSigilProject(IProject project) throws CoreException
     {
@@ -63,32 +69,51 @@ public class SigilProjectManager
         synchronized (projects)
         {
             ISigilProjectModel model = projects.remove(project);
+            ArrayList<String> flush = new ArrayList<String>();
             if ( model != null ) {
-                EclipseRepositoryManager manager = repositoryManagers.remove(model);
-                manager.destroy();           
-            }            
+                ProjectRepositoryManager manager = repositoryManagers.remove(model);
+                manager.destroy();
+                for(IBundleRepository rep : manager.getRepositories()) {
+                    flush.add(rep.getId());
+                }
+            }
+            
+            for (ProjectRepositoryManager manager : repositoryManagers.values()) {
+                for(IBundleRepository rep : manager.getRepositories()) {
+                    flush.remove(rep.getId());
+                }
+            }
+            
+            repositoryCache.discard(flush);
         }
     }
 
     /**
      * @param model
-     * @param repositoryMap 
+     * @param repositoryCache 
      * @throws CoreException 
      */
-    public IRepositoryManager getRepositoryManager(ISigilProjectModel model, IRepositoryMap repositoryMap) throws CoreException
+    public IRepositoryManager getRepositoryManager(ISigilProjectModel model) throws CoreException
     {
         synchronized( projects ) {
-            EclipseRepositoryManager manager = repositoryManagers.get(model);
+            ProjectRepositoryManager manager = repositoryManagers.get(model);
             
             if ( manager == null ) {
-                IRepositoryConfig config = model.getRepositoryConfig();
-                
-                manager = new EclipseRepositoryManager(config, repositoryMap);
-                
+                manager = new ProjectRepositoryManager(model, repositoryCache);                
                 repositoryManagers.put(model, manager);
             }
             
             return manager;
         }
     }
+
+    /**
+     * 
+     */
+    public synchronized void destroy()
+    {
+        for(ProjectRepositoryManager man : repositoryManagers.values()) {
+            man.destroy();
+        }
+    }
 }

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryModel.java Wed Sep  1 15:18:01 2010
@@ -19,18 +19,17 @@
 
 package org.apache.felix.sigil.eclipse.model.repository;
 
-import org.eclipse.jface.preference.PreferenceStore;
+import java.util.Properties;
 
 public interface IRepositoryModel
 {
-
     String getId();
 
-    void setName(String stringValue);
-
     String getName();
 
-    PreferenceStore getPreferences();
+    Properties getProperties();
 
     IRepositoryType getType();
+    
+    Throwable getProblem();
 }
\ No newline at end of file

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryPreferences.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryPreferences.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryPreferences.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryPreferences.java Wed Sep  1 15:18:01 2010
@@ -21,18 +21,18 @@ package org.apache.felix.sigil.eclipse.m
 
 import java.util.List;
 
-import org.apache.felix.sigil.eclipse.internal.model.repository.RepositoryType;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.preference.IPreferenceStore;
 
 public interface IRepositoryPreferences
 {
     List<IRepositoryModel> loadRepositories();
 
-    IRepositoryModel findRepository(String id);
-
     void saveRepositories(List<IRepositoryModel> repositories) throws CoreException;
 
-    List<RepositoryType> loadRepositoryTypes();
+    List<IRepositoryType> loadRepositoryTypes();
+    
+    IPreferenceStore toPreferenceStore(IRepositoryModel model);
 
     IRepositoryModel newRepositoryElement(IRepositoryType type);
 }
\ No newline at end of file

Modified: felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java (original)
+++ felix/trunk/sigil/eclipse/core/src/org/apache/felix/sigil/eclipse/model/repository/IRepositoryType.java Wed Sep  1 15:18:01 2010
@@ -24,7 +24,7 @@ import org.eclipse.swt.graphics.Image;
 public interface IRepositoryType
 {
 
-    String getType();
+    String getName();
 
     String getId();
 

Modified: felix/trunk/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java (original)
+++ felix/trunk/sigil/eclipse/obr/src/org/apache/felix/sigil/obr/eclipse/OBRRepositoryWizardPage.java Wed Sep  1 15:18:01 2010
@@ -132,7 +132,7 @@ public class OBRRepositoryWizardPage ext
     {
         super.storeFields();
         IPath dir = Activator.getDefault().getStateLocation();
-        getModel().getPreferences().setValue( "index", dir.append( getModel().getId() + ".obr" ).toOSString() );
+        getModel().getProperties().setProperty( "index", dir.append( getModel().getId() + ".obr" ).toOSString() );
     }
 
 }

Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/repository/RepositoriesView.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/repository/RepositoriesView.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/repository/RepositoriesView.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/repository/RepositoriesView.java Wed Sep  1 15:18:01 2010
@@ -285,7 +285,7 @@ public class RepositoriesView
     }
 
     @SuppressWarnings("unchecked")
-    protected void refresh(Control parent, IStructuredSelection sel)
+    private void refresh(Control parent, IStructuredSelection sel)
     {
         ArrayList<IRepositoryModel> models = new ArrayList<IRepositoryModel>(sel.size());
 

Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/repository/RepositoryTypeSelectionPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/repository/RepositoryTypeSelectionPage.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/repository/RepositoryTypeSelectionPage.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/preferences/repository/RepositoryTypeSelectionPage.java Wed Sep  1 15:18:01 2010
@@ -75,7 +75,7 @@ public class RepositoryTypeSelectionPage
             public String getText(Object element)
             {
                 IRepositoryType rep = (IRepositoryType) element;
-                return rep.getType();
+                return rep.getName();
             }
 
             @Override

Modified: felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java?rev=991568&r1=991567&r2=991568&view=diff
==============================================================================
--- felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java (original)
+++ felix/trunk/sigil/eclipse/ui/src/org/apache/felix/sigil/eclipse/ui/internal/repository/FileSystemRepositoryWizardPage.java Wed Sep  1 15:18:01 2010
@@ -26,8 +26,6 @@ import org.apache.felix.sigil.eclipse.ui
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.DirectoryFieldEditor;
 import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
 
 public class FileSystemRepositoryWizardPage extends RepositoryWizardPage implements IWizardPage
 {
@@ -43,15 +41,6 @@ public class FileSystemRepositoryWizardP
     public void createFieldEditors()
     {
         dirEditor = new DirectoryFieldEditor("dir", "Directory:", getFieldEditorParent());
-        dirEditor.getTextControl(getFieldEditorParent()).addModifyListener(
-            new ModifyListener()
-            {
-                public void modifyText(ModifyEvent e)
-                {
-                    checkPageComplete();
-                }
-            });
-
         addField(dirEditor);
         addField(new BooleanFieldEditor("recurse", "Recurse:", getFieldEditorParent()));
     }