Enable plugins to create config stores for repository config

Therefore we have to
- add an API to create stores for repository ids, not only for
  repositories,
- make v1 properties available in scm-core
- make sure that properties are extracted from repositories before the
  update step of a plugin runs (this is done by sorting the update steps
  in a way so that "core" update steps are executed before plugin update
  steps with the same version)

scm-webapp/src/main/java/sonia/scm/boot/BootstrapModule.java

@@ -24,6 +24,8 @@ import sonia.scm.store.FileBlobStoreFactory;
 import sonia.scm.store.JAXBConfigurationEntryStoreFactory;
 import sonia.scm.store.JAXBConfigurationStoreFactory;
 import sonia.scm.store.JAXBDataStoreFactory;
+import sonia.scm.update.V1PropertyDAO;
+import sonia.scm.update.xml.XmlV1PropertyDAO;
 
 public class BootstrapModule extends AbstractModule {
 
@@ -60,6 +62,7 @@ public class BootstrapModule extends AbstractModule {
     bind(DataStoreFactory.class, JAXBDataStoreFactory.class);
     bind(BlobStoreFactory.class, FileBlobStoreFactory.class);
     bind(PluginLoader.class).toInstance(pluginLoader);
+    bind(V1PropertyDAO.class, XmlV1PropertyDAO.class);
   }
 
   private <T> void bind(Class<T> clazz, Class<? extends T> defaultImplementation) {

scm-webapp/src/main/java/sonia/scm/update/CoreUpdateStep.java

@@ -0,0 +1,6 @@
+package sonia.scm.update;
+
+import sonia.scm.migration.UpdateStep;
+
+public interface CoreUpdateStep extends UpdateStep {
+}

scm-webapp/src/main/java/sonia/scm/update/UpdateEngine.java

@@ -32,12 +32,20 @@ public class UpdateEngine {
   private List<UpdateStep> sortSteps(Set<UpdateStep> steps) {
     LOG.trace("sorting available update steps:");
     List<UpdateStep> sortedSteps = steps.stream()
-      .sorted(Comparator.comparing(UpdateStep::getTargetVersion).reversed())
+      .sorted(
+        Comparator
+          .comparing(UpdateStep::getTargetVersion)
+          .thenComparing(this::isCoreUpdateStep)
+          .reversed())
       .collect(toList());
     sortedSteps.forEach(step -> LOG.trace("{} for version {}", step.getAffectedDataType(), step.getTargetVersion()));
     return sortedSteps;
   }
 
+  private boolean isCoreUpdateStep(UpdateStep updateStep) {
+    return updateStep instanceof CoreUpdateStep;
+  }
+
   public void update() {
     steps
       .stream()

scm-webapp/src/main/java/sonia/scm/update/group/XmlGroupV1UpdateStep.java

@@ -11,7 +11,7 @@ import sonia.scm.plugin.Extension;
 import sonia.scm.store.ConfigurationEntryStore;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
 import sonia.scm.store.StoreConstants;
-import sonia.scm.update.properties.V1Properties;
+import sonia.scm.update.V1Properties;
 import sonia.scm.version.Version;
 
 import javax.inject.Inject;

scm-webapp/src/main/java/sonia/scm/update/properties/V1Properties.java

@@ -1,20 +0,0 @@
-package sonia.scm.update.properties;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.List;
-
-import static java.util.Collections.unmodifiableList;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name = "properties")
-public class V1Properties {
-  @XmlElement(name = "item")
-  private List<V1Property> properties;
-
-  public List<V1Property> getProperties() {
-    return unmodifiableList(properties);
-  }
-}

scm-webapp/src/main/java/sonia/scm/update/properties/V1Property.java

@@ -1,49 +0,0 @@
-package sonia.scm.update.properties;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import java.util.Objects;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class V1Property {
-  private String key;
-  private String value;
-
-  public V1Property() {
-  }
-
-  public V1Property(String key, String value) {
-    this.key = key;
-    this.value = value;
-  }
-
-  public String getKey() {
-    return key;
-  }
-
-  public String getValue() {
-    return value;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    V1Property that = (V1Property) o;
-    return Objects.equals(key, that.key) &&
-      Objects.equals(value, that.value);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(key, value);
-  }
-
-  @Override
-  public String toString() {
-    return "V1Property{" +
-      "key='" + key + '\'' +
-      ", value='" + value + '\'' +
-      '}';
-  }
-}

scm-webapp/src/main/java/sonia/scm/update/repository/V1Repository.java

@@ -1,6 +1,6 @@
 package sonia.scm.update.repository;
 
-import sonia.scm.update.properties.V1Properties;
+import sonia.scm.update.V1Properties;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;

scm-webapp/src/main/java/sonia/scm/update/repository/XmlRepositoryV1UpdateStep.java

@@ -13,7 +13,9 @@ import sonia.scm.repository.xml.XmlRepositoryDAO;
 import sonia.scm.store.ConfigurationEntryStore;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
 import sonia.scm.store.StoreConstants;
-import sonia.scm.update.properties.V1Properties;
+import sonia.scm.update.CoreUpdateStep;
+import sonia.scm.update.V1Properties;
+import sonia.scm.update.RepositoryV1PropertyReader;
 import sonia.scm.version.Version;
 
 import javax.inject.Inject;
@@ -56,7 +58,7 @@ import static sonia.scm.version.Version.parse;
  * </ul>
  */
 @Extension
-public class XmlRepositoryV1UpdateStep implements UpdateStep {
+public class XmlRepositoryV1UpdateStep implements CoreUpdateStep {
 
   private static Logger LOG = LoggerFactory.getLogger(XmlRepositoryV1UpdateStep.class);
 
@@ -80,7 +82,7 @@ public class XmlRepositoryV1UpdateStep implements UpdateStep {
     this.injector = injector;
     this.propertyStore = configurationEntryStoreFactory
       .withType(V1Properties.class)
-      .withName("repository-properties-v1")
+      .withName(new RepositoryV1PropertyReader().getStoreName())
       .build();
   }
 

scm-webapp/src/main/java/sonia/scm/update/user/XmlUserV1UpdateStep.java

@@ -10,7 +10,7 @@ import sonia.scm.security.AssignedPermission;
 import sonia.scm.store.ConfigurationEntryStore;
 import sonia.scm.store.ConfigurationEntryStoreFactory;
 import sonia.scm.store.StoreConstants;
-import sonia.scm.update.properties.V1Properties;
+import sonia.scm.update.V1Properties;
 import sonia.scm.user.User;
 import sonia.scm.user.xml.XmlUserDAO;
 import sonia.scm.version.Version;