Merge pull request #20 from ExpediaDotCom/minor-versioning

Renaming modules
ExpediaDotCom · Oct 29, 2019 · 4efbe9d · 4efbe9d
2 parents 6efef3c + ab16d84
commit 4efbe9d
Show file tree

Hide file tree

Showing 40 changed files with 20 additions and 19 deletions.
diff --git a/.travis/build.sh b/.travis/build.sh
@@ -4,4 +4,4 @@
 
 ./mvnw --batch-mode install -B -V
 
-cd blobs-agent/reverse-proxy && docker build -t ${DOCKER_IMAGE_NAME} -f Dockerfile . && cd ../..
+cd agent/reverse-proxy && docker build -t ${DOCKER_IMAGE_NAME} -f Dockerfile . && cd ../..
diff --git a/README.md b/README.md
@@ -41,8 +41,9 @@ Use the following command to build the repository:
 
 ## Blobs Core
 
-This module contains all the core classes needed to instrument the creation of the blobs and then start the process of writing it to a [store](#stores). Only the Blob Model is created by the `blob.proto` present in [blobs-grpc-models](haystack-blobs/README.md#models) module inside the package `com.expedia.www.blobs.model`.
+This module contains all the core classes needed to instrument the creation of the blobs and then start the process of writing it to a [store](#stores). Only the Blob Model is created by the `blob.proto` present in [model](model) module inside the package `com.expedia.www.blobs.model`.
 
 ## Stores
 
-Click [here](stores/README.md) for more details.
+Click [here](stores/README.md) for more details.
+
diff --git a/blobs-agent/README.md → agent/README.md b/blobs-agent/README.md → agent/README.md
diff --git a/blobs-agent/blobs-agent-client/pom.xml → agent/client/pom.xml b/blobs-agent/blobs-agent-client/pom.xml → agent/client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blobs-agent</artifactId>
         <groupId>com.expedia.www</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>blobs-agent-client</artifactId>

diff --git a/...stack/agent/blobs/client/AgentClient.java → ...stack/agent/blobs/client/AgentClient.java b/...stack/agent/blobs/client/AgentClient.java → ...stack/agent/blobs/client/AgentClient.java
diff --git a/...k/agent/blobs/client/AgentClientTest.java → ...k/agent/blobs/client/AgentClientTest.java b/...k/agent/blobs/client/AgentClientTest.java → ...k/agent/blobs/client/AgentClientTest.java
diff --git a/...agent-client/src/test/resources/log4j.xml → agent/client/src/test/resources/log4j.xml b/...agent-client/src/test/resources/log4j.xml → agent/client/src/test/resources/log4j.xml
diff --git a/blobs-agent/blobs-agent-dispatchers/pom.xml → agent/dispatchers/pom.xml b/blobs-agent/blobs-agent-dispatchers/pom.xml → agent/dispatchers/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blobs-agent</artifactId>
         <groupId>com.expedia.www</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>blobs-agent-dispatchers</artifactId>

diff --git a/...blobs/dispatcher/core/BlobDispatcher.java → ...blobs/dispatcher/core/BlobDispatcher.java b/...blobs/dispatcher/core/BlobDispatcher.java → ...blobs/dispatcher/core/BlobDispatcher.java
diff --git a/...s/dispatcher/core/RateLimitException.java → ...s/dispatcher/core/RateLimitException.java b/...s/dispatcher/core/RateLimitException.java → ...s/dispatcher/core/RateLimitException.java
diff --git a/...ent/blobs/dispatcher/s3/S3Dispatcher.java → ...ent/blobs/dispatcher/s3/S3Dispatcher.java b/...ent/blobs/dispatcher/s3/S3Dispatcher.java → ...ent/blobs/dispatcher/s3/S3Dispatcher.java
diff --git a/...dispatcher/s3/UploadProgressListener.java → ...dispatcher/s3/UploadProgressListener.java b/...dispatcher/s3/UploadProgressListener.java → ...dispatcher/s3/UploadProgressListener.java
diff --git a/...-dispatchers/src/test/resources/log4j.xml → .../dispatchers/src/test/resources/log4j.xml b/...-dispatchers/src/test/resources/log4j.xml → .../dispatchers/src/test/resources/log4j.xml
diff --git a/...lobs/dispatcher/s3/S3DispatcherSpec.scala → ...lobs/dispatcher/s3/S3DispatcherSpec.scala b/...lobs/dispatcher/s3/S3DispatcherSpec.scala → ...lobs/dispatcher/s3/S3DispatcherSpec.scala
diff --git a/...tcher/s3/UploadProgressListenerSpec.scala → ...tcher/s3/UploadProgressListenerSpec.scala b/...tcher/s3/UploadProgressListenerSpec.scala → ...tcher/s3/UploadProgressListenerSpec.scala
diff --git a/blobs-agent/pom.xml → agent/pom.xml b/blobs-agent/pom.xml → agent/pom.xml
@@ -5,16 +5,16 @@
     <parent>
         <artifactId>blobs</artifactId>
         <groupId>com.expedia.www</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blobs-agent</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>blobs-agent-server</module>
-        <module>blobs-agent-client</module>
-        <module>blobs-agent-dispatchers</module>
+        <module>server</module>
+        <module>client</module>
+        <module>dispatchers</module>
     </modules>
 
     <properties>

diff --git a/blobs-agent/reverse-proxy/Dockerfile → agent/reverse-proxy/Dockerfile b/blobs-agent/reverse-proxy/Dockerfile → agent/reverse-proxy/Dockerfile
diff --git a/blobs-agent/reverse-proxy/blob/blob.pb.go → agent/reverse-proxy/blob/blob.pb.go b/blobs-agent/reverse-proxy/blob/blob.pb.go → agent/reverse-proxy/blob/blob.pb.go
diff --git a/...-agent/reverse-proxy/blob/blobAgent.pb.go → agent/reverse-proxy/blob/blobAgent.pb.go b/...-agent/reverse-proxy/blob/blobAgent.pb.go → agent/reverse-proxy/blob/blobAgent.pb.go
diff --git a/...ent/reverse-proxy/blob/blobAgent.pb.gw.go → agent/reverse-proxy/blob/blobAgent.pb.gw.go b/...ent/reverse-proxy/blob/blobAgent.pb.gw.go → agent/reverse-proxy/blob/blobAgent.pb.gw.go
diff --git a/blobs-agent/reverse-proxy/go.mod → agent/reverse-proxy/go.mod b/blobs-agent/reverse-proxy/go.mod → agent/reverse-proxy/go.mod
diff --git a/blobs-agent/reverse-proxy/main.go → agent/reverse-proxy/main.go b/blobs-agent/reverse-proxy/main.go → agent/reverse-proxy/main.go
diff --git a/blobs-agent/blobs-agent-server/pom.xml → agent/server/pom.xml b/blobs-agent/blobs-agent-server/pom.xml → agent/server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blobs-agent</artifactId>
         <groupId>com.expedia.www</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>blobs-agent-server</artifactId>

diff --git a/...blobs/server/api/BlobAgentGrpcServer.java → ...blobs/server/api/BlobAgentGrpcServer.java b/...blobs/server/api/BlobAgentGrpcServer.java → ...blobs/server/api/BlobAgentGrpcServer.java
diff --git a/...nt/blobs/server/api/GrpcHealthServer.java → ...nt/blobs/server/api/GrpcHealthServer.java b/...nt/blobs/server/api/GrpcHealthServer.java → ...nt/blobs/server/api/GrpcHealthServer.java
diff --git a/...ack/agent/blobs/server/spi/BlobAgent.java → ...ack/agent/blobs/server/spi/BlobAgent.java b/...ack/agent/blobs/server/spi/BlobAgent.java → ...ack/agent/blobs/server/spi/BlobAgent.java
diff --git a/.../META-INF/services/dispatcherProvider.txt → .../META-INF/services/dispatcherProvider.txt b/.../META-INF/services/dispatcherProvider.txt → .../META-INF/services/dispatcherProvider.txt
diff --git a/...er/src/test/resources/fastinfosetData.xml → ...er/src/test/resources/fastinfosetData.xml b/...er/src/test/resources/fastinfosetData.xml → ...er/src/test/resources/fastinfosetData.xml
diff --git a/.../test/resources/fastinfosetParsedData.xml → .../test/resources/fastinfosetParsedData.xml b/.../test/resources/fastinfosetParsedData.xml → .../test/resources/fastinfosetParsedData.xml
diff --git a/...ent-server/src/test/resources/xmlData.xml → agent/server/src/test/resources/xmlData.xml b/...ent-server/src/test/resources/xmlData.xml → agent/server/src/test/resources/xmlData.xml
diff --git a/.../server/api/BlobAgentGrpcServerSpec.scala → .../server/api/BlobAgentGrpcServerSpec.scala b/.../server/api/BlobAgentGrpcServerSpec.scala → .../server/api/BlobAgentGrpcServerSpec.scala
diff --git a/.../blobs/server/helper/TestDispatcher.scala → .../blobs/server/helper/TestDispatcher.scala b/.../blobs/server/helper/TestDispatcher.scala → .../blobs/server/helper/TestDispatcher.scala
diff --git a/...gent/blobs/server/spi/BlobAgentSpec.scala → ...gent/blobs/server/spi/BlobAgentSpec.scala b/...gent/blobs/server/spi/BlobAgentSpec.scala → ...gent/blobs/server/spi/BlobAgentSpec.scala
diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>blobs</artifactId>
         <groupId>com.expedia.www</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/haystack-blobs/pom.xml b/haystack-blobs/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blobs</artifactId>
         <groupId>com.expedia.www</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>haystack-blobs</artifactId>

diff --git a/model/pom.xml b/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blobs</artifactId>
         <groupId>com.expedia.www</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>blobs-grpc-models</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,14 +5,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.expedia.www</groupId>
     <artifactId>blobs</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
         <module>model</module>
         <module>core</module>
         <module>stores</module>
-        <module>blobs-agent</module>
+        <module>agent</module>
         <module>haystack-blobs</module>
     </modules>
 

diff --git a/stores/file-store/pom.xml b/stores/file-store/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blob-stores</artifactId>
         <groupId>com.expedia.www</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/stores/pom.xml b/stores/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blobs</artifactId>
         <groupId>com.expedia.www</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>blob-stores</artifactId>
@@ -19,4 +19,4 @@
     <properties>
         <scalastyle.config.location>${basedir}/../../checkstyles/scalastyle_config.xml</scalastyle.config.location>
     </properties>
-</project>
+</project>
diff --git a/stores/s3-store/pom.xml b/stores/s3-store/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>blob-stores</artifactId>
         <groupId>com.expedia.www</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		./mvnw --batch-mode install -B -V

		cd blobs-agent/reverse-proxy && docker build -t ${DOCKER_IMAGE_NAME} -f Dockerfile . && cd ../..
		cd agent/reverse-proxy && docker build -t ${DOCKER_IMAGE_NAME} -f Dockerfile . && cd ../..