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

improve RepositoryManager api

Browse Source
This commit is contained in:
Sebastian Sdorra
2010-09-14 19:03:08 +02:00
parent 967b86f166
commit 34d1af30df
17 changed files with 446 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-webapp/src/main/java/sonia/scm/ContextListener.java
View File

@@ -16,10 +16,12 @@ import com.google.inject.servlet.ServletModule;
import sonia.scm.api.rest.UriExtensionsConfig;
import sonia.scm.filter.GZipFilter;
import sonia.scm.filter.SecurityFilter;
import sonia.scm.filter.StaticResourceFilter;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.security.Authenticator;
import sonia.scm.security.DemoAuthenticator;
import sonia.scm.security.SecurityFilter;
//~--- JDK imports ------------------------------------------------------------
@@ -79,8 +81,12 @@ public class ContextListener extends GuiceServletContextListener
@Override
protected void configureServlets()
{
SCMContextProvider context = SCMContext.getContext();
bind(Authenticator.class).to(DemoAuthenticator.class);
bind(SCMContextProvider.class).toInstance(SCMContext.getContext());
bind(SCMContextProvider.class).toInstance(context);
bind(RepositoryManager.class).toInstance(
context.getRepositoryManager());
// filters
filter(PATTERN_PAGE,

8
scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
View File

@@ -14,6 +14,7 @@ import com.google.inject.Inject;
import sonia.scm.SCMContext;
import sonia.scm.ScmState;
import sonia.scm.User;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryType;
import sonia.scm.security.Authenticator;
@@ -111,8 +112,7 @@ public class AuthenticationResource
state.setUser(user);
state.setRepositoryTypes(
SCMContext.getContext().getRepositoryTypes().toArray(
new RepositoryType[0]));
repositoryManger.getTypes().toArray(new RepositoryType[0]));
return state;
}
@@ -122,4 +122,8 @@ public class AuthenticationResource
/** Field description */
@Inject
private Authenticator authenticator;
/** Field description */
@Inject
private RepositoryManager repositoryManger;
}

29
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
View File

@@ -17,7 +17,7 @@ import sonia.scm.repository.Repository;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.UUID;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
@@ -45,29 +45,31 @@ public class RepositoryResource extends AbstractResource<Repository>
{
repositoryStore = new LinkedHashMap<String, Repository>();
repositoryStore.put("sonia.lib",
new Repository("hg", "sonia.lib", "csit@ostfalia.de",
"SONIA Library",
new Repository(createId(), "hg", "sonia.lib",
"csit@ostfalia.de", "SONIA Library",
new Permission("csit", true, true,
true)));
repositoryStore.put("sonia.misc",
new Repository("hg", "sonia.misc", "csit@ostfalia.de",
new Repository(createId(), "hg", "sonia.misc",
"csit@ostfalia.de",
"SONIA Miscelanious",
new Permission("csit", true, true,
true)));
repositoryStore.put("PWA",
new Repository("svn", "PWA",
new Repository(createId(), "svn", "PWA",
"csit@fh-wolfenbuettel.de", "PWA",
new Permission("th", true, true),
new Permission("sdorra", true, true),
new Permission("oelkersd", true,
false)));
repositoryStore.put("sonia.app",
new Repository("hg", "sonia.app", "csit@ostfalia.de",
new Repository(createId(), "hg", "sonia.app",
"csit@ostfalia.de",
"SONIA Applications",
new Permission("csit", true, true,
true)));
repositoryStore.put("sonia.webapps",
new Repository("hg", "sonia.webapps",
new Repository(createId(), "hg", "sonia.webapps",
"csit@ostfalia.de",
"SONIA WebApplications",
new Permission("csit", true, true,
@@ -173,6 +175,19 @@ public class RepositoryResource extends AbstractResource<Repository>
return PATH_PART;
}
//~--- methods --------------------------------------------------------------
/**
* Method description
*
*
* @return
*/
private String createId()
{
return UUID.randomUUID().toString();
}
//~--- fields ---------------------------------------------------------------
/** Field description */

4
scm-webapp/src/main/java/sonia/scm/security/SecurityFilter.java → scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
View File

@@ -5,7 +5,7 @@
package sonia.scm.security;
package sonia.scm.filter;
//~--- non-JDK imports --------------------------------------------------------
@@ -13,7 +13,6 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import sonia.scm.User;
import sonia.scm.filter.HttpFilter;
//~--- JDK imports ------------------------------------------------------------
@@ -26,6 +25,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import sonia.scm.security.Authenticator;
/**
*

2
scm-webapp/src/main/java/sonia/scm/security/DemoAuthenticator.java
View File

@@ -75,7 +75,7 @@ public class DemoAuthenticator implements Authenticator
*
* @return
*/
@Override
@Override
public User getUser(HttpServletRequest request)
{
User user = null;