Merge 68859c3 into ed616dc

CJSCommonPlatform · Jun 14, 2019 · c009642 · c009642
2 parents ed616dc + 68859c3
commit c009642
Show file tree

Hide file tree

Showing 24 changed files with 20 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## Changed
+- Renamed subscription-repository to event-tracking
+
 ## [2.0.0-M37] - 2019-06-14
 ## Changed
 - Implement usage of new system database

diff --git a/event-source-subscriptions/subscription-repository/pom.xml b/event-source-subscriptions/subscription-repository/pom.xml
diff --git a/event-sourcing/subscription-manager/pom.xml b/event-sourcing/subscription-manager/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
-            <artifactId>subscription-event-tracking</artifactId>
+            <artifactId>event-tracking-service</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

diff --git a/...subscription-repository-liquibase/pom.xml → ...tracking/event-tracking-liquibase/pom.xml b/...subscription-repository-liquibase/pom.xml → ...tracking/event-tracking-liquibase/pom.xml
@@ -3,13 +3,13 @@
          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">
     <parent>
-        <artifactId>subscription-repository</artifactId>
+        <artifactId>event-tracking</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>subscription-repository-liquibase</artifactId>
+    <artifactId>event-tracking-liquibase</artifactId>
 
     <properties>
         <sonar.skip>true</sonar.skip>

diff --git a/...e/src/main/resources/liquibase.properties → ...e/src/main/resources/liquibase.properties b/...e/src/main/resources/liquibase.properties → ...e/src/main/resources/liquibase.properties
@@ -1,4 +1,4 @@
-changeLogFile=liquibase/subscription-repository-changelog.xml
+changeLogFile=liquibase/event-tracking-changelog.xml
 ## Commented the following line until we can figure out a way to tell table specific schema name
 ## to JPA through a property rather than hard coding into the entity class.
 ##defaultSchemaName=eventstore
diff --git a/...ase/subscription-repository-changelog.xml → ...es/liquibase/event-tracking-changelog.xml b/...ase/subscription-repository-changelog.xml → ...es/liquibase/event-tracking-changelog.xml
@@ -4,6 +4,6 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
          http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
 
-    <includeAll relativeToChangelogFile="true" path="subscription-repository-changesets"/>
+    <includeAll relativeToChangelogFile="true" path="event-tracking-changesets"/>
 
 </databaseChangeLog>
diff --git a/...-current_event_number-table.changelog.xml → ...-current_event_number-table.changelog.xml b/...-current_event_number-table.changelog.xml → ...-current_event_number-table.changelog.xml
diff --git a/...-current_event_number-table.changelog.xml → ...-current_event_number-table.changelog.xml b/...-current_event_number-table.changelog.xml → ...-current_event_number-table.changelog.xml
diff --git a/...3-add-processed_event-table.changelog.xml → ...3-add-processed_event-table.changelog.xml b/...3-add-processed_event-table.changelog.xml → ...3-add-processed_event-table.changelog.xml
diff --git a/...me-to-processed_event-table.changelog.xml → ...me-to-processed_event-table.changelog.xml b/...me-to-processed_event-table.changelog.xml → ...me-to-processed_event-table.changelog.xml
diff --git a/subscription-event-tracking/pom.xml → ...t-tracking/event-tracking-service/pom.xml b/subscription-event-tracking/pom.xml → ...t-tracking/event-tracking-service/pom.xml
@@ -3,13 +3,13 @@
          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">
     <parent>
-        <artifactId>event-store</artifactId>
+        <artifactId>event-tracking</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>subscription-event-tracking</artifactId>
+    <artifactId>event-tracking-service</artifactId>
 
     <dependencies>
 
@@ -58,7 +58,7 @@
                 <artifactId>liquibase-maven-plugin</artifactId>
                 <version>${liquibase.version}</version>
                 <configuration>
-                    <changeLogFile>liquibase/subscription-repository-changelog.xml</changeLogFile>
+                    <changeLogFile>liquibase/event-tracking-changelog.xml</changeLogFile>
                     <driver>org.postgresql.Driver</driver>
                     <url>jdbc:postgresql://localhost:5432/frameworkviewstore</url>
                     <username>framework</username>
