Merge pull request #532 from delageniere/531.esrf-fix-lib-ws

change librairies

Author: olofsvensson

dependencies/ispyb-userportal-gen-1.7.jar

@@ -41,9 +41,9 @@
 						<configuration>
 							<groupId>ispyb</groupId>
 							<artifactId>ispyb-userportal-gen</artifactId>
-							<version>1.7</version>
+							<version>1.8</version>
 							<packaging>jar</packaging>
-							<file>${basedir}/../dependencies/ispyb-userportal-gen-1.7.jar</file>
+							<file>${basedir}/../dependencies/ispyb-userportal-gen-1.8.jar</file>
 						</configuration>
 					</execution>
 					<execution>

dependencies/ispyb-userportal-gen-1.8.jar

@@ -180,7 +180,7 @@
 		<dependency>
 			<groupId>ispyb</groupId>
 			<artifactId>ispyb-userportal-gen</artifactId>
-			<version>1.7</version>
+			<version>1.8</version>
 		</dependency>
 
 		<dependency>
@@ -202,6 +202,12 @@
 			<scope>runtime</scope>
 		</dependency>
 
+	<dependency>
+		<groupId>org.codehaus.mojo</groupId>
+		<artifactId>jaxws-maven-plugin</artifactId>
+		<version>1.12</version>
+	</dependency>
+		
 	</dependencies>
 
 	  <!--  profiles to separate environment properties -->

dependencies/pom.xml

@@ -320,7 +320,7 @@ public static void updateThisProposalFromSMISPk(Long pk) throws Exception {
 			}
 
 			mainProposers_ = sws.findMainProposersForProposal(pk);
-			smisSamples_ = sws.findSamplesheetInfoLightForProposalPk(pk);
+			smisSamples_ = sws.findSamplesheetInfoLightForProposalPk(pk, true /* only with OpMode(checked by Safety) */);
 			labContacts_ = sws.findParticipantsForProposal(pk);
 
 			updateThisProposalFromLists(smisSessions_,mainProposers_,smisSamples_,labContacts_,pk);	

ispyb-ejb/lib/ispyb-userportal-gen-1.8.jar

@@ -36,13 +36,18 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import generated.ws.smis.BeamlineScientistsVO;
 import generated.ws.smis.Exception_Exception;
 import generated.ws.smis.ExpSessionInfoLightVO;
 import generated.ws.smis.FinderException_Exception;
 import generated.ws.smis.InnerScientistVO;
+import generated.ws.smis.ProposalInfoLightVO;
 import generated.ws.smis.ProposalParticipantInfoLightVO;
 import generated.ws.smis.SMISWebService;
 import generated.ws.smis.SampleSheetInfoLightVO;
+import generated.ws.smis.Training;
+import generated.ws.smis.UserDataAccessLightVO;
+import generated.ws.smis.UserLightVO;
 import ispyb.common.util.Constants;
 import ispyb.server.smis.UpdateFromSMIS;
 
@@ -796,4 +801,74 @@ private CloseableHttpClient getHttpClient(){
 		return httpclient;
 	}
 
+	@Override
+	public ProposalParticipantInfoLightVO findLatestProposalParticipantByScientistPk(Long arg0)
+			throws Exception_Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ProposalInfoLightVO findProposalInfoLightByProposalPk(Long arg0) throws Exception_Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<SampleSheetInfoLightVO> findSamplesheetInfoLightForProposalPk(Long arg0, boolean arg1)
+			throws Exception_Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<SampleSheetInfoLightVO> findSamplesheetInfoLightForSessionPk(Long arg0) throws Exception_Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<ExpSessionInfoLightVO> findSessionsInfoLightInRange(Calendar arg0, Calendar arg1)
+			throws FinderException_Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public UserLightVO findUserByScientistPk(Long arg0) throws Exception_Exception {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<UserDataAccessLightVO> getAcls() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<UserDataAccessLightVO> getAclsWithAllDelays(double arg0, double arg1, double arg2, double arg3) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<UserDataAccessLightVO> getAclsWithEndDelay(double arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<BeamlineScientistsVO> getScientistsWithDataAccessForAllBeamlines() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean isTrainingValidForDate(String arg0, Training arg1, Calendar arg2) throws Exception_Exception {
+		// TODO Auto-generated method stub
+		// added for MAXIV (but not used) because this method should be overridden.
+		return false;
+	}
+
 }