From caaf77e1e662290bac380a18b32c2e0917f78a96 Mon Sep 17 00:00:00 2001 From: mihostet Date: Tue, 29 Jun 2021 15:23:29 +0200 Subject: [PATCH] disable old CERN repo by default --- .../conf/JMadModelPackageServiceConfiguration.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/java/org/jmad/modelpack/service/conf/JMadModelPackageServiceConfiguration.java b/src/java/org/jmad/modelpack/service/conf/JMadModelPackageServiceConfiguration.java index e6a7672..37baf6a 100644 --- a/src/java/org/jmad/modelpack/service/conf/JMadModelPackageServiceConfiguration.java +++ b/src/java/org/jmad/modelpack/service/conf/JMadModelPackageServiceConfiguration.java @@ -4,6 +4,12 @@ package org.jmad.modelpack.service.conf; +import static org.jmad.modelpack.domain.JMadModelRepositories.cernGitlabOld; +import static org.jmad.modelpack.domain.JMadModelRepositories.cernGitlabPro; +import static org.jmad.modelpack.domain.JMadModelRepositories.cernGitlabTesting; +import static org.jmad.modelpack.domain.JMadModelRepositories.defaultLocalFileRepository; +import static org.jmad.modelpack.domain.JMadModelRepositories.internal; + import cern.accsoft.steering.jmad.service.JMadService; import cern.accsoft.steering.jmad.util.JMadPreferences; import cern.accsoft.steering.jmad.util.TempFileUtilImpl; @@ -18,12 +24,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; -import static org.jmad.modelpack.domain.JMadModelRepositories.cernGitlabOld; -import static org.jmad.modelpack.domain.JMadModelRepositories.cernGitlabPro; -import static org.jmad.modelpack.domain.JMadModelRepositories.cernGitlabTesting; -import static org.jmad.modelpack.domain.JMadModelRepositories.defaultLocalFileRepository; -import static org.jmad.modelpack.domain.JMadModelRepositories.internal; - /** * Spring configuration that only creates the beans for the jmad-modelpack-service. It expects all the necessary beans * already in the context. You can use the {@link JMadModelPackageServiceStandaloneConfiguration} if you want to @@ -46,10 +46,10 @@ public ModelPackageFileCache modelPackageFileCache(JMadService jMadService) { @Bean public ConcurrentModelPackageRepositoryManager packageRepositoryManager() { ConcurrentModelPackageRepositoryManager manager = new ConcurrentModelPackageRepositoryManager(); - manager.enable(cernGitlabOld()); manager.enable(cernGitlabPro()); manager.enable(internal()); defaultLocalFileRepository().ifPresent(manager::enable); + manager.disable(cernGitlabOld()); manager.disable(cernGitlabTesting()); return manager; }