Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

466647 - Add ${jetty.tag.version} property and expand URL properties 

+ Adding ${jetty.tag.version}
  * If Implementation-Version is defined, then it will use it
  * If Implementation-Version contains "-SNAPSHOT" then "master" is used
  * If no Implementation-Version found, then it uses "master"
This commit is contained in:
Joakim Erdfelt 2015-05-06 16:23:47 -07:00
parent 77e42fb05a
commit 151df819af
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
View File

@ -50,6 +50,7 @@ public class StartArgs
static static
{ {
String ver = System.getProperty("jetty.version",null); String ver = System.getProperty("jetty.version",null);
String tag = System.getProperty("jetty.tag.version",null);
if (ver == null) if (ver == null)
{ {
@ -57,16 +58,29 @@ public class StartArgs
if ((pkg != null) && "Eclipse.org - Jetty".equals(pkg.getImplementationVendor()) && (pkg.getImplementationVersion() != null)) if ((pkg != null) && "Eclipse.org - Jetty".equals(pkg.getImplementationVendor()) && (pkg.getImplementationVersion() != null))
{ {
ver = pkg.getImplementationVersion(); ver = pkg.getImplementationVersion();
if (tag == null)
{
tag = "jetty-" + ver;
}
} }
} }
if (ver == null) if (ver == null)
{ {
ver = "TEST"; ver = "TEST";
if (tag == null)
{
tag = "master";
}
}
else if (ver.contains("-SNAPSHOT"))
{
tag = "master";
} }
VERSION = ver; VERSION = ver;
System.setProperty("jetty.version",VERSION); System.setProperty("jetty.version",VERSION);
System.setProperty("jetty.tag.version",tag);
} }
private static final String SERVER_MAIN = "org.eclipse.jetty.xml.XmlConfiguration"; private static final String SERVER_MAIN = "org.eclipse.jetty.xml.XmlConfiguration";
@ -152,7 +166,7 @@ public class StartArgs
return; return;
} }
FileArg arg = new FileArg(module, uriLocation); FileArg arg = new FileArg(module, properties.expand(uriLocation));
if (!files.contains(arg)) if (!files.contains(arg))
{ {
files.add(arg); files.add(arg);
@ -231,6 +245,7 @@ public class StartArgs
System.out.println("Jetty Environment:"); System.out.println("Jetty Environment:");
System.out.println("-----------------"); System.out.println("-----------------");
dumpProperty("jetty.version"); dumpProperty("jetty.version");
dumpProperty("jetty.tag.version");
dumpProperty("jetty.home"); dumpProperty("jetty.home");
dumpProperty("jetty.base"); dumpProperty("jetty.base");