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

move Authenticator and Filters from scm-webapp to scm-web-api

Browse Source
This commit is contained in:
Sebastian Sdorra
2010-09-26 15:53:26 +02:00
parent 4d1507d13a
commit 9619a92d41
10 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scm-web-api/pom.xml
View File

@@ -17,11 +17,18 @@
<dependencies>
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>sonia.scm</groupId>
<artifactId>scm-core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -44,6 +51,7 @@
</dependencies>
<properties>
<servlet.version>2.5</servlet.version>
<jersey.version>1.4-ea06</jersey.version>
<guice.version>2.0</guice.version>
</properties>

2
scm-webapp/src/main/java/sonia/scm/filter/HttpFilter.java → scm-web-api/src/main/java/sonia/scm/web/filter/HttpFilter.java
View File

@@ -5,7 +5,7 @@
package sonia.scm.filter;
package sonia.scm.web.filter;
//~--- JDK imports ------------------------------------------------------------

2
scm-webapp/src/main/java/sonia/scm/security/Authenticator.java → scm-web-api/src/main/java/sonia/scm/web/security/Authenticator.java
View File

@@ -5,7 +5,7 @@
package sonia.scm.security;
package sonia.scm.web.security;
//~--- non-JDK imports --------------------------------------------------------

7
scm-webapp/pom.xml
View File

@@ -42,7 +42,7 @@
<artifactId>scm-hg-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>sonia.scm.plugins</groupId>
<artifactId>scm-svn-plugin</artifactId>
@@ -90,12 +90,17 @@
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.25</version>
<configuration>
<stopPort>9966</stopPort>
<stopKey>foo</stopKey>
<systemproperties>
<systemproperty>
<name>org.apache.commons.logging.Log</name>
<value>org.apache.commons.logging.impl.Jdk14Logger</value>
</systemproperty>
</systemproperties>
<source>1.6</source>
<target>1.6</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
<dependencies>
<dependency>

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

@@ -17,8 +17,8 @@ import sonia.scm.filter.SecurityFilter;
import sonia.scm.filter.StaticResourceFilter;
import sonia.scm.plugin.ScriptResourceServlet;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.security.Authenticator;
import sonia.scm.security.DemoAuthenticator;
import sonia.scm.web.security.Authenticator;
import sonia.scm.web.security.DemoAuthenticator;
import sonia.scm.web.ScmWebPluginContext;
//~--- JDK imports ------------------------------------------------------------
@@ -90,16 +90,16 @@ public class ScmServletModule extends ServletModule
{
SCMContextProvider context = SCMContext.getContext();
bind(Authenticator.class).to(DemoAuthenticator.class);
bind(SCMContextProvider.class).toInstance(context);
bind(Authenticator.class).to(DemoAuthenticator.class);
bind(RepositoryManager.class).toInstance(context.getRepositoryManager());
bind(ScmWebPluginContext.class).toInstance(webPluginContext);
// filters
filter(PATTERN_PAGE,
/*filter(PATTERN_PAGE,
PATTERN_STATIC_RESOURCES).through(StaticResourceFilter.class);
filter(PATTERN_PAGE, PATTERN_COMPRESSABLE).through(GZipFilter.class);
filter(PATTERN_RESTAPI).through(SecurityFilter.class);
filter(PATTERN_RESTAPI).through(SecurityFilter.class);*/
// plugin resources
serve(PATTERN_PLUGIN_SCRIPT).with(ScriptResourceServlet.class);

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

@@ -16,7 +16,7 @@ import sonia.scm.ScmState;
import sonia.scm.User;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.repository.RepositoryType;
import sonia.scm.security.Authenticator;
import sonia.scm.web.security.Authenticator;
//~--- JDK imports ------------------------------------------------------------

1
scm-webapp/src/main/java/sonia/scm/filter/GZipFilter.java
View File

@@ -9,6 +9,7 @@ package sonia.scm.filter;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.web.filter.HttpFilter;
import com.google.inject.Singleton;
import sonia.scm.util.WebUtil;

3
scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
View File

@@ -9,6 +9,7 @@ package sonia.scm.filter;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.web.filter.HttpFilter;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -25,7 +26,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;
import sonia.scm.web.security.Authenticator;
/**
*

1
scm-webapp/src/main/java/sonia/scm/filter/StaticResourceFilter.java
View File

@@ -9,6 +9,7 @@ package sonia.scm.filter;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.web.filter.HttpFilter;
import com.google.inject.Singleton;
import sonia.scm.util.WebUtil;

4
scm-webapp/src/main/java/sonia/scm/security/DemoAuthenticator.java → scm-webapp/src/main/java/sonia/scm/web/security/DemoAuthenticator.java
View File

@@ -5,7 +5,7 @@
package sonia.scm.security;
package sonia.scm.web.security;
//~--- non-JDK imports --------------------------------------------------------
@@ -75,7 +75,7 @@ public class DemoAuthenticator implements Authenticator
*
* @return
*/
@Override
@Override
public User getUser(HttpServletRequest request)
{
User user = null;