merge with branch 1.x

scm-webapp/src/main/java/sonia/scm/plugin/AdvancedPluginConfiguration.java

@@ -0,0 +1,164 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.plugin;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.common.collect.ImmutableSet;
+
+import sonia.scm.xml.XmlCipherStringAdapter;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ * @since 1.41
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "advanced-configuration")
+public class AdvancedPluginConfiguration
+{
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public Set<PluginRepository> getRepositories()
+  {
+    if (repositories == null)
+    {
+      repositories = ImmutableSet.of();
+    }
+
+    return repositories;
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public Set<Server> getServers()
+  {
+    if (servers == null)
+    {
+      servers = ImmutableSet.of();
+    }
+
+    return servers;
+  }
+
+  //~--- inner classes --------------------------------------------------------
+
+  /**
+   * Class description
+   *
+   *
+   * @version        Enter version here..., 14/07/20
+   * @author         Enter your name here...
+   */
+  @XmlAccessorType(XmlAccessType.FIELD)
+  public static class Server
+  {
+
+    /**
+     * Method description
+     *
+     *
+     * @return
+     */
+    public String getId()
+    {
+      return id;
+    }
+
+    /**
+     * Method description
+     *
+     *
+     * @return
+     */
+    public String getPassword()
+    {
+      return password;
+    }
+
+    /**
+     * Method description
+     *
+     *
+     * @return
+     */
+    public String getUsername()
+    {
+      return username;
+    }
+
+    //~--- fields -------------------------------------------------------------
+
+    /** Field description */
+    private String id;
+
+    /** Field description */
+    @XmlJavaTypeAdapter(XmlCipherStringAdapter.class)
+    private String password;
+
+    /** Field description */
+    private String username;
+  }
+
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  @XmlElement(name = "repository")
+  @XmlElementWrapper(name = "repositories")
+  private Set<PluginRepository> repositories;
+
+  /** Field description */
+  @XmlElement(name = "server")
+  @XmlElementWrapper(name = "servers")
+  private Set<Server> servers;
+}

scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java

@@ -38,7 +38,6 @@ package sonia.scm.plugin;
 import com.github.legman.Subscribe;
 
 import com.google.common.base.Predicate;
-import com.google.common.collect.Sets;
 import com.google.common.io.Files;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
@@ -48,7 +47,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sonia.scm.ConfigurationException;
-import sonia.scm.SCMContext;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.cache.Cache;
 import sonia.scm.cache.CacheManager;
@@ -100,6 +98,10 @@ public class DefaultPluginManager implements PluginManager
   /** Field description */
   public static final String ENCODING = "UTF-8";
 
+  /** Field description */
+  private static final String ADVANCED_CONFIGURATION =
+    "advanced-configuration.xml";
+
   /** the logger for DefaultPluginManager */
   private static final Logger logger =
     LoggerFactory.getLogger(DefaultPluginManager.class);
@@ -116,10 +118,6 @@ public class DefaultPluginManager implements PluginManager
   /**
    * Constructs ...
    *
-   *
-   *
-   *
-   *
    * @param context
    * @param configuration
    * @param pluginLoader
@@ -647,7 +645,8 @@ public class DefaultPluginManager implements PluginManager
             /*if (pluginHandler == null)
             {
               pluginHandler = new AetherPluginHandler(this,
-                SCMContext.getContext(), configuration);
+                SCMContext.getContext(), configuration,
+                advancedPluginConfiguration);
             }
 
             pluginHandler.setPluginRepositories(center.getRepositories());*/