Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity

merge with branch issue-59

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-01-16 16:53:37 +01:00
parent 0983b1d3d9 ff234dc013
commit 08cd811f53
18 changed files with 1459 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryImportResource.java Normal file
View File

@@ -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;
}

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

@@ -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
*