diff --git a/rtd_phosphonetx/etc/passwd b/rtd_phosphonetx/etc/passwd index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6ead36251a5325160d2d13a2894487f82cf95cf8 100644 --- a/rtd_phosphonetx/etc/passwd +++ b/rtd_phosphonetx/etc/passwd @@ -0,0 +1,4 @@ +test:a@admins.com:A:The Admin:J3fII6Pex7jnCBwF+uXz2mFuB1QVhPUi +u:u@users.com:U:The User:dmbGKaGRmbX8YKfslMxUHObmYfjywkuT +o:o@observers.com:O:The Observer:t53ADCnFnEFhBvHB7FPoHhbHeW2O1KJc +etlserver::::SHGHSPawL/B3NKXD5nsu4fSrj5LwR2MX diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternal.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternal.java index 3f9cca5ce6ae1bb18be42b280430b49b842edf49..9dbaf9c9ddd93aa7ccf688846c32433eb826a856 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternal.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/server/RawDataServiceInternal.java @@ -66,6 +66,8 @@ public class RawDataServiceInternal extends AbstractServer<IRawDataServiceIntern private ICommonBusinessObjectFactory businessObjectFactory; + private ISessionManager<Session> sessionManagerFromConstructor; + public RawDataServiceInternal() { } @@ -74,9 +76,14 @@ public class RawDataServiceInternal extends AbstractServer<IRawDataServiceIntern ICommonBusinessObjectFactory businessObjectFactory) { super(sessionManager, daoFactory); + sessionManagerFromConstructor = sessionManager; this.businessObjectFactory = businessObjectFactory; } - + + public void replaceAutoWiredSesseionManagerByConstructorSessionManager() + { + sessionManager = sessionManagerFromConstructor; + } public IRawDataServiceInternal createLogger(boolean invocationSuccessful, long elapsedTime) { diff --git a/rtd_phosphonetx/source/java/phosphonetx-applicationContext.xml b/rtd_phosphonetx/source/java/phosphonetx-applicationContext.xml index 98883e8bd1f54ae2e7fb5d3145091b56f50ee49a..7b2ea654b2df3fd08b7f7d376a5eee644de4539f 100644 --- a/rtd_phosphonetx/source/java/phosphonetx-applicationContext.xml +++ b/rtd_phosphonetx/source/java/phosphonetx-applicationContext.xml @@ -65,7 +65,8 @@ </bean> <bean id="phosphonetx-raw-data-service-internal" - class="ch.systemsx.cisd.openbis.plugin.phosphonetx.server.RawDataServiceInternal"> + class="ch.systemsx.cisd.openbis.plugin.phosphonetx.server.RawDataServiceInternal" + init-method="replaceAutoWiredSesseionManagerByConstructorSessionManager"> <constructor-arg> <bean class="ch.systemsx.cisd.authentication.DefaultSessionManager"> <constructor-arg> diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/RawDataTestClient.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/RawDataTestClient.java index de9cb66793ad26ddd3e5cb252aff36c832e17d6c..392f06676b380f8031d7c18c15ad6be3b68c6bfb 100644 --- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/RawDataTestClient.java +++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/RawDataTestClient.java @@ -43,7 +43,7 @@ public class RawDataTestClient try { System.out.println("User: " + user); - SessionContextDTO session = service.tryToAuthenticate("test_b", "t"); + SessionContextDTO session = service.tryToAuthenticate("test", "a"); String sessionToken = session.getSessionToken(); List<Sample> samples = service.listRawDataSamples(sessionToken, user); for (Sample sample : samples)