From 91e0e981aab6a9fc61a34eed391f2d35f65b74b4 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <greg@webtide.com>
Date: Mon, 22 Nov 2010 04:01:25 +0000
Subject: [PATCH] 330764 Command line properties passed to start.jar --exec

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2547 7e9141cc-0065-0410-87d8-b60c137991c4
---
 VERSION.txt                                       |  1 +
 .../main/java/org/eclipse/jetty/start/Main.java   | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/VERSION.txt b/VERSION.txt
index bdb599661c8..2da8b72482a 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -8,6 +8,7 @@ jetty-7.2.2-SNAPSHOT
  + 330419 Reloading webapp duplicates StandardDescriptorProcessor 
  + 330686 OSGi: Make org.eclipse.jetty.jsp-2.1 a fragment of org.apache.jasper.glassfish
  + 330732 Removed System.err debugging
+ + 330764 Command line properties passed to start.jar --exec
 
 jetty-7.2.1.v20101111 11 November 2010
  + 324679 Fixed dedection of write before static content
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
index 277cc376f19..9e7dfdc59a9 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
@@ -37,6 +37,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Properties;
 import java.util.Set;
 
 
@@ -681,7 +682,7 @@ public class Main
         throw new FileNotFoundException("Unable to find XML Config: " + xmlFilename);
     }
 
-    private String buildCommandLine(Classpath classpath, List<String> xmls)
+    private String buildCommandLine(Classpath classpath, List<String> xmls) throws IOException
     {
         StringBuilder cmd = new StringBuilder();
         cmd.append(findJavaBin());
@@ -697,6 +698,18 @@ public class Main
         }
         cmd.append("   -cp ").append(classpath.toString());
         cmd.append("   ").append(_config.getMainClassname());
+        
+        // Check if we need to pass properties as a file
+        Properties properties = Config.getProperties();
+        if (properties.size()>0) 
+        {
+            File prop_file = File.createTempFile("start",".properties");
+            if (!_dryRun)
+                prop_file.deleteOnExit();
+            properties.store(new FileOutputStream(prop_file),"start.jar properties");
+            cmd.append(" ").append(prop_file.getAbsolutePath());
+        }
+        
         for (String xml : xmls)
         {
             cmd.append(' ').append(xml);