improved error reporting and more options

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@173 7e9141cc-0065-0410-87d8-b60c137991c4

2 files changed, 29 insertions, 29 deletions

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 abffc7e909..bee612f9ca 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
@@ -97,16 +97,13 @@ import java.util.StringTokenizer;
  * </pre>
  * The tag '*' is always appended to the options, so any section with the * tag is always 
  * applied.
- *
- * 
- * 
  * 
  */
 public class Main
 {
     private static final String _version = (Main.class.getPackage()!=null && Main.class.getPackage().getImplementationVersion()!=null)
         ?Main.class.getPackage().getImplementationVersion()
-        :"7.0-SNAPSHOT";
+        :"Unknown";
         
     static boolean _debug=System.getProperty("DEBUG",null)!=null;
     private String _classname=null;
@@ -234,7 +231,9 @@ public class Main
                 System.err.println("  "+elements[i].getAbsolutePath());
             if (_showVersions || invoked_class==null)
             {
-                System.err.println("OPTIONS: "+_options);
+                List opts = new ArrayList(_options);
+                Collections.sort(opts);
+                System.err.println("OPTIONS: "+opts);
 	        usage();
             }
         }
@@ -536,12 +535,10 @@ public class Main
                     if (dir.exists())
                         addJars(dir,done,true);
                     else
-                        if (_debug)
-                            System.err.println("Unsatisfied option:"+unsatisfiedOptions.get(i));
+                        System.err.println("Unsatisfied option:"+unsatisfiedOptions.get(i));
                 }
                 else
-                    if (_debug)
-                        System.err.println("Unsatisfied option:"+unsatisfiedOptions.get(i));
+                    System.err.println("Unsatisfied option:"+unsatisfiedOptions.get(i));
             }
         }
     }
diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config b/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
index 5648722c32..4d17691bd9 100644
--- a/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
+++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/start.config
@@ -63,10 +63,14 @@ $(start.class).class
 $(jetty.home)/etc/jetty.xml                      nargs == 0
 ./jetty-server/src/main/config/etc/jetty.xml     nargs == 0 AND ! exists $(jetty.home)/etc/jetty.xml
 
+
+
 # Add a ext lib directory if it is there
+[All,ext,default]
 $(jetty.home)/lib/ext/**
 
 # Add a resources directory if it is there
+[All,resources,default]
 $(jetty.home)/resources/
            
 # Add jetty modules
@@ -74,57 +78,56 @@ $(jetty.home)/resources/
 $(jetty.home)/lib/jetty-util-$(version).jar                                             ! available org.eclipse.jetty.util.StringUtil
 $(jetty.home)/lib/jetty-io-$(version).jar                                               ! available org.eclipse.jetty.io.Buffer
 
-[xml,default]
+[Server,All,xml,default]
 $(jetty.home)/lib/jetty-xml-$(version).jar                                              ! available org.eclipse.jetty.xml.XmlParser
          
-[server,default]
+[Server,All,server,default]
 $(jetty.home)/lib/servlet-api-2.5.jar                                                   ! available javax.servlet.ServletContext
 $(jetty.home)/lib/jetty-http-$(version).jar                                             ! available org.eclipse.jetty.http.HttpParser
 $(jetty.home)/lib/jetty-continuation-$(version).jar                                     ! available org.eclipse.jetty.continuation.Continuation
 $(jetty.home)/lib/jetty-server-$(version).jar                                           ! available org.eclipse.jetty.server.Server
                                              
-[security,default]
+[Server,All,security,default]
 $(jetty.home)/lib/jetty-security-$(version).jar                                         ! available org.eclipse.jetty.security.LoginService
                                                        
-[servlet,default]
+[Server,All,servlet,default]
 $(jetty.home)/lib/servlet-api-2.5.jar                                                   ! available javax.servlet.ServletContext
 $(jetty.home)/lib/jetty-servlet-$(version).jar                                          ! available org.eclipse.jetty.servlet.ServletHandler
                             
-[webapp,default]
+[Server,All,webapp,default]
 $(jetty.home)/lib/jetty-webapp-$(version).jar                                           ! available org.eclipse.jetty.webapp.WebAppContext
                                   
-[deploy,default]
+[All,deploy,default]
 $(jetty.home)/lib/jetty-deploy-$(version).jar                                           ! available org.eclipse.jetty.deploy.ContextDeployer
-                                              
-[client]
-$(jetty.home)/lib/jetty-http-$(version).jar                                             ! available org.eclipse.jetty.http.HttpParser
-$(jetty.home)/lib/jetty-client-$(version).jar                                           ! available org.eclipse.jetty.client.HttpClient
-               
-[servlets,default]
+           
+[All,servlets,default]
 $(jetty.home)/lib/jetty-servlets-$(version).jar                                         ! available org.eclipse.jetty.servlets.WelcomeFilter
 
-[rewrite]
+[All,rewrite]
 $(jetty.home)/lib/jetty-rewrite-$(version).jar                                          ! available org.eclipse.jetty.rewrite.handler.RewriteHandler
 
-[jmx]
+[All,jmx]
 $(jetty.home)/lib/jetty-jmx-$(version).jar                                              ! available org.eclipse.jetty.jmx.MBeanContainer
                  
-[slf4j]
+[All,slf4j]
 $(jetty.home)/lib/slf4j/**                                                              exists $(jetty.home)/lib/slf4j          
             
-[jsp,jsp-2.1]
+[All,jsp,jsp-2.1]
 $(jetty.home)/lib/jsp-2.1/**                                                            exists $(jetty.home)/lib/jsp-2.1    
 
-[plus]
+[All,plus]
 $(jetty.home)/lib/jetty-jndi-$(version).jar                                             ! available org.eclipse.jetty.jndi.ContextFactory
 $(jetty.home)/lib/jetty-jndi/**                                                         exists $(jetty.home)/lib/jetty-jndi 
 $(jetty.home)/lib/jetty-plus-$(version).jar                                             ! available org.eclipse.jetty.plus.jndi.NamingEntry
 
-[annotations]
+[All,annotations]
 $(jetty.home)/lib/jetty-annotations-$(version).jar                                      ! available org.eclipse.jetty.annotations.AnnotationFinder
 $(jetty.home)/lib/jetty-annotations/**                                                  exists $(jetty.home)/lib/jetty-annotations
-
-
+                                    
+[All,client]
+$(jetty.home)/lib/jetty-http-$(version).jar                                             ! available org.eclipse.jetty.http.HttpParser
+$(jetty.home)/lib/jetty-client-$(version).jar                                           ! available org.eclipse.jetty.client.HttpClient
+