Merge pull request #470 from delageniere/master

Modifications in User Portal Webservices for DOI
ispyb · Jun 5, 2020 · d3ac679 · d3ac679
2 parents 54828a2 + 343096c
commit d3ac679
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -93,3 +93,5 @@ Sonarcube
 .scannerwork/
 sonar-project.properties
 
+/*.log
+/*.log
diff --git a/dependencies/ispyb-userportal-gen-1.6.jar → dependencies/ispyb-userportal-gen-1.7.jar b/dependencies/ispyb-userportal-gen-1.6.jar → dependencies/ispyb-userportal-gen-1.7.jar
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -43,7 +43,7 @@
 							<artifactId>ispyb-userportal-gen</artifactId>
 							<version>1.6</version>
 							<packaging>jar</packaging>
-							<file>${basedir}/../dependencies/ispyb-userportal-gen-1.6.jar</file>
+							<file>${basedir}/../dependencies/ispyb-userportal-gen-1.7.jar</file>
 						</configuration>
 					</execution>
 					<execution>

diff --git a/ispyb-bcr-ear/pom.xml b/ispyb-bcr-ear/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.22</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>ispyb-bcr-ear</artifactId>
 	<packaging>ear</packaging>

diff --git a/ispyb-bcr/pom.xml b/ispyb-bcr/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.22</version>
+		<version>5.3</version>
 
 	</parent>
 	<artifactId>ispyb-bcr</artifactId>

diff --git a/ispyb-ear/pom.xml b/ispyb-ear/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.22</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>ispyb-ear</artifactId>
 	<packaging>ear</packaging>

diff --git a/ispyb-ejb/lib/ispyb-userportal-gen-1.7.jar b/ispyb-ejb/lib/ispyb-userportal-gen-1.7.jar
diff --git a/ispyb-ejb/pom.xml b/ispyb-ejb/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.22</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>ispyb-ejb3</artifactId>
 	<packaging>jar</packaging>
@@ -180,7 +180,7 @@
 		<dependency>
 			<groupId>ispyb</groupId>
 			<artifactId>ispyb-userportal-gen</artifactId>
-			<version>1.6</version>
+			<version>1.7</version>
 		</dependency>
 
 		<dependency>

diff --git a/ispyb-ejb/src/main/java/ispyb/server/webservice/smis/util/MAXIVWebService.java b/ispyb-ejb/src/main/java/ispyb/server/webservice/smis/util/MAXIVWebService.java
@@ -395,6 +395,16 @@ public long getProposalPK(String arg0, Long arg1) throws FinderException_Excepti
 		return arg1;
 	}
 
+	public void addDoiToSessionBySessionPk(final Long expSessionPk, final String doi) throws Exception_Exception {
+			// TODO Auto-generated method stub
+
+		}
+
+	public void addDoiToSessionByProposalBeamlineAndDate(String arg0, Integer arg1, String arg2, Calendar arg3,
+			String arg4) throws Exception_Exception {
+		// TODO Auto-generated method stub		
+	}
+
 	private JSONObject getProposalForId(Long propId){
 		JSONObject proposal = null;
 
@@ -741,4 +751,5 @@ private CloseableHttpClient getHttpClient(){
 		}
 		return httpclient;
 	}
+
 }
diff --git a/ispyb-ui/pom.xml b/ispyb-ui/pom.xml
@@ -4,7 +4,7 @@
 	 <parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.22</version>
+		<version>5.3</version>
 	</parent>
 
 	<artifactId>ispyb-ui</artifactId>

diff --git a/ispyb-ws/pom.xml b/ispyb-ws/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ispyb</groupId>
 		<artifactId>ispyb-parent</artifactId>
-		<version>5.22</version>
+		<version>5.3</version>
 	</parent>
 	<artifactId>ispyb-ws</artifactId>
 	<packaging>war</packaging>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ispyb</groupId>
 	<artifactId>ispyb-parent</artifactId>
-	<version>5.22</version>
+	<version>5.3</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>ispyb-ejb</module>
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,3 +93,5 @@ Sonarcube @@
     .scannerwork/
     sonar-project.properties
+    /*.log
+    /*.log