module rename

data/nginx-templates/api.conf.template

@@ -40,8 +40,8 @@ server {
 		 proxy_pass http://vocabulary-manager:$SPRING_BOOT_PORT/vocabulary-manager/;
 	}
 	
-	location /wf-exec-postgres/ {
-		 proxy_pass http://wf-exec-postgres:$SPRING_BOOT_PORT/wf-exec/;
+	location /wf-aggregation-postgres/ {
+		 proxy_pass http://wf-aggregation-postgres:$SPRING_BOOT_PORT/wf-exec/;
 	}
 	
 	location /wf-manager/ {

data/nginx-templates/development.conf.template

@@ -44,8 +44,8 @@ server {
 		 proxy_pass http://vocabulary-manager:$SPRING_BOOT_PORT/vocabulary-manager/ajax/;
 	}
 	
-	location /ajax/wf-exec-postgres/ {
-		 proxy_pass http://wf-exec-postgres:$SPRING_BOOT_PORT/wf-exec/ajax/;
+	location /ajax/wf-aggregation-postgres/ {
+		 proxy_pass http://wf-aggregation-postgres:$SPRING_BOOT_PORT/wf-exec/ajax/;
 	}
 	
 	location /ajax/wf-manager/ {

data/nginx-templates/production.conf.template

@@ -42,8 +42,8 @@ server {
 		 proxy_pass http://vocabulary-manager:$SPRING_BOOT_PORT/vocabulary-manager/ajax/;
 	}
 	
-	location /ajax/wf-exec-postgres/ {
-		 proxy_pass http://wf-exec-postgres:$SPRING_BOOT_PORT/wf-exec/ajax/;
+	location /ajax/wf-aggregation-postgres/ {
+		 proxy_pass http://wf-aggregation-postgres:$SPRING_BOOT_PORT/wf-exec/ajax/;
 	}
 	
 	location /ajax/wf-manager/ {

dnet-app/apps/dnet-wf-aggregation-postgres/pom.xml

@@ -8,7 +8,7 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>dnet-wf-executor-postgres</artifactId>
+	<artifactId>dnet-wf-aggregation-postgres</artifactId>
 	<packaging>jar</packaging>
 
 	<dependencies>

dnet-app/apps/dnet-wf-aggregation-postgres/src/main/resources/application.properties

@@ -3,4 +3,4 @@ server.description          = D-NET Wf executor that uses postgres as backend
 server.servlet.context-path = /wf-exec
 server.public_url           = 
 
-maven.pom.path = /META-INF/maven/eu.dnetlib.docker/dnet-wf-executor-postgres/effective-pom.xml
+maven.pom.path = /META-INF/maven/eu.dnetlib.docker/dnet-wf-aggregation-postgres/effective-pom.xml

dnet-app/apps/pom.xml

@@ -18,7 +18,7 @@
     <module>dnet-vocabulary-manager</module>
     <module>dnet-datasource-manager</module>
     <module>dnet-wf-manager</module>
-    <module>dnet-wf-executor-postgres</module>
+    <module>dnet-wf-aggregation-postgres</module>
     <module>dnet-oai-exporter</module>
     <module>dnet-indexer-solr</module>
     <module>dnet-email-sender</module>

dnet-app/frontends/is/src/proxy.conf.json

@@ -1,10 +1,10 @@
 {
 	"/ajax": {
-		"target": "http://localhost:8280",
+		"target": "http://localhost:8888",
 		"secure": false
 	},
 	"/api": {
-		"target": "http://localhost:8280",
+		"target": "http://localhost:9999",
 		"secure": false
 	}
 }

docker-compose.dev.yml

@@ -91,8 +91,8 @@ services:
       - SPRING_DATASOURCE_USERNAME=${PG_USER}
       - SPRING_DATASOURCE_PASSWORD=${PG_PASSWORD}
 
-  wf-exec-postgres:
-    build: ./dnet-app/apps/dnet-wf-executor-postgres
+  wf-aggregation-postgres:
+    build: ./dnet-app/apps/dnet-wf-aggregation-postgres
     expose:
       - ${SPRING_BOOT_PORT}
     networks:
@@ -213,7 +213,7 @@ services:
       - oai-exporter
       - resource-manager
       - vocabulary-manager
-      - wf-exec-postgres
+      - wf-aggregation-postgres
       - wf-manager
       - angular-dev
 

docker-compose.yml

@@ -91,8 +91,8 @@ services:
       - SPRING_DATASOURCE_USERNAME=${PG_USER}
       - SPRING_DATASOURCE_PASSWORD=${PG_PASSWORD}
 
-  wf-exec-postgres:
-    build: ./dnet-app/apps/dnet-wf-executor-postgres
+  wf-aggregation-postgres:
+    build: ./dnet-app/apps/dnet-wf-aggregation-postgres
     expose:
       - ${SPRING_BOOT_PORT}
     networks:
@@ -202,7 +202,7 @@ services:
       - oai-exporter
       - resource-manager
       - vocabulary-manager
-      - wf-exec-postgres
+      - wf-aggregation-postgres
       - wf-manager
 
 networks: