From e91d3dd18e9288a02b54c0874b24b8a986c16bfd Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 6 May 2015 19:08:18 -0700
Subject: [PATCH] 466647 - Add ${jetty.tag.version} property and expand URL
 properties

+ Add missing Props.expand(String) for:
  * the --add-to-start(d) options
  * the Module.hasFiles() method
---
 .../main/java/org/eclipse/jetty/start/BaseBuilder.java    | 8 ++++----
 .../src/main/java/org/eclipse/jetty/start/Module.java     | 4 ++--
 .../src/main/java/org/eclipse/jetty/start/StartArgs.java  | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
index 5b94d27b051..46b312223a6 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseBuilder.java
@@ -107,7 +107,7 @@ public class BaseBuilder
                 Licensing licensing = new Licensing();
                 for (Module module : startArgs.getAllModules().getSelected())
                 {
-                    if (!module.hasFiles(baseHome))
+                    if (!module.hasFiles(baseHome,startArgs.getProperties()))
                     {
                         licensing.addModule(module);
                     }
@@ -208,7 +208,7 @@ public class BaseBuilder
                     dirty |= builder.addModule(mod);
                     for (String file : mod.getFiles())
                     {
-                        files.add(new FileArg(mod,file));
+                        files.add(new FileArg(mod,startArgs.getProperties().expand(file)));
                     }
                 }
             }
@@ -228,12 +228,12 @@ public class BaseBuilder
                     dirty |= builder.addModule(mod);
                     for (String file : mod.getFiles())
                     {
-                        files.add(new FileArg(mod,file));
+                        files.add(new FileArg(mod,startArgs.getProperties().expand(file)));
                     }
                 }
             }
         }
-
+        
         // Process files
         files.addAll(startArgs.getFiles());
         dirty |= processFileResources(files);
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
index b40ce6ba4c7..48c4384517f 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
@@ -221,11 +221,11 @@ public class Module extends Node<Module>
         return !getName().equals(fileRef);
     }
 
-    public boolean hasFiles(BaseHome baseHome)
+    public boolean hasFiles(BaseHome baseHome, Props props)
     {
         for (String ref : getFiles())
         {
-            FileArg farg = new FileArg(this,ref);
+            FileArg farg = new FileArg(this,props.expand(ref));
             Path refPath = baseHome.getBasePath(farg.location);
             if (!Files.exists(refPath))
             {
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
index 3684cba5261..6e52a5a42fb 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
@@ -50,7 +50,7 @@ public class StartArgs
     static
     {
         String ver = System.getProperty("jetty.version",null);
-        String tag = System.getProperty("jetty.tag.version",null);
+        String tag = System.getProperty("jetty.tag.version","master");
 
         if (ver == null)
         {
@@ -73,7 +73,8 @@ public class StartArgs
                 tag = "master";
             }
         }
-        else if (ver.contains("-SNAPSHOT"))
+        
+        if (tag == null || tag.contains("-SNAPSHOT"))
         {
             tag = "master";
         }