move sources from scm-web-api and scm-cli to scm-core

plugins/scm-git-plugin/pom.xml

@@ -18,12 +18,6 @@
   <description>Plugin for the version control system Git</description>
 
   <dependencies>
-    
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
 
     <dependency>
       <groupId>javax.servlet</groupId>

plugins/scm-graph-plugin/pom.xml

@@ -25,12 +25,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>com.google.inject.extensions</groupId>
       <artifactId>guice-grapher</artifactId>

plugins/scm-hg-plugin/pom.xml

@@ -26,12 +26,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-
   </dependencies>
  
 </project>

plugins/scm-svn-plugin/pom.xml

@@ -19,12 +19,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>org.tmatesoft.svnkit</groupId>
       <artifactId>svnkit</artifactId>

pom.xml

@@ -38,9 +38,8 @@
   <modules>
     <module>third-party</module>
     <module>scm-core</module>
+    <module>scm-test</module>
     <module>maven</module>
-    <module>scm-cli</module>
-    <module>scm-web-api</module>
     <module>scm-server-api</module>
     <module>scm-server-jetty</module>
     <module>plugins</module>
@@ -70,14 +69,14 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.2</version>
+      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>1.8.5</version>
+      <version>${mokito.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -251,6 +250,8 @@
   </profiles>
 
   <properties>
+    <mokito.version>1.8.5</mokito.version>
+    <junit.version>4.8.2</junit.version>
     <slf4j.version>1.6.1</slf4j.version>
     <servlet.version>2.5</servlet.version>
     <guice.version>2.0</guice.version>
@@ -261,4 +262,4 @@
     <netbeans.hint.license>SCM-BSD</netbeans.hint.license>
   </properties>
 
-</project>
+</project>

samples/scm-sample-auth/pom.xml

@@ -32,12 +32,6 @@
       <version>1.0-M3-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-
   </dependencies>
   
 </project>

scm-cli/pom.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-    <artifactId>scm</artifactId>
-    <groupId>sonia.scm</groupId>
-    <version>1.0-M3-SNAPSHOT</version>
-  </parent>
-
-  <groupId>sonia.scm</groupId>
-  <artifactId>scm-cli</artifactId>
-  <version>1.0-M3-SNAPSHOT</version>
-  <name>scm-cli</name>
-
-</project>

scm-core/pom.xml

@@ -17,6 +17,13 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>${servlet.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
@@ -29,6 +36,20 @@
       <version>${guice.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-servlet</artifactId>
+      <version>${guice.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+
+    <!-- test scope -->
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>

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;
 
 /**
  *

scm-server-api/pom.xml

@@ -23,12 +23,6 @@
       <version>1.0-M3-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-cli</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-    
   </dependencies>
 
 </project>

scm-test/pom.xml

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
   <modelVersion>4.0.0</modelVersion>
-  
+
   <parent>
     <artifactId>scm</artifactId>
     <groupId>sonia.scm</groupId>
@@ -11,37 +11,30 @@
   </parent>
 
   <groupId>sonia.scm</groupId>
-  <artifactId>scm-web-api</artifactId>
+  <artifactId>scm-test</artifactId>
   <version>1.0-M3-SNAPSHOT</version>
-  <name>scm-web-api</name>
+  <name>scm-test</name>
-
+  
   <dependencies>
 
-    <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-M3-SNAPSHOT</version>
     </dependency>
-
+    
     <dependency>
-      <groupId>com.sun.jersey</groupId>
+      <groupId>junit</groupId>
-      <artifactId>jersey-core</artifactId>
+      <artifactId>junit</artifactId>
-      <version>${jersey.version}</version>
+      <version>${junit.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.google.inject.extensions</groupId>
+      <groupId>org.mockito</groupId>
-      <artifactId>guice-servlet</artifactId>
+      <artifactId>mockito-all</artifactId>
-      <version>${guice.version}</version>
+      <version>${mokito.version}</version>
     </dependency>
 
   </dependencies>
-
+  
 </project>

scm-webapp/pom.xml

@@ -31,12 +31,6 @@
       <version>1.0-M3-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>sonia.scm</groupId>
-      <artifactId>scm-web-api</artifactId>
-      <version>1.0-M3-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>sonia.scm.plugins</groupId>
       <artifactId>scm-hg-plugin</artifactId>
@@ -103,6 +97,15 @@
       <version>${ehcache.version}</version>
     </dependency>
 
+    <!-- test scope -->
+
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-test</artifactId>
+      <version>1.0-M3-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>