@@ -76,7 +76,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>uk.gov.justice.event-store</groupId>
-                        <artifactId>subscription-repository-liquibase</artifactId>
+                        <artifactId>event-tracking-liquibase</artifactId>
                         <version>${project.version}</version>
                     </dependency>
                     <dependency>

diff --git a/.../subscription/EventNumberAccumulator.java → .../subscription/EventNumberAccumulator.java b/.../subscription/EventNumberAccumulator.java → .../subscription/EventNumberAccumulator.java
diff --git a/...vices/subscription/MissingEventRange.java → ...vices/subscription/MissingEventRange.java b/...vices/subscription/MissingEventRange.java → ...vices/subscription/MissingEventRange.java
diff --git a/...subscription/ProcessedEventTrackItem.java → ...subscription/ProcessedEventTrackItem.java b/...subscription/ProcessedEventTrackItem.java → ...subscription/ProcessedEventTrackItem.java
diff --git a/...tion/ProcessedEventTrackingException.java → ...tion/ProcessedEventTrackingException.java b/...tion/ProcessedEventTrackingException.java → ...tion/ProcessedEventTrackingException.java
diff --git a/...ion/ProcessedEventTrackingRepository.java → ...ion/ProcessedEventTrackingRepository.java b/...ion/ProcessedEventTrackingRepository.java → ...ion/ProcessedEventTrackingRepository.java
diff --git a/...iption/ProcessedEventTrackingService.java → ...iption/ProcessedEventTrackingService.java b/...iption/ProcessedEventTrackingService.java → ...iption/ProcessedEventTrackingService.java
diff --git a/...ing/src/main/resources/META-INF/beans.xml → ...ice/src/main/resources/META-INF/beans.xml b/...ing/src/main/resources/META-INF/beans.xml → ...ice/src/main/resources/META-INF/beans.xml
diff --git a/...ption/ProcessedEventTrackItemBuilder.java → ...ption/ProcessedEventTrackItemBuilder.java b/...ption/ProcessedEventTrackItemBuilder.java → ...ption/ProcessedEventTrackItemBuilder.java
diff --git a/...n/ProcessedEventTrackingRepositoryIT.java → ...n/ProcessedEventTrackingRepositoryIT.java b/...n/ProcessedEventTrackingRepositoryIT.java → ...n/ProcessedEventTrackingRepositoryIT.java
diff --git a/...on/ProcessedEventTrackingServiceTest.java → ...on/ProcessedEventTrackingServiceTest.java b/...on/ProcessedEventTrackingServiceTest.java → ...on/ProcessedEventTrackingServiceTest.java
diff --git a/event-source-subscriptions/pom.xml → event-tracking/pom.xml b/event-source-subscriptions/pom.xml → event-tracking/pom.xml
@@ -9,10 +9,11 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>event-source-subscriptions</artifactId>
+    <artifactId>event-tracking</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>subscription-repository</module>
+        <module>event-tracking-service</module>
+        <module>event-tracking-liquibase</module>
     </modules>
 
 </project>
diff --git a/interceptors/subscription-event-interceptors/pom.xml b/interceptors/subscription-event-interceptors/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
-            <artifactId>subscription-event-tracking</artifactId>
+            <artifactId>event-tracking-service</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -83,7 +83,7 @@
                 <artifactId>liquibase-maven-plugin</artifactId>
                 <version>${liquibase.version}</version>
                 <configuration>
-                    <changeLogFile>liquibase/subscription-repository-changelog.xml</changeLogFile>
+                    <changeLogFile>liquibase/event-tracking-changelog.xml</changeLogFile>
                     <driver>org.postgresql.Driver</driver>
                     <url>jdbc:postgresql://localhost:5432/frameworkviewstore</url>
                     <username>framework</username>
@@ -101,7 +101,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>uk.gov.justice.event-store</groupId>
-                        <artifactId>subscription-repository-liquibase</artifactId>
+                        <artifactId>event-tracking-liquibase</artifactId>
                         <version>${project.version}</version>
                     </dependency>
                     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -26,8 +26,7 @@
         <module>interceptors</module>
         <module>event-store-bom</module>
         <module>test-utils-event-store</module>
-        <module>event-source-subscriptions</module>
-        <module>subscription-event-tracking</module>
+        <module>event-tracking</module>
         <module>event-store-management</module>
     </modules>