Improve modular distributions ordering

[gpl/argeo-slc.git] / runtime / org.argeo.slc.server / src / main / java / org / argeo / slc / web / mvc / provisioning / ModularDistributionInterceptor.java

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ModularDistributionInterceptor.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ModularDistributionInterceptor.java
index 309b9960c2f76f197d4d3dfa250113c6753e9f88..3d3d2e6e21f45cd73248be6d511db47a26be0700 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ModularDistributionInterceptor.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/provisioning/ModularDistributionInterceptor.java
@@ -11,15 +11,13 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.slc.SlcException;
 import org.argeo.slc.build.BasicNameVersion;
+import org.argeo.slc.build.BuildConstants;
 import org.argeo.slc.build.ModularDistribution;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 public class ModularDistributionInterceptor extends HandlerInterceptorAdapter {
        private Set<ModularDistribution> modularDistributions;
 
-       public final static String RELEASE = "RELEASE";
-       public final static String LATEST = "LATEST";
-
        @Override
        public boolean preHandle(HttpServletRequest request,
                        HttpServletResponse response, Object handler) throws Exception {
@@ -33,11 +31,11 @@ public class ModularDistributionInterceptor extends HandlerInterceptorAdapter {
                                .iterator(); it.hasNext();) {
                        ModularDistribution md = it.next();
                        if (md.getName().equals(distributionName)) {
-                               if (distributionVersion.equals(RELEASE)
-                                               && md.getVersion().contains("SNAPSHOT"))
+                               if (distributionVersion.equals(BuildConstants.RELEASE)
+                                               && md.getVersion().contains(BuildConstants.SNAPSHOT))
                                        continue distribs;
 
-                               else if (distributionVersion.equals(LATEST))
+                               else if (distributionVersion.equals(BuildConstants.LATEST))
                                        choices.put(md.getVersion(), md);
                                else if (distributionVersion.equals(md.getVersion())) {
                                        choices.put(md.getVersion(), md);