merge with branch issue-59

scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java

@@ -0,0 +1,225 @@
+/**
+ * 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.api.rest.resources;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+
+import org.codehaus.enunciate.jaxrs.TypeHint;
+import org.codehaus.enunciate.modules.jersey.SpringManagedLifecycle;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import sonia.scm.NotSupportedFeatuerException;
+import sonia.scm.Type;
+import sonia.scm.repository.Repository;
+import sonia.scm.repository.RepositoryHandler;
+import sonia.scm.repository.RepositoryManager;
+import sonia.scm.util.SecurityUtil;
+import sonia.scm.web.security.WebSecurityContext;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.MediaType;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+@Singleton
+@Path("import/repositories")
+@SpringManagedLifecycle
+public class RepositoryImportResource
+{
+
+  /**
+   * the logger for RepositoryImportResource
+   */
+  private static final Logger logger =
+    LoggerFactory.getLogger(RepositoryImportResource.class);
+
+  //~--- constructors ---------------------------------------------------------
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param manager
+   * @param securityContextProvider
+   */
+  @Inject
+  public RepositoryImportResource(
+          RepositoryManager manager,
+          Provider<WebSecurityContext> securityContextProvider)
+  {
+    this.manager = manager;
+    this.securityContextProvider = securityContextProvider;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param type
+   *
+   * @return
+   */
+  @POST
+  @Path("{type}")
+  @TypeHint(Repository[].class)
+  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  public GenericEntity<List<Repository>> importRepositories(
+          @PathParam("type") String type)
+  {
+    SecurityUtil.assertIsAdmin(securityContextProvider);
+
+    List<Repository> repositories = new ArrayList<Repository>();
+    RepositoryHandler handler = manager.getHandler(type);
+
+    if (handler != null)
+    {
+      try
+      {
+        List<String> repositoryNames =
+          handler.getImportHandler().importRepositories(manager);
+
+        if (repositoryNames != null)
+        {
+          for (String repositoryName : repositoryNames)
+          {
+            Repository repository = manager.get(type, repositoryName);
+
+            if (repository != null)
+            {
+              repositories.add(repository);
+            }
+            else if (logger.isWarnEnabled())
+            {
+              logger.warn("could not find imported repository {}",
+                          repositoryName);
+            }
+          }
+        }
+      }
+      catch (Exception ex)
+      {
+        throw new WebApplicationException(ex);
+      }
+    }
+    else if (logger.isWarnEnabled())
+    {
+      logger.warn("could not find handler for type {}", type);
+    }
+
+    return new GenericEntity<List<Repository>>(repositories) {}
+    ;
+  }
+
+  //~--- get methods ----------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  @GET
+  @TypeHint(Type[].class)
+  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  public GenericEntity<List<Type>> getImportableTypes()
+  {
+    SecurityUtil.assertIsAdmin(securityContextProvider);
+
+    List<Type> types = new ArrayList<Type>();
+    Collection<Type> handlerTypes = manager.getTypes();
+
+    for (Type t : handlerTypes)
+    {
+      RepositoryHandler handler = manager.getHandler(t.getName());
+
+      if (handler != null)
+      {
+        try
+        {
+          if (handler.getImportHandler() != null)
+          {
+            types.add(t);
+          }
+        }
+        catch (NotSupportedFeatuerException ex)
+        {
+          if (logger.isTraceEnabled())
+          {
+            logger.trace("import handler is not supported", ex);
+          }
+          else if (logger.isInfoEnabled())
+          {
+            logger.info("{} handler does not support import of repositories",
+                        t.getName());
+          }
+        }
+      }
+      else if (logger.isWarnEnabled())
+      {
+        logger.warn("could not find handler for type {}", t.getName());
+      }
+    }
+
+    return new GenericEntity<List<Type>>(types) {}
+    ;
+  }
+
+  //~--- fields ---------------------------------------------------------------
+
+  /** Field description */
+  private RepositoryManager manager;
+
+  /** Field description */
+  private Provider<WebSecurityContext> securityContextProvider;
+}

scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java

@@ -163,12 +163,12 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
    *
    *
    * @param repository
+   * @param createRepository
    *
    * @throws IOException
    * @throws RepositoryException
    */
-  @Override
-  public void create(Repository repository)
+  public void create(Repository repository, boolean createRepository)
           throws RepositoryException, IOException
   {
     if (logger.isInfoEnabled())
@@ -187,7 +187,11 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
 
     repository.setId(UUID.randomUUID().toString());
     repository.setCreationDate(System.currentTimeMillis());
-    getHandler(repository).create(repository);
+
+    if (createRepository)
+    {
+      getHandler(repository).create(repository);
+    }
 
     synchronized (XmlRepositoryDatabase.class)
     {
@@ -198,6 +202,22 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
     fireEvent(repository, HandlerEvent.CREATE);
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param repository
+   *
+   * @throws IOException
+   * @throws RepositoryException
+   */
+  @Override
+  public void create(Repository repository)
+          throws RepositoryException, IOException
+  {
+    create(repository, true);
+  }
+
   /**
    * Method description
    *
@@ -285,6 +305,22 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
     fireHookEvent(repository, event);
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param repository
+   *
+   * @throws IOException
+   * @throws RepositoryException
+   */
+  @Override
+  public void importRepository(Repository repository)
+          throws RepositoryException, IOException
+  {
+    create(repository, false);
+  }
+
   /**
    * Method description
    *

scm-webapp/src/main/webapp/index.html

@@ -113,6 +113,7 @@
     <script type="text/javascript" src="resources/js/repository/sonia.repository.diffpanel.js"></script>
     <script type="text/javascript" src="resources/js/repository/sonia.repository.contentpanel.js"></script>
     <script type="text/javascript" src="resources/js/repository/sonia.repository.repositorybrowser.js"></script>
+    <script type="text/javascript" src="resources/js/repository/sonia.repository.importwindow.js"></script>
 
     <!-- sonia.user -->
     <script type="text/javascript" src="resources/js/user/sonia.user.js"></script>

scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.importwindow.js

@@ -0,0 +1,227 @@
+/**
+ * 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
+ * 
+ */
+
+
+Sonia.repository.ImportWindow =  Ext.extend(Ext.Window,{
+  
+  // TODO i18n
+  titleText: 'Import Repositories',
+  okText: 'Ok',
+  closeText: 'Close',
+  
+  // cache
+  importForm: null,
+  
+  imported: [],
+  importJobsFinished: 0,
+  importJobs: 0,
+  
+  initComponent: function(){
+    var config = {
+      layout:'fit',
+      width:300,
+      height:170,
+      closable: true,
+      resizable: false,
+      plain: true,
+      border: false,
+      modal: true,
+      title: this.titleText,
+      items: [{
+        id: 'importRepositoryForm',
+        frame: true,
+        xtype: 'form',
+        defaultType: 'checkbox'
+      }],
+      buttons: [{
+        id: 'startRepositoryImportButton',
+        text: this.okText,
+        formBind: true,
+        scope: this,
+        handler: this.importRepositories
+      },{
+        text: this.closeText,
+        scope: this,
+        handler: this.close
+      }],
+      listeners: {
+        afterrender: {
+          fn: this.readImportableTypes,
+          scope: this
+        }
+      }
+    }
+    Ext.apply(this, Ext.apply(this.initialConfig, config));
+    Sonia.repository.ImportWindow.superclass.initComponent.apply(this, arguments);
+  },
+  
+  readImportableTypes: function(){
+    if (debug){
+      console.debug('read importable types');
+    }
+    
+    Ext.Ajax.request({
+      url: restUrl + 'import/repositories.json',
+      method: 'GET',
+      scope: this,
+      success: function(response){
+        var obj = Ext.decode(response.responseText);
+        this.renderTypeCheckboxes(obj);
+        this.doLayout();
+      },
+      failure: function(result){
+        main.handleFailure(
+          result.status, 
+          this.errorTitleText, 
+          this.errorMsgText
+        );
+      }
+    });
+    
+  },
+  
+  renderTypeCheckboxes: function(types){
+    Ext.each(types, function(type){
+      this.renderCheckbox(type);
+    }, this);
+  },
+  
+  getImportForm: function(){
+    if (!this.importForm){
+      this.importForm = Ext.getCmp('importRepositoryForm');
+    }
+    return this.importForm;
+  },
+    
+  renderCheckbox: function(type){
+    this.getImportForm().add({
+      xtype: 'checkbox',
+      name: 'type',
+      fieldLabel: type.displayName,
+      inputValue: type.name
+    });
+  },
+  
+  importRepositories: function(){
+    if (debug){
+      console.debug('start import of repositories');
+    }
+    var form = this.getImportForm().getForm();
+    var values = form.getValues().type;
+    if ( values ){
+      if ( Ext.isArray(values) ){
+        this.importJobs = values.length;
+      } else {
+        this.importJobs = 1;
+      }
+    } else {
+      this.importJobs = 0;
+    }
+    Ext.each(values, function(value){
+      this.importRepositoriesOfType(value);
+    }, this);
+  },
+  
+  appendImported: function(repositories){
+    for (var i=0; i<repositories.length; i++){
+      this.imported.push(repositories[i]);
+    }
+    this.importJobsFinished++;
+    if ( this.importJobsFinished >= this.importJobs ){
+      if (debug){
+        console.debug( 'import of ' + this.importJobsFinished + ' jobs finished'  );
+      }
+      this.printImported();
+    }
+  },
+  
+  printImported: function(){
+    var store = new Ext.data.JsonStore({
+      fields: ['type', 'name']
+    });
+    store.loadData(this.imported);
+    
+    var colModel = new Ext.grid.ColumnModel({
+      defaults: {
+        sortable: true,
+        scope: this
+      },
+      columns: [
+        {id: 'name', header: 'Name', dataIndex: 'name'},
+        {id: 'type', header: 'Type', dataIndex: 'type'}
+      ]
+    });
+    
+    this.getImportForm().add({
+      xtype: 'grid',
+      autoExpandColumn: 'name',
+      store: store,
+      colModel: colModel,
+      height: 100
+    });
+    var h = this.getHeight();
+    this.setHeight( h + 100 );
+    this.doLayout();
+    
+    // reload repositories panel
+    var panel = Ext.getCmp('repositories');
+    if (panel){
+      panel.getGrid().reload();
+    }
+  },
+  
+  importRepositoriesOfType: function(type){
+    if (debug){
+      console.debug('start import of ' + type + ' repositories');
+    }
+    var b = Ext.getCmp('startRepositoryImportButton');
+    if ( b ){
+      b.setDisabled(true);
+    }
+    Ext.Ajax.request({
+      url: restUrl + 'import/repositories/' + type + '.json',
+      method: 'POST',
+      scope: this,
+      success: function(response){
+        var obj = Ext.decode(response.responseText);
+        this.appendImported(obj);
+      },
+      failure: function(result){
+        main.handleFailure(
+          result.status, 
+          this.errorTitleText, 
+          this.errorMsgText
+        );
+      }
+    });
+  }
+  
+});

scm-webapp/src/main/webapp/resources/js/sonia.scm.js

@@ -33,6 +33,8 @@ Ext.ns("Sonia.scm");
 Sonia.scm.Main = Ext.extend(Ext.util.Observable, {
 
   tabRepositoriesText: 'Repositories',
+  // todo i18n
+  navImportRepositoriesText: 'Import Repositories',
   navChangePasswordText: 'Change Password',
   sectionMainText: 'Main',
   sectionSecurityText: 'Security',
@@ -156,14 +158,26 @@ Sonia.scm.Main = Ext.extend(Ext.util.Observable, {
       console.debug('create main menu');
     }
     var panel = Ext.getCmp('navigationPanel');
+    
+    var repositoryLinks = [{
+      label: this.navRepositoriesText,
+      fn: this.addRepositoriesTabPanel,
+      scope: this
+    }];
+    
+    if ( admin ){
+      repositoryLinks.push({
+        label: this.navImportRepositoriesText,
+        fn: function(){
+          new Sonia.repository.ImportWindow().show();
+        }
+      });
+    }
+    
     panel.addSection({
       id: 'navMain',
       title: this.sectionMainText,
-      links: [{
-        label: this.navRepositoriesText,
-        fn: this.addRepositoriesTabPanel,
-        scope: this
-      }]
+      links: repositoryLinks
     });
 
     var securitySection = null;