Skip to content
Snippets Groups Projects
Commit 3900532f authored by jakubs's avatar jakubs
Browse files

SP-727 BIS-462 openBisSession

SVN: 29443
parent 547ce943
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,6 @@ import org.springframework.beans.factory.InitializingBean; ...@@ -30,7 +30,6 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ch.rinn.restrictions.Private; import ch.rinn.restrictions.Private;
import ch.systemsx.cisd.authentication.ISessionManager;
import ch.systemsx.cisd.common.exceptions.UserFailureException; import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.multiplexer.IMultiplexer; import ch.systemsx.cisd.common.multiplexer.IMultiplexer;
import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.openbis.common.spring.IInvocationLoggerContext;
...@@ -41,6 +40,7 @@ import ch.systemsx.cisd.openbis.dss.screening.shared.api.internal.IDssServiceRpc ...@@ -41,6 +40,7 @@ import ch.systemsx.cisd.openbis.dss.screening.shared.api.internal.IDssServiceRpc
import ch.systemsx.cisd.openbis.dss.screening.shared.api.internal.IDssServiceRpcScreeningMultiplexer; import ch.systemsx.cisd.openbis.dss.screening.shared.api.internal.IDssServiceRpcScreeningMultiplexer;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer; import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
import ch.systemsx.cisd.openbis.generic.server.ComponentNames; import ch.systemsx.cisd.openbis.generic.server.ComponentNames;
import ch.systemsx.cisd.openbis.generic.server.IOpenBisSessionManager;
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard;
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.Capability; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.Capability;
import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ReturnValueFilter; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ReturnValueFilter;
...@@ -202,7 +202,7 @@ public final class ScreeningServer extends AbstractServer<IScreeningServer> impl ...@@ -202,7 +202,7 @@ public final class ScreeningServer extends AbstractServer<IScreeningServer> impl
} }
@Private @Private
ScreeningServer(final ISessionManager<Session> sessionManager, final IDAOFactory daoFactory, ScreeningServer(final IOpenBisSessionManager sessionManager, final IDAOFactory daoFactory,
IPropertiesBatchManager propertiesBatchManager, IPropertiesBatchManager propertiesBatchManager,
final IScreeningBusinessObjectFactory businessObjectFactory, final IScreeningBusinessObjectFactory businessObjectFactory,
final ISampleTypeSlaveServerPlugin sampleTypeSlaveServerPlugin, final ISampleTypeSlaveServerPlugin sampleTypeSlaveServerPlugin,
...@@ -500,7 +500,7 @@ public final class ScreeningServer extends AbstractServer<IScreeningServer> impl ...@@ -500,7 +500,7 @@ public final class ScreeningServer extends AbstractServer<IScreeningServer> impl
settings.setAggregationType(MaterialReplicaSummaryAggregationType.MEDIAN); settings.setAggregationType(MaterialReplicaSummaryAggregationType.MEDIAN);
settings.setFeatureCodes(new ArrayList<String>()); settings.setFeatureCodes(new ArrayList<String>());
settings.setReplicaMatrialTypePatterns(new String[] settings.setReplicaMatrialTypePatterns(new String[]
{ "GENE", "CONTROL", "COMPOUND" }); { "GENE", "CONTROL", "COMPOUND" });
settings.setMaterialDetailsPropertyType(ScreeningConstants.GENE_SYMBOLS); settings.setMaterialDetailsPropertyType(ScreeningConstants.GENE_SYMBOLS);
settings.setBiologicalReplicatePropertyTypeCodes("CONCENTRATION", "SIRNA"); settings.setBiologicalReplicatePropertyTypeCodes("CONCENTRATION", "SIRNA");
return settings; return settings;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment