added common module

dhp-applications/dhp-mdstore-manager-app/pom.xml

@@ -3,7 +3,7 @@
 	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>
-	<groupId>eu.dnetlib</groupId>
+	<groupId>eu.dnetlib.dhp</groupId>
 	<artifactId>dhp-mdstore-manager-app</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 
@@ -56,6 +56,13 @@
 			<version>2.6</version>
 		</dependency>
 		
+		<!-- Common -->
+		<dependency>
+			<groupId>eu.dnetlib.dhp</groupId>
+			<artifactId>dhp-common</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
+
 		<!-- Swagger -->
 		<dependency>
 			<groupId>io.springfox</groupId>

dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/controller/MDStoreController.java

@@ -17,12 +17,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.google.common.collect.Lists;
 
+import eu.dnetlib.data.mdstore.manager.common.model.MDStore;
+import eu.dnetlib.data.mdstore.manager.common.model.MDStoreCurrentVersion;
+import eu.dnetlib.data.mdstore.manager.common.model.MDStoreVersion;
+import eu.dnetlib.data.mdstore.manager.common.model.MDStoreWithInfo;
 import eu.dnetlib.data.mdstore.manager.exceptions.MDStoreManagerException;
 import eu.dnetlib.data.mdstore.manager.exceptions.NoContentException;
-import eu.dnetlib.data.mdstore.manager.model.MDStore;
-import eu.dnetlib.data.mdstore.manager.model.MDStoreCurrentVersion;
-import eu.dnetlib.data.mdstore.manager.model.MDStoreVersion;
-import eu.dnetlib.data.mdstore.manager.model.MDStoreWithInfo;
 import eu.dnetlib.data.mdstore.manager.repository.MDStoreCurrentVersionRepository;
 import eu.dnetlib.data.mdstore.manager.repository.MDStoreRepository;
 import eu.dnetlib.data.mdstore.manager.repository.MDStoreVersionRepository;
@@ -72,7 +72,7 @@ public class MDStoreController {
 	}
 
 	@ApiOperation(value = "Create a new mdstore")
-	@RequestMapping(value = "/new/{format}/{layout}/{interpretation}", method = RequestMethod.PUT)
+	@RequestMapping(value = "/new/{format}/{layout}/{interpretation}", method = RequestMethod.GET)
 	public MDStoreWithInfo createMDStore(
 			@ApiParam("mdstore format") @PathVariable final String format,
 			@ApiParam("mdstore layout") @PathVariable final String layout,

dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreCurrentVersionRepository.java

@@ -3,7 +3,7 @@ package eu.dnetlib.data.mdstore.manager.repository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import eu.dnetlib.data.mdstore.manager.model.MDStoreCurrentVersion;
+import eu.dnetlib.data.mdstore.manager.common.model.MDStoreCurrentVersion;
 
 @Repository
 public interface MDStoreCurrentVersionRepository extends JpaRepository<MDStoreCurrentVersion, String> {

dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreRepository.java

@@ -3,7 +3,7 @@ package eu.dnetlib.data.mdstore.manager.repository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import eu.dnetlib.data.mdstore.manager.model.MDStore;
+import eu.dnetlib.data.mdstore.manager.common.model.MDStore;
 
 @Repository
 public interface MDStoreRepository extends JpaRepository<MDStore, String> {

dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreVersionRepository.java

@@ -3,7 +3,7 @@ package eu.dnetlib.data.mdstore.manager.repository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import eu.dnetlib.data.mdstore.manager.model.MDStoreVersion;
+import eu.dnetlib.data.mdstore.manager.common.model.MDStoreVersion;
 
 @Repository
 public interface MDStoreVersionRepository extends JpaRepository<MDStoreVersion, String> {

dhp-applications/dhp-mdstore-manager-app/src/main/java/eu/dnetlib/data/mdstore/manager/repository/MDStoreWithInfoRepository.java

@@ -2,7 +2,7 @@ package eu.dnetlib.data.mdstore.manager.repository;
 
 import org.springframework.stereotype.Repository;
 
-import eu.dnetlib.data.mdstore.manager.model.MDStoreWithInfo;
+import eu.dnetlib.data.mdstore.manager.common.model.MDStoreWithInfo;
 
 @Repository
 public interface MDStoreWithInfoRepository extends ReadOnlyRepository<MDStoreWithInfo, String> {

dhp-applications/dhp-mdstore-manager-app/src/main/resources/static/js/mdstoremanager.js

@@ -21,7 +21,7 @@ app.controller('mdstoreManagerController', function($scope, $http) {
 		if (dsName || dsId || apiId) {
 			url += '?dsName=' + encodeURIComponent(dsName) + '&dsId=' + encodeURIComponent(dsId) + '&apiId=' + encodeURIComponent(apiId);
 		}
-		$http.put(url).success(function(data) {
+		$http.get(url).success(function(data) {
 			$scope.reload();
 		}).error(function() {
 			alert("error");

dhp-common/pom.xml

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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">
+	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>
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
+	<parent>
-        <groupId>eu.dnetlib.dhp</groupId>
+		<groupId>eu.dnetlib.dhp</groupId>
-        <artifactId>dhp</artifactId>
+		<artifactId>dhp</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
-    </parent>
+	</parent>
-
-    <artifactId>dhp-common</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-
-
-
-
-    </dependencies>
 
+	<artifactId>dhp-common</artifactId>
+	<packaging>jar</packaging>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>javax.persistence-api</artifactId>
+			<version>2.2</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 
 </project>

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStore.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.data.mdstore.manager.model;
+package eu.dnetlib.data.mdstore.manager.common.model;
 
 import java.io.Serializable;
 import java.util.UUID;

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreCurrentVersion.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.data.mdstore.manager.model;
+package eu.dnetlib.data.mdstore.manager.common.model;
 
 import java.io.Serializable;
 

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreVersion.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.data.mdstore.manager.model;
+package eu.dnetlib.data.mdstore.manager.common.model;
 
 import java.io.Serializable;
 import java.util.Date;

dhp-common/src/main/java/eu/dnetlib/data/mdstore/manager/common/model/MDStoreWithInfo.java

@@ -1,4 +1,4 @@
-package eu.dnetlib.data.mdstore.manager.model;
+package eu.dnetlib.data.mdstore.manager.common.model;
 
 import java.io.Serializable;
 import java.util.Date;

dhp-workflows/dhp-collector-worker/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.5.2
+#Created by Apache Maven 3.6.0
 version=1.0.0
 groupId=eu.dnetlib
 artifactId=dhp-collector-worker