From f29cff9a139749e60e404c7960fefc1b573be5a5 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 5 Dec 2010 14:00:01 +0100 Subject: [PATCH] move sources from scm-web-api and scm-cli to scm-core --- plugins/scm-git-plugin/pom.xml | 6 ---- plugins/scm-graph-plugin/pom.xml | 6 ---- plugins/scm-hg-plugin/pom.xml | 6 ---- plugins/scm-svn-plugin/pom.xml | 6 ---- pom.xml | 11 ++++--- samples/scm-sample-auth/pom.xml | 6 ---- scm-cli/pom.xml | 18 ---------- scm-core/pom.xml | 21 ++++++++++++ .../src/main/java/sonia/scm/cli/Argument.java | 0 .../main/java/sonia/scm/cli/CliException.java | 0 .../java/sonia/scm/cli/CliHelpBuilder.java | 0 .../main/java/sonia/scm/cli/CliParser.java | 0 .../sonia/scm/cli/CliRequiredException.java | 0 .../main/java/sonia/scm/cli/ConvertUtil.java | 0 .../sonia/scm/cli/DefaultCliHelpBuilder.java | 0 .../sonia/scm/web/cgi/AbstractCGIServlet.java | 0 .../java/sonia/scm/web/cgi/CGIRunner.java | 0 .../main/java/sonia/scm/web/cgi/EnvList.java | 0 .../web/filter/BasicAuthenticationFilter.java | 0 .../java/sonia/scm/web/filter/HttpFilter.java | 0 .../sonia/scm/web/filter/LoggingFilter.java | 0 .../scm/web/filter/PermissionFilter.java | 0 .../scm/web/filter/RegexPermissionFilter.java | 0 .../SecurityHttpServletRequestWrapper.java | 0 .../web/security/AuthenticationHandler.java | 0 .../web/security/AuthenticationManager.java | 0 .../web/security/AuthenticationResult.java | 0 .../scm/web/security/AuthenticationState.java | 0 .../web/security/BasicSecurityContext.java | 0 .../security/ChainAuthenticatonManager.java | 0 .../scm/web/security/WebSecurityContext.java | 0 .../security/XmlAuthenticationHandler.java | 0 .../scm/repository/PermissionUtilTest.java | 4 +++ scm-server-api/pom.xml | 6 ---- {scm-web-api => scm-test}/pom.xml | 33 ++++++++----------- .../main}/java/sonia/scm/ManagerTestBase.java | 0 .../repository/DummyRepositoryHandler.java | 0 .../repository/RepositoryManagerTestBase.java | 0 .../sonia/scm/user/UserManagerTestBase.java | 0 scm-webapp/pom.xml | 15 +++++---- .../repository/xml/XmlRepositoryDatabase.java | 0 .../scm/repository/xml/XmlRepositoryList.java | 0 .../repository/xml/XmlRepositoryManager.java | 0 .../xml/XmlRepositoryMapAdapter.java | 0 .../sonia/scm/user/xml/XmlUserDatabase.java | 0 .../java/sonia/scm/user/xml/XmlUserList.java | 0 .../sonia/scm/user/xml/XmlUserManager.java | 0 .../sonia/scm/user/xml/XmlUserMapAdapter.java | 0 .../repository/XmlRepositoryManagerTest.java | 0 .../sonia/scm/user/XmlUserManagerTest.java | 0 50 files changed, 53 insertions(+), 85 deletions(-) delete mode 100644 scm-cli/pom.xml rename {scm-cli => scm-core}/src/main/java/sonia/scm/cli/Argument.java (100%) rename {scm-cli => scm-core}/src/main/java/sonia/scm/cli/CliException.java (100%) rename {scm-cli => scm-core}/src/main/java/sonia/scm/cli/CliHelpBuilder.java (100%) rename {scm-cli => scm-core}/src/main/java/sonia/scm/cli/CliParser.java (100%) rename {scm-cli => scm-core}/src/main/java/sonia/scm/cli/CliRequiredException.java (100%) rename {scm-cli => scm-core}/src/main/java/sonia/scm/cli/ConvertUtil.java (100%) rename {scm-cli => scm-core}/src/main/java/sonia/scm/cli/DefaultCliHelpBuilder.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/cgi/CGIRunner.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/cgi/EnvList.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/filter/HttpFilter.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/filter/LoggingFilter.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/filter/PermissionFilter.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/filter/RegexPermissionFilter.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/security/AuthenticationHandler.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/security/AuthenticationManager.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/security/AuthenticationResult.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/security/AuthenticationState.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/security/BasicSecurityContext.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/security/WebSecurityContext.java (100%) rename {scm-web-api => scm-core}/src/main/java/sonia/scm/web/security/XmlAuthenticationHandler.java (100%) rename {scm-web-api => scm-test}/pom.xml (55%) rename {scm-core/src/test => scm-test/src/main}/java/sonia/scm/ManagerTestBase.java (100%) rename {scm-core/src/test => scm-test/src/main}/java/sonia/scm/repository/DummyRepositoryHandler.java (100%) rename {scm-core/src/test => scm-test/src/main}/java/sonia/scm/repository/RepositoryManagerTestBase.java (100%) rename {scm-core/src/test => scm-test/src/main}/java/sonia/scm/user/UserManagerTestBase.java (100%) rename {scm-core => scm-webapp}/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java (100%) rename {scm-core => scm-webapp}/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java (100%) rename {scm-core => scm-webapp}/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java (100%) rename {scm-core => scm-webapp}/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java (100%) rename {scm-core => scm-webapp}/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java (100%) rename {scm-core => scm-webapp}/src/main/java/sonia/scm/user/xml/XmlUserList.java (100%) rename {scm-core => scm-webapp}/src/main/java/sonia/scm/user/xml/XmlUserManager.java (100%) rename {scm-core => scm-webapp}/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java (100%) rename {scm-core => scm-webapp}/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java (100%) rename {scm-core => scm-webapp}/src/test/java/sonia/scm/user/XmlUserManagerTest.java (100%) diff --git a/plugins/scm-git-plugin/pom.xml b/plugins/scm-git-plugin/pom.xml index 114c1893fb..43e1eb08a4 100644 --- a/plugins/scm-git-plugin/pom.xml +++ b/plugins/scm-git-plugin/pom.xml @@ -18,12 +18,6 @@ Plugin for the version control system Git - - - sonia.scm - scm-web-api - 1.0-M3-SNAPSHOT - javax.servlet diff --git a/plugins/scm-graph-plugin/pom.xml b/plugins/scm-graph-plugin/pom.xml index a21eca85c5..c5d3d17f0d 100644 --- a/plugins/scm-graph-plugin/pom.xml +++ b/plugins/scm-graph-plugin/pom.xml @@ -25,12 +25,6 @@ provided - - sonia.scm - scm-web-api - 1.0-M3-SNAPSHOT - - com.google.inject.extensions guice-grapher diff --git a/plugins/scm-hg-plugin/pom.xml b/plugins/scm-hg-plugin/pom.xml index 3582dcae95..bccf7cc264 100644 --- a/plugins/scm-hg-plugin/pom.xml +++ b/plugins/scm-hg-plugin/pom.xml @@ -26,12 +26,6 @@ provided - - sonia.scm - scm-web-api - 1.0-M3-SNAPSHOT - - diff --git a/plugins/scm-svn-plugin/pom.xml b/plugins/scm-svn-plugin/pom.xml index 9030835142..bcbbee4aeb 100644 --- a/plugins/scm-svn-plugin/pom.xml +++ b/plugins/scm-svn-plugin/pom.xml @@ -19,12 +19,6 @@ - - sonia.scm - scm-web-api - 1.0-M3-SNAPSHOT - - org.tmatesoft.svnkit svnkit diff --git a/pom.xml b/pom.xml index 13f3fcd851..10542a3b56 100644 --- a/pom.xml +++ b/pom.xml @@ -38,9 +38,8 @@ third-party scm-core + scm-test maven - scm-cli - scm-web-api scm-server-api scm-server-jetty plugins @@ -70,14 +69,14 @@ junit junit - 4.8.2 + ${junit.version} test org.mockito mockito-all - 1.8.5 + ${mokito.version} test @@ -251,6 +250,8 @@ + 1.8.5 + 4.8.2 1.6.1 2.5 2.0 @@ -261,4 +262,4 @@ SCM-BSD - + \ No newline at end of file diff --git a/samples/scm-sample-auth/pom.xml b/samples/scm-sample-auth/pom.xml index 9289b35816..f73dc4e816 100644 --- a/samples/scm-sample-auth/pom.xml +++ b/samples/scm-sample-auth/pom.xml @@ -32,12 +32,6 @@ 1.0-M3-SNAPSHOT - - sonia.scm - scm-web-api - 1.0-M3-SNAPSHOT - - diff --git a/scm-cli/pom.xml b/scm-cli/pom.xml deleted file mode 100644 index 206accefad..0000000000 --- a/scm-cli/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - 4.0.0 - - - scm - sonia.scm - 1.0-M3-SNAPSHOT - - - sonia.scm - scm-cli - 1.0-M3-SNAPSHOT - scm-cli - - diff --git a/scm-core/pom.xml b/scm-core/pom.xml index 12d041c837..6c16ebfef6 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -17,6 +17,13 @@ + + javax.servlet + servlet-api + ${servlet.version} + provided + + com.google.inject guice @@ -29,6 +36,20 @@ ${guice.version} + + com.google.inject.extensions + guice-servlet + ${guice.version} + + + + com.sun.jersey + jersey-core + ${jersey.version} + + + + org.slf4j slf4j-simple diff --git a/scm-cli/src/main/java/sonia/scm/cli/Argument.java b/scm-core/src/main/java/sonia/scm/cli/Argument.java similarity index 100% rename from scm-cli/src/main/java/sonia/scm/cli/Argument.java rename to scm-core/src/main/java/sonia/scm/cli/Argument.java diff --git a/scm-cli/src/main/java/sonia/scm/cli/CliException.java b/scm-core/src/main/java/sonia/scm/cli/CliException.java similarity index 100% rename from scm-cli/src/main/java/sonia/scm/cli/CliException.java rename to scm-core/src/main/java/sonia/scm/cli/CliException.java diff --git a/scm-cli/src/main/java/sonia/scm/cli/CliHelpBuilder.java b/scm-core/src/main/java/sonia/scm/cli/CliHelpBuilder.java similarity index 100% rename from scm-cli/src/main/java/sonia/scm/cli/CliHelpBuilder.java rename to scm-core/src/main/java/sonia/scm/cli/CliHelpBuilder.java diff --git a/scm-cli/src/main/java/sonia/scm/cli/CliParser.java b/scm-core/src/main/java/sonia/scm/cli/CliParser.java similarity index 100% rename from scm-cli/src/main/java/sonia/scm/cli/CliParser.java rename to scm-core/src/main/java/sonia/scm/cli/CliParser.java diff --git a/scm-cli/src/main/java/sonia/scm/cli/CliRequiredException.java b/scm-core/src/main/java/sonia/scm/cli/CliRequiredException.java similarity index 100% rename from scm-cli/src/main/java/sonia/scm/cli/CliRequiredException.java rename to scm-core/src/main/java/sonia/scm/cli/CliRequiredException.java diff --git a/scm-cli/src/main/java/sonia/scm/cli/ConvertUtil.java b/scm-core/src/main/java/sonia/scm/cli/ConvertUtil.java similarity index 100% rename from scm-cli/src/main/java/sonia/scm/cli/ConvertUtil.java rename to scm-core/src/main/java/sonia/scm/cli/ConvertUtil.java diff --git a/scm-cli/src/main/java/sonia/scm/cli/DefaultCliHelpBuilder.java b/scm-core/src/main/java/sonia/scm/cli/DefaultCliHelpBuilder.java similarity index 100% rename from scm-cli/src/main/java/sonia/scm/cli/DefaultCliHelpBuilder.java rename to scm-core/src/main/java/sonia/scm/cli/DefaultCliHelpBuilder.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java b/scm-core/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java rename to scm-core/src/main/java/sonia/scm/web/cgi/AbstractCGIServlet.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/cgi/CGIRunner.java b/scm-core/src/main/java/sonia/scm/web/cgi/CGIRunner.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/cgi/CGIRunner.java rename to scm-core/src/main/java/sonia/scm/web/cgi/CGIRunner.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/cgi/EnvList.java b/scm-core/src/main/java/sonia/scm/web/cgi/EnvList.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/cgi/EnvList.java rename to scm-core/src/main/java/sonia/scm/web/cgi/EnvList.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java rename to scm-core/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/HttpFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/HttpFilter.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/filter/HttpFilter.java rename to scm-core/src/main/java/sonia/scm/web/filter/HttpFilter.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/LoggingFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/LoggingFilter.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/filter/LoggingFilter.java rename to scm-core/src/main/java/sonia/scm/web/filter/LoggingFilter.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/PermissionFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/PermissionFilter.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/filter/PermissionFilter.java rename to scm-core/src/main/java/sonia/scm/web/filter/PermissionFilter.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/RegexPermissionFilter.java b/scm-core/src/main/java/sonia/scm/web/filter/RegexPermissionFilter.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/filter/RegexPermissionFilter.java rename to scm-core/src/main/java/sonia/scm/web/filter/RegexPermissionFilter.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java b/scm-core/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java rename to scm-core/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationHandler.java b/scm-core/src/main/java/sonia/scm/web/security/AuthenticationHandler.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationHandler.java rename to scm-core/src/main/java/sonia/scm/web/security/AuthenticationHandler.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationManager.java b/scm-core/src/main/java/sonia/scm/web/security/AuthenticationManager.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationManager.java rename to scm-core/src/main/java/sonia/scm/web/security/AuthenticationManager.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationResult.java b/scm-core/src/main/java/sonia/scm/web/security/AuthenticationResult.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationResult.java rename to scm-core/src/main/java/sonia/scm/web/security/AuthenticationResult.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationState.java b/scm-core/src/main/java/sonia/scm/web/security/AuthenticationState.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/security/AuthenticationState.java rename to scm-core/src/main/java/sonia/scm/web/security/AuthenticationState.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/BasicSecurityContext.java b/scm-core/src/main/java/sonia/scm/web/security/BasicSecurityContext.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/security/BasicSecurityContext.java rename to scm-core/src/main/java/sonia/scm/web/security/BasicSecurityContext.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java b/scm-core/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java rename to scm-core/src/main/java/sonia/scm/web/security/ChainAuthenticatonManager.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/WebSecurityContext.java b/scm-core/src/main/java/sonia/scm/web/security/WebSecurityContext.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/security/WebSecurityContext.java rename to scm-core/src/main/java/sonia/scm/web/security/WebSecurityContext.java diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/XmlAuthenticationHandler.java b/scm-core/src/main/java/sonia/scm/web/security/XmlAuthenticationHandler.java similarity index 100% rename from scm-web-api/src/main/java/sonia/scm/web/security/XmlAuthenticationHandler.java rename to scm-core/src/main/java/sonia/scm/web/security/XmlAuthenticationHandler.java diff --git a/scm-core/src/test/java/sonia/scm/repository/PermissionUtilTest.java b/scm-core/src/test/java/sonia/scm/repository/PermissionUtilTest.java index 964408cd51..3b44ade372 100644 --- a/scm-core/src/test/java/sonia/scm/repository/PermissionUtilTest.java +++ b/scm-core/src/test/java/sonia/scm/repository/PermissionUtilTest.java @@ -44,6 +44,10 @@ import static org.junit.Assert.*; //~--- JDK imports ------------------------------------------------------------ import java.util.Arrays; +import sonia.scm.repository.Permission; +import sonia.scm.repository.PermissionType; +import sonia.scm.repository.PermissionUtil; +import sonia.scm.repository.Repository; /** * diff --git a/scm-server-api/pom.xml b/scm-server-api/pom.xml index cc52104c7e..4a3d8985b1 100644 --- a/scm-server-api/pom.xml +++ b/scm-server-api/pom.xml @@ -23,12 +23,6 @@ 1.0-M3-SNAPSHOT - - sonia.scm - scm-cli - 1.0-M3-SNAPSHOT - - diff --git a/scm-web-api/pom.xml b/scm-test/pom.xml similarity index 55% rename from scm-web-api/pom.xml rename to scm-test/pom.xml index 2f4a5d6822..2184f993b0 100644 --- a/scm-web-api/pom.xml +++ b/scm-test/pom.xml @@ -1,9 +1,9 @@ - + 4.0.0 - + scm sonia.scm @@ -11,37 +11,30 @@ sonia.scm - scm-web-api + scm-test 1.0-M3-SNAPSHOT - scm-web-api - + scm-test + - - javax.servlet - servlet-api - ${servlet.version} - provided - - sonia.scm scm-core 1.0-M3-SNAPSHOT - + - com.sun.jersey - jersey-core - ${jersey.version} + junit + junit + ${junit.version} - com.google.inject.extensions - guice-servlet - ${guice.version} + org.mockito + mockito-all + ${mokito.version} - + diff --git a/scm-core/src/test/java/sonia/scm/ManagerTestBase.java b/scm-test/src/main/java/sonia/scm/ManagerTestBase.java similarity index 100% rename from scm-core/src/test/java/sonia/scm/ManagerTestBase.java rename to scm-test/src/main/java/sonia/scm/ManagerTestBase.java diff --git a/scm-core/src/test/java/sonia/scm/repository/DummyRepositoryHandler.java b/scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java similarity index 100% rename from scm-core/src/test/java/sonia/scm/repository/DummyRepositoryHandler.java rename to scm-test/src/main/java/sonia/scm/repository/DummyRepositoryHandler.java diff --git a/scm-core/src/test/java/sonia/scm/repository/RepositoryManagerTestBase.java b/scm-test/src/main/java/sonia/scm/repository/RepositoryManagerTestBase.java similarity index 100% rename from scm-core/src/test/java/sonia/scm/repository/RepositoryManagerTestBase.java rename to scm-test/src/main/java/sonia/scm/repository/RepositoryManagerTestBase.java diff --git a/scm-core/src/test/java/sonia/scm/user/UserManagerTestBase.java b/scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java similarity index 100% rename from scm-core/src/test/java/sonia/scm/user/UserManagerTestBase.java rename to scm-test/src/main/java/sonia/scm/user/UserManagerTestBase.java diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 4740064b2f..3f8726e052 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -31,12 +31,6 @@ 1.0-M3-SNAPSHOT - - sonia.scm - scm-web-api - 1.0-M3-SNAPSHOT - - sonia.scm.plugins scm-hg-plugin @@ -103,6 +97,15 @@ ${ehcache.version} + + + + sonia.scm + scm-test + 1.0-M3-SNAPSHOT + test + + diff --git a/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java similarity index 100% rename from scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java rename to scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryDatabase.java diff --git a/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java similarity index 100% rename from scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java rename to scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryList.java diff --git a/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java similarity index 100% rename from scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java rename to scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java diff --git a/scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java b/scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java similarity index 100% rename from scm-core/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java rename to scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryMapAdapter.java diff --git a/scm-core/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java similarity index 100% rename from scm-core/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java rename to scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserDatabase.java diff --git a/scm-core/src/main/java/sonia/scm/user/xml/XmlUserList.java b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserList.java similarity index 100% rename from scm-core/src/main/java/sonia/scm/user/xml/XmlUserList.java rename to scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserList.java diff --git a/scm-core/src/main/java/sonia/scm/user/xml/XmlUserManager.java b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserManager.java similarity index 100% rename from scm-core/src/main/java/sonia/scm/user/xml/XmlUserManager.java rename to scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserManager.java diff --git a/scm-core/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java b/scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java similarity index 100% rename from scm-core/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java rename to scm-webapp/src/main/java/sonia/scm/user/xml/XmlUserMapAdapter.java diff --git a/scm-core/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java similarity index 100% rename from scm-core/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java rename to scm-webapp/src/test/java/sonia/scm/repository/XmlRepositoryManagerTest.java diff --git a/scm-core/src/test/java/sonia/scm/user/XmlUserManagerTest.java b/scm-webapp/src/test/java/sonia/scm/user/XmlUserManagerTest.java similarity index 100% rename from scm-core/src/test/java/sonia/scm/user/XmlUserManagerTest.java rename to scm-webapp/src/test/java/sonia/scm/user/XmlUserManagerTest.java