From 9619a92d41af23dba7bc5870d835c24c6ba2fe25 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 26 Sep 2010 15:53:26 +0200
Subject: [PATCH] move Authenticator and Filters from scm-webapp to scm-web-api

---
 scm-web-api/pom.xml                            | 18 +++++++++++++-----
 .../java/sonia/scm/web}/filter/HttpFilter.java |  2 +-
 .../sonia/scm/web}/security/Authenticator.java |  2 +-
 scm-webapp/pom.xml                             |  7 ++++++-
 .../main/java/sonia/scm/ScmServletModule.java  | 10 +++++-----
 .../rest/resources/AuthenticationResource.java |  2 +-
 .../main/java/sonia/scm/filter/GZipFilter.java |  1 +
 .../java/sonia/scm/filter/SecurityFilter.java  |  3 ++-
 .../sonia/scm/filter/StaticResourceFilter.java |  1 +
 .../{ => web}/security/DemoAuthenticator.java  |  4 ++--
 10 files changed, 33 insertions(+), 17 deletions(-)
 rename {scm-webapp/src/main/java/sonia/scm => scm-web-api/src/main/java/sonia/scm/web}/filter/HttpFilter.java (98%)
 rename {scm-webapp/src/main/java/sonia/scm => scm-web-api/src/main/java/sonia/scm/web}/security/Authenticator.java (96%)
 rename scm-webapp/src/main/java/sonia/scm/{ => web}/security/DemoAuthenticator.java (97%)

diff --git a/scm-web-api/pom.xml b/scm-web-api/pom.xml
index d84c04c275..7e4116c4d0 100644
--- a/scm-web-api/pom.xml
+++ b/scm-web-api/pom.xml
@@ -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>
diff --git a/scm-webapp/src/main/java/sonia/scm/filter/HttpFilter.java b/scm-web-api/src/main/java/sonia/scm/web/filter/HttpFilter.java
similarity index 98%
rename from scm-webapp/src/main/java/sonia/scm/filter/HttpFilter.java
rename to scm-web-api/src/main/java/sonia/scm/web/filter/HttpFilter.java
index c40623cbf4..819523cba3 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/HttpFilter.java
+++ b/scm-web-api/src/main/java/sonia/scm/web/filter/HttpFilter.java
@@ -5,7 +5,7 @@
 
 
 
-package sonia.scm.filter;
+package sonia.scm.web.filter;
 
 //~--- JDK imports ------------------------------------------------------------
 
diff --git a/scm-webapp/src/main/java/sonia/scm/security/Authenticator.java b/scm-web-api/src/main/java/sonia/scm/web/security/Authenticator.java
similarity index 96%
rename from scm-webapp/src/main/java/sonia/scm/security/Authenticator.java
rename to scm-web-api/src/main/java/sonia/scm/web/security/Authenticator.java
index f09bdde1b1..f11a822dee 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/Authenticator.java
+++ b/scm-web-api/src/main/java/sonia/scm/web/security/Authenticator.java
@@ -5,7 +5,7 @@
 
 
 
-package sonia.scm.security;
+package sonia.scm.web.security;
 
 //~--- non-JDK imports --------------------------------------------------------
 
diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 49181b7e0f..d3ff6eeae7 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -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>
diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
index da29c54a56..c4c3b838fd 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
@@ -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);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
index 08e9f7c47b..6d8660e916 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
@@ -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 ------------------------------------------------------------
 
diff --git a/scm-webapp/src/main/java/sonia/scm/filter/GZipFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/GZipFilter.java
index eb330c880d..1e80f5589b 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/GZipFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/filter/GZipFilter.java
@@ -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;
diff --git a/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
index 038fa30b2a..923cab900e 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/filter/SecurityFilter.java
@@ -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;
 
 /**
  *
diff --git a/scm-webapp/src/main/java/sonia/scm/filter/StaticResourceFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/StaticResourceFilter.java
index 5463360f24..e98afe1443 100644
--- a/scm-webapp/src/main/java/sonia/scm/filter/StaticResourceFilter.java
+++ b/scm-webapp/src/main/java/sonia/scm/filter/StaticResourceFilter.java
@@ -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;
diff --git a/scm-webapp/src/main/java/sonia/scm/security/DemoAuthenticator.java b/scm-webapp/src/main/java/sonia/scm/web/security/DemoAuthenticator.java
similarity index 97%
rename from scm-webapp/src/main/java/sonia/scm/security/DemoAuthenticator.java
rename to scm-webapp/src/main/java/sonia/scm/web/security/DemoAuthenticator.java
index f8f45bc995..c0c13329f8 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/DemoAuthenticator.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/security/DemoAuthenticator.java
@@ -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;