Refactoring clustered map entity module structure

albinsuresh · Jul 26, 2016 · 0bf87e7 · 0bf87e7
1 parent 776a15d
commit 0bf87e7
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 20 deletions.
diff --git a/concurrent-map-entity/client/pom.xml b/concurrent-map-entity/client/pom.xml
@@ -22,13 +22,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.terracotta</groupId>
-    <artifactId>platform-root</artifactId>
+    <groupId>org.terracotta.entities</groupId>
+    <artifactId>clustered-map-entity</artifactId>
     <version>5.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
   </parent>
 
-  <groupId>org.terracotta.entities</groupId>
   <artifactId>clustered-map-client</artifactId>
 
   <dependencies>

diff --git a/concurrent-map-entity/common/pom.xml b/concurrent-map-entity/common/pom.xml
@@ -21,13 +21,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.terracotta</groupId>
-    <artifactId>platform-root</artifactId>
+    <groupId>org.terracotta.entities</groupId>
+    <artifactId>clustered-map-entity</artifactId>
     <version>5.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
   </parent>
 
-  <groupId>org.terracotta.entities</groupId>
   <artifactId>clustered-map-common</artifactId>
 
   <dependencies>

diff --git a/concurrent-map-entity/integration-tests/pom.xml b/concurrent-map-entity/integration-tests/pom.xml
@@ -22,13 +22,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.terracotta</groupId>
-    <artifactId>platform-root</artifactId>
+    <groupId>org.terracotta.entities</groupId>
+    <artifactId>clustered-map-entity</artifactId>
     <version>5.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
   </parent>
 
-  <groupId>org.terracotta.entities</groupId>
   <artifactId>clustered-map-integration-tests</artifactId>
 
   <dependencies>

diff --git a/concurrent-map-entity/pom.xml b/concurrent-map-entity/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright Terracotta, Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>pom</packaging>
+
+  <parent>
+    <groupId>org.terracotta</groupId>
+    <artifactId>platform-root</artifactId>
+    <version>5.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.terracotta.entities</groupId>
+  <artifactId>clustered-map-entity</artifactId>
+  <name>Clustered Map Parent</name>
+
+  <modules>
+    <module>common</module>
+    <module>client</module>
+    <module>server</module>
+    <module>integration-tests</module>
+  </modules>
+
+</project>
diff --git a/concurrent-map-entity/server/pom.xml b/concurrent-map-entity/server/pom.xml
@@ -22,13 +22,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.terracotta</groupId>
-    <artifactId>platform-root</artifactId>
+    <groupId>org.terracotta.entities</groupId>
+    <artifactId>clustered-map-entity</artifactId>
     <version>5.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
   </parent>
 
-  <groupId>org.terracotta.entities</groupId>
   <artifactId>clustered-map-server</artifactId>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -35,10 +35,7 @@
   <modules>
     <module>offheap-resource</module>
     <module>proxy</module>
-    <module>concurrent-map-entity/common</module>
-    <module>concurrent-map-entity/client</module>
-    <module>concurrent-map-entity/server</module>
-    <module>concurrent-map-entity/integration-tests</module>
+    <module>concurrent-map-entity</module>
     <module>client-communicator-support</module>
     <module>healthchecker-entity</module>
     <module>management</module>
@@ -50,16 +47,19 @@
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.12</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-all</artifactId>
         <version>1.3</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-all</artifactId>
         <version>1.10.19</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -105,6 +105,7 @@
         <groupId> org.terracotta</groupId>
         <artifactId>passthrough-server</artifactId>
         <version>${passthrough-testing.version}</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.terracotta</groupId>