[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java Shutdown.java Version.java

2002-02-24 Thread Jason Dillon

  User: user57  
  Date: 02/02/24 02:24:32

  Removed: src/main/org/jboss Main.java Shutdown.java Version.java
  Log:
   o moved core system from server to system (includes
 all of org.jboss.system, some of org.jboss.deployment +
 Main, Shutdown & Version)
   o finished the integration of ServerLoader, Server and
 ServerConfig are now interfaces so had to update refering
 classes to use ServerConfigImplMBean
   o ServerLoader changes effectivly remove the need for lib/ + lib/ext
 seperation, updated build to use lib for lib/ext and updated
 config files

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2002-02-23 Thread Adrian Brock

  User: ejort   
  Date: 02/02/23 08:48:08

  Modified:src/main/org/jboss Main.java
  Log:
  Unused imports removed
  
  Revision  ChangesPath
  1.70  +1 -4  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- Main.java 16 Feb 2002 05:31:14 -  1.69
  +++ Main.java 23 Feb 2002 16:48:08 -  1.70
  @@ -15,9 +15,6 @@
   import javax.management.RuntimeErrorException;
   import javax.management.RuntimeOperationsException;
   
  -import org.jboss.system.ServiceLibraries;
  -import org.jboss.system.UnifiedClassLoader;
  -
   import gnu.getopt.Getopt;
   import gnu.getopt.LongOpt;
   
  @@ -29,7 +26,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.69 $
  + * @version $Revision: 1.70 $
*/
   public class Main
  implements Runnable
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2002-02-15 Thread Scott M Stark

  User: starksm 
  Date: 02/02/15 21:31:14

  Modified:src/main/org/jboss Main.java
  Log:
  Catch additional JMX exception and fix the formatting.
  
  Revision  ChangesPath
  1.69  +96 -72jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- Main.java 13 Feb 2002 04:26:39 -  1.68
  +++ Main.java 16 Feb 2002 05:31:14 -  1.69
  @@ -13,8 +13,8 @@
   import javax.management.MBeanException;
   import javax.management.RuntimeMBeanException;
   import javax.management.RuntimeErrorException;
  +import javax.management.RuntimeOperationsException;
   
  -import org.jboss.system.MBeanClassLoader;
   import org.jboss.system.ServiceLibraries;
   import org.jboss.system.UnifiedClassLoader;
   
  @@ -29,45 +29,58 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.68 $
  + * @version $Revision: 1.69 $
*/
   public class Main
  implements Runnable
   {
  private final String[] args;
  
  -   public Main(final String[] args) {
  +   public Main(final String[] args)
  +   {
 this.args = args;
  }
  -
  -   public void run() {
  -  try {
  +   
  +   public void run()
  +   {
  +  try
  +  {
boot();
 }
  -  catch (MBeanException e) {
  +  catch (MBeanException e)
  +  {
e.getTargetException().printStackTrace();
 }
  -  catch (RuntimeMBeanException e) {
  +  catch (RuntimeMBeanException e)
  +  {
e.getTargetException().printStackTrace();
 }
  -  catch (RuntimeErrorException e) {
  -  e.getTargetError().printStackTrace();
  +  catch (RuntimeOperationsException e)
  +  {
  + e.getTargetException().printStackTrace();
 }
  -  catch (Exception e) {
  +  catch (RuntimeErrorException e)
  +  {
  + e.getTargetError().printStackTrace();
  +  }
  +  catch (Exception e)
  +  {
e.printStackTrace();
 }
  }
  -
  -   public void boot() throws Exception {
  +   
  +   public void boot() throws Exception
  +   {
 //
 // Set a jboss.home property from the location of the Main.class jar
 // if the property does not exist.
  -  // 
  +  //
 // marcf: we don't use this property at all for now
 // it should be used for all the modules that need a file "anchor"
 // it should be moved to an "FileSystemAnchor" MBean
 //
  -  if (System.getProperty("jboss.home") == null) {
  +  if (System.getProperty("jboss.home") == null)
  +  {
String path = 
Main.class.getProtectionDomain().getCodeSource().getLocation().getFile();
File runJar = new File(path);
// Home dir should be the parent of the dir containing run.jar
  @@ -76,49 +89,53 @@
 }
 String home = System.getProperty("jboss.home");
 
  -  if (System.getProperty("jboss.system.home") == null) {
  +  if (System.getProperty("jboss.system.home") == null)
  +  {
// default to jboss.home if jboss.system.home is not set
System.setProperty("jboss.system.home", home);
 }
 String systemHome = System.getProperty("jboss.system.home");
  -
  +  
 // Create a new server configuration object.  This object holds all
 // of the required information to get the server up and running.
 ServerConfig config = new ServerConfig(new File(systemHome));
  - 
  +  
 // set this from a system property or default to jboss
 String programName = System.getProperty("jboss.boot.loader.name", "jboss");
 String sopts = "-:hD:p:n:c:Vj:";
  -  LongOpt[] lopts = {
  +  LongOpt[] lopts =
  +  {
new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
new LongOpt("help-examples", LongOpt.NO_ARGUMENT, null, 10),
new LongOpt("patch-dir", LongOpt.REQUIRED_ARGUMENT, null, 'p'),
new LongOpt("net-boot", LongOpt.REQUIRED_ARGUMENT, null, 'n'),
new LongOpt("configuration", LongOpt.REQUIRED_ARGUMENT, null, 'c'),
new LongOpt("version", LongOpt.NO_ARGUMENT, null, 'V'),
  -  new LongOpt("jaxp", LongOpt.REQUIRED_ARGUMENT, null, 'j'),
  + new LongOpt("jaxp", LongOpt.REQUIRED_ARGUMENT, null, 'j'),
 };
 
 Getopt getopt = new Getopt(programName, args, sopts, lopts);
 int code;
 String arg;
 
  -  while ((code = getopt.getopt()) != -1) {
  - switch (code) {
  +  while ((code = getopt.getopt()) != -1)
  +  {
  + switch (code)
  + {
   case ':':
   case '?':

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2002-02-12 Thread Jason Dillon

  User: user57  
  Date: 02/02/12 20:26:39

  Modified:src/main/org/jboss Main.java
  Log:
   o These are all kinda related, so I am commiting them together
   o This is the second half of the migration to using ObjectName OBJECT_NAME
   o Not using jboss.system.* properties anywhere (one place in testsuite
 which I am ignoring for now)
   o StateManager will now read its config from a url (configURL), and only
 attempt to write it back out if that is a file URL.  Need to fix this
 to not need to write back to a config file.
   o Still setting jboss.home & jboss.system.home, but use ServerConfigMBean
 to get the proper bits, will eventually abstract all file access out
   o Added a simple locator to find a mbean server.  This is trivial code,
 but helps clean up client code and makes it obvious what it does.
  
  Revision  ChangesPath
  1.68  +1 -10 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- Main.java 12 Feb 2002 02:51:27 -  1.67
  +++ Main.java 13 Feb 2002 04:26:39 -  1.68
  @@ -29,7 +29,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.67 $
  + * @version $Revision: 1.68 $
*/
   public class Main
  implements Runnable
  @@ -234,15 +234,6 @@
}
 }
  
  -  // setup legecy properties
  -  // should do away with components that depend on these
  -  System.setProperty("jboss.system.installationURL", 
  - config.getInstallURL().toString());
  -  System.setProperty("jboss.system.configurationDirectory", 
  - config.getConfigURL().toString());
  -  System.setProperty("jboss.system.libraryDirectory", 
  - config.getLibraryURL().toString());
  -
 // Make sure that shutdown exits the VM
 config.setExitOnShutdown(true);
   
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2002-02-11 Thread Jason Dillon

  User: user57  
  Date: 02/02/11 18:51:27

  Modified:src/main/org/jboss Main.java
  Log:
   o handle jmx RuntimeErrorException
  
  Revision  ChangesPath
  1.67  +5 -1  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- Main.java 11 Feb 2002 23:01:36 -  1.66
  +++ Main.java 12 Feb 2002 02:51:27 -  1.67
  @@ -12,6 +12,7 @@
   
   import javax.management.MBeanException;
   import javax.management.RuntimeMBeanException;
  +import javax.management.RuntimeErrorException;
   
   import org.jboss.system.MBeanClassLoader;
   import org.jboss.system.ServiceLibraries;
  @@ -28,7 +29,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.66 $
  + * @version $Revision: 1.67 $
*/
   public class Main
  implements Runnable
  @@ -48,6 +49,9 @@
 }
 catch (RuntimeMBeanException e) {
e.getTargetException().printStackTrace();
  +  }
  +  catch (RuntimeErrorException e) {
  +  e.getTargetError().printStackTrace();
 }
 catch (Exception e) {
e.printStackTrace();
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2002-02-06 Thread Jason Dillon

  User: user57  
  Date: 02/02/06 16:29:31

  Modified:src/main/org/jboss Main.java
  Log:
   o moved jaxp setting to Main (so it can be done the same on all platforms)
 There is now a --jaxp (or -j) flag which can be set to either 'crimson' or
 'xerces' to switch the jaxp impl.  --help for more info.
  
  Revision  ChangesPath
  1.65  +39 -4 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- Main.java 2002/02/06 01:58:42 1.64
  +++ Main.java 2002/02/07 00:29:31 1.65
  @@ -28,7 +28,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.64 $
  + * @version $Revision: 1.65 $
*/
   public class Main
  implements Runnable
  @@ -78,11 +78,13 @@
 }
 String systemHome = System.getProperty("jboss.system.home");
   
  +  // Create a new server configuration object.  This object holds all
  +  // of the required information to get the server up and running.
 ServerConfig config = new ServerConfig(new File(systemHome));

 // set this from a system property or default to jboss
 String programName = System.getProperty("jboss.boot.loader.name", "jboss");
  -  String sopts = "-:hD:p:n:c:V";
  +  String sopts = "-:hD:p:n:c:Vj:";
 LongOpt[] lopts = {
new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
new LongOpt("help-examples", LongOpt.NO_ARGUMENT, null, 10),
  @@ -90,6 +92,7 @@
new LongOpt("net-boot", LongOpt.REQUIRED_ARGUMENT, null, 'n'),
new LongOpt("configuration", LongOpt.REQUIRED_ARGUMENT, null, 'c'),
new LongOpt("version", LongOpt.NO_ARGUMENT, null, 'V'),
  +  new LongOpt("jaxp", LongOpt.REQUIRED_ARGUMENT, null, 'j'),
 };
 
 Getopt getopt = new Getopt(programName, args, sopts, lopts);
  @@ -121,10 +124,11 @@
  System.out.println("--help-examples   Show some 
command line examples");
  System.out.println("--Stop 
processing options");
  System.out.println("-D[=]Set a system 
property");
  -   System.out.println("-p, --patch-dir  Set the patch 
directory, takes an absolute file name");
  +   System.out.println("-p, --patch-dir  Set the patch 
directory; Must be absolute");
  System.out.println("-n, --net-boot   Boot from net 
with the given url as base");
  System.out.println("-c, --configuration Set the server 
configuration name");
  System.out.println("-V, --version Show version 
information");
  +   System.out.println("-j, --jaxp= Set the JAXP 
impl type (ie. crimson)");
  System.out.println();   
  System.exit(0);
  break; // for completeness
  @@ -187,7 +191,38 @@
  System.out.println();
  System.exit(0);
  break; // for completness
  -
  +
  +case 'j':
  +// set the JAXP impl type
  +arg = getopt.getOptarg().toLowerCase();
  +String domFactoryType, saxFactoryType;
  +
  +if (arg.equals("crimson")) {
  +   domFactoryType = 
"org.apache.crimson.jaxp.DocumentBuilderFactoryImpl";
  +   saxFactoryType = "org.apache.crimson.jaxp.SAXParserFactoryImpl";
  +}
  +else if (arg.equals("xerces")) {
  +   domFactoryType = "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl";
  +   saxFactoryType = "org.apache.xerces.jaxp.SAXParserFactoryImpl";
  +}
  +else {
  +   System.err.println("Invalid JAXP type: " + arg +
  +  " (Expected 'crimson' or 'xerces')");
  +   // don't continue, user needs to fix this!
  +   System.exit(1);
  +
  +   // trick the compiler, so it does not complain that 
  +   // the above variables might not being set
  +   break;
  +}
  +
  +// set the controlling properties
  +System.setProperty("javax.xml.parsers.DocumentBuilderFactory",
  +   domFactoryType);
  +System.setProperty("javax.xml.parsers.SAXParserFactory",
  +   saxFactoryType);
  +break;
  +
   default:
  // this should not happen,
  // if it does throw an error so we know about it
  
  
  

___

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2002-02-05 Thread Jason Dillon

  User: user57  
  Date: 02/02/05 17:58:42

  Modified:src/main/org/jboss Main.java
  Log:
   o changed a few info's to debugs
   o added exitOnShutdown flag to Server, which when set to true will call
 System.exit and when false will only invoke the shutdown hook.
   o exposed exit() to compliment the halt() exposure
   o added exit(int) and halt(int) to expose a bit more control to the admin
 console.
   o By default exitOnShutdown will be false, but Main will always set it to
 true after creation of the Server object, since it is the controlling
 entity (Server is embeded inside of it).
  
  Revision  ChangesPath
  1.64  +2 -1  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- Main.java 2002/01/25 17:31:27 1.63
  +++ Main.java 2002/02/06 01:58:42 1.64
  @@ -28,7 +28,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.63 $
  + * @version $Revision: 1.64 $
*/
   public class Main
  implements Runnable
  @@ -206,6 +206,7 @@
   
 // Create & start the server
 Server server = new Server(config);
  +  server.setExitOnShutdown(true);
  }
  
  /**
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2002-01-25 Thread Hiram Chirino

  User: chirino 
  Date: 02/01/25 09:40:14

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Added a systemExit() method so that Alexandria (an NT service java wrapper) can 
shutdown a jboss correctly.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.18 +12 -1 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.17
  retrieving revision 1.35.2.18
  diff -u -r1.35.2.17 -r1.35.2.18
  --- Main.java 2001/11/29 10:02:12 1.35.2.17
  +++ Main.java 2002/01/25 17:40:14 1.35.2.18
  @@ -27,7 +27,7 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.17 $
  + *   @version $Revision: 1.35.2.18 $
*/
   public class Main
   {
  @@ -263,4 +263,15 @@
return super.getURLs();
 }
  }
  +
  +   /**
  +* This method is here so that if JBoss is running under
  +* Alexandria (An NT Service Installer), Alexandria can shutdown 
  +* the system down correctly.
  +*/
  +   public static void systemExit(String argv[]) 
  +   {
  +  System.exit(0);
  +   }
  +   
   }
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2002-01-25 Thread Hiram Chirino

  User: chirino 
  Date: 02/01/25 09:31:29

  Modified:src/main/org/jboss Main.java
  Log:
  Added a systemExit() method so that Alexandria (an NT service java wrapper) can 
shutdown a jboss correctly.
  
  Revision  ChangesPath
  1.63  +11 -2 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- Main.java 2002/01/20 15:15:47 1.62
  +++ Main.java 2002/01/25 17:31:27 1.63
  @@ -28,7 +28,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.62 $
  + * @version $Revision: 1.63 $
*/
   public class Main
  implements Runnable
  @@ -220,4 +220,13 @@
 ThreadGroup threads = new ThreadGroup("jboss");
 new Thread(threads, new Main(args), "jboss-main").start();
  }
  -}
  \ No newline at end of file
  +
  +   /**
  +* This method is here so that if JBoss is running under
  +* Alexandria (An NT Service Installer), Alexandria can shutdown 
  +* the system down correctly.
  +*/
  +   public static void systemExit(String argv[]) {
  +  System.exit(0);
  +   }  
  +}
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2002-01-20 Thread marc fleury

  User: mnf999  
  Date: 02/01/20 07:15:53

  Modified:src/main/org/jboss Main.java
  Log:
  Unified Classloaders and deployers
  
  Revision  ChangesPath
  1.62  +5 -1  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- Main.java 2002/01/03 04:00:57 1.61
  +++ Main.java 2002/01/20 15:15:47 1.62
  @@ -13,6 +13,10 @@
   import javax.management.MBeanException;
   import javax.management.RuntimeMBeanException;
   
  +import org.jboss.system.MBeanClassLoader;
  +import org.jboss.system.ServiceLibraries;
  +import org.jboss.system.UnifiedClassLoader;
  +
   import gnu.getopt.Getopt;
   import gnu.getopt.LongOpt;
   
  @@ -24,7 +28,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.61 $
  + * @version $Revision: 1.62 $
*/
   public class Main
  implements Runnable
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java Shutdown.java

2002-01-02 Thread Jason Dillon

  User: user57  
  Date: 02/01/02 20:00:57

  Modified:src/main/org/jboss Main.java Shutdown.java
  Log:
   o migrated all components to a new JMX domain name model.  jboss.system
 is now where to core/spine components live.  moved all components that
 were in JBOSS-SYSTEM that did not move into a jboss.* domain into
 jboss (where the server is now registered).  The point was to limit the
 members of jboss.system to core bits only.
   o Created org.jboss.system.Server, which does the work of initialization
 that org.jboss.Main used to do.  Main now only parses the command line,
 sets up basic legecy properties and creates a Server instance.
   o Moved functionality of Shutdown (component not cl tool) into Server (
 which is bound as jboss.system:service=Server)
   o Moved more Runtime access from Info into Server.  Exposed memory info
 as attributes.
   o Logging a WARN everywhere that uses System.getProperty("jboss.system.home")
 as that should go away soon/eventually.
   o Initialized the invokerMap in the harmi impl to avoid NPE
   o Made getopt.jar a member of the lib/* dir instead of adding it to the
 run.jar and shutdown.jars each time.
   o Minor cosmetic changes along the way.
  
  Revision  ChangesPath
  1.61  +92 -321   jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- Main.java 2001/12/29 21:57:20 1.60
  +++ Main.java 2002/01/03 04:00:57 1.61
  @@ -1,254 +1,56 @@
   /*
  -* JBoss, the OpenSource J2EE webOS
  -*
  -* Distributable under LGPL license.
  -* See terms of license at gnu.org.
  -*/
  + * JBoss, the OpenSource J2EE webOS
  + *
  + * Distributable under LGPL license.
  + * See terms of license at gnu.org.
  + */
   
   package org.jboss;
   
  -import java.io.BufferedReader;
   import java.io.File;
  -import java.io.FileWriter;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.InputStreamReader;
  -import java.io.PrintStream;
  -import java.io.PrintWriter;
   import java.net.URL;
  -import java.util.ArrayList;
  -import java.util.Calendar;
  -import java.util.Date;
  -import java.util.Iterator;
  -import java.util.Set;
  -import java.security.AccessController;
  -import java.security.PrivilegedAction;
   
   import javax.management.MBeanException;
  -import javax.management.MBeanServer;
  -import javax.management.MBeanServerFactory;
  -import javax.management.ObjectName;
  -import javax.management.ReflectionException;
  -import javax.management.RuntimeErrorException;
   import javax.management.RuntimeMBeanException;
  -import javax.management.RuntimeOperationsException;
  -import javax.management.loading.MLet;
   
  -import org.jboss.system.MBeanClassLoader;
  -import org.jboss.system.ServiceLibraries;
  -import org.jboss.system.URLClassLoader;
  -
   import gnu.getopt.Getopt;
   import gnu.getopt.LongOpt;
   
  +import org.jboss.system.Server;
  +import org.jboss.system.ServerConfig;
  +
   /**
  -* The main entry point for the JBoss server.
  -*
  -* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
  -* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  -* @version $Revision: 1.60 $
  -*
  -* Revisions:
  -* 
  -* 20010830 marcf:
  -* 
  -*   Initial import, support for net-install
  -* 
  -* 20010925 jason:
  -* 
  -*   Replaced custom command line option parsing with gnu.getopt.
  -*   Added -D option to set system properties
  -* 
  -* 20011030 marcf:
  -* 
  -*   Replaced net-install by net-boot.  Net-install should be reserved for 
installation 
  -*   that really duplicate the code on the local machines. net-boot doesn't and 
just runs in VM
  -* 
  -*/
  + * The main entry-point for the JBoss server.
  + *
  + * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
  + * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  + * @version $Revision: 1.61 $
  + */
   public class Main
  +   implements Runnable
   {
  -   /**
  -   * The version & build information holder.
  -   */
  -   private Version version = Version.getInstance();
  +   private final String[] args;
  
  -   /**
  -   * Constructor for the Main object
  -   *
  -   * @param installURLThe install URL.
  -   * @param confDir   The configuration directory.
  -   * @param patchDir  The patch directory.
  -   * @param libDirThe library directory.
  -   * @param spineDir  The spine directory.
  -   */
  -   public Main(String installURL,
  -  String confDir,
  -  String patchDir,
  -  String libDir,
  -  String spineDir)
  -   {
  -  long startTime = System.currentTimeMillis();
  -  
  -  try
  -  {
  - final PrintStream err = System.err;
  - 
  - System.setProperty("jboss.system.started", new Date(startTime).toString());
  - 

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-12-29 Thread Scott M Stark

  User: starksm 
  Date: 01/12/29 13:57:20

  Modified:src/main/org/jboss Main.java
  Log:
  Fix the invalid file URL constructs that were using the platform
  dependent path seperator rather than '/'.
  
  Revision  ChangesPath
  1.60  +3 -3  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- Main.java 2001/12/07 03:00:32 1.59
  +++ Main.java 2001/12/29 21:57:20 1.60
  @@ -46,7 +46,7 @@
   *
   * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
   * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  -* @version $Revision: 1.59 $
  +* @version $Revision: 1.60 $
   *
   * Revisions:
   * 
  @@ -275,8 +275,8 @@
 String systemHome = System.getProperty("jboss.system.home");
 
 String installURL = new File(systemHome).toURL().toString();
  -  if (!installURL.endsWith(File.separator)) {
  - installURL += File.separator;
  +  if (!installURL.endsWith("/")) {
  + installURL += "/";
 }
 
 // Default configuration name is "default",
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-12-06 Thread marc fleury

  User: mnf999  
  Date: 01/12/06 19:00:32

  Modified:src/main/org/jboss Main.java
  Log:
  More cosmetics,
  
  Revision  ChangesPath
  1.59  +8 -7  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- Main.java 2001/12/07 02:55:47 1.58
  +++ Main.java 2001/12/07 03:00:32 1.59
  @@ -46,7 +46,7 @@
   *
   * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
   * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  -* @version $Revision: 1.58 $
  +* @version $Revision: 1.59 $
   *
   * Revisions:
   * 
  @@ -203,23 +203,23 @@
}
catch(RuntimeMBeanException e)
{
  -e.getTargetException().printStackTrace();
  +//e.getTargetException().printStackTrace();
}
catch (RuntimeOperationsException roe)
{
  -roe.getTargetException().printStackTrace();
  +//roe.getTargetException().printStackTrace();
}
catch (RuntimeErrorException ree)
{
  -ree.getTargetError().printStackTrace();
  +//ree.getTargetError().printStackTrace();
}
catch (MBeanException mbe)
{
  -mbe.getTargetException().printStackTrace();
  +//mbe.getTargetException().printStackTrace();
}
catch (ReflectionException re)
{
  -re.getTargetException().printStackTrace();
  +//re.getTargetException().printStackTrace();
}
   
 }
  @@ -234,7 +234,8 @@
 long minutes = lapsedTime / 6;
 long seconds = (lapsedTime - 6 * minutes) / 1000;
 long milliseconds = (lapsedTime -6 * minutes - 1000 * seconds);
  -  System.out.println("JBossMX MICRO-KERNEL " + version +
  +
  +  System.out.println("JBoss (MX microkernel) " + version +
" [" + version.getName() + "] Started in " +
minutes  + "m:" + seconds  + "s:" +milliseconds +"ms");
  }
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



RE: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-12-06 Thread Jason Dillon

What do you think about the log4j bits?

--jason


On Thu, 6 Dec 2001, marc fleury wrote:

> I just updated it, the reason is because we need to clearly say what is
> booted, it is really JBoss with the microkernel that is booted with the
> first services.
> 
> I now say JBoss (MX microkernel) :)
> 
> marcf
> 
> |-Original Message-
> |From: [EMAIL PROTECTED]
> |[mailto:[EMAIL PROTECTED]]On Behalf Of Jason
> |Dillon
> |Sent: Thursday, December 06, 2001 9:56 PM
> |To: [EMAIL PROTECTED]
> |Subject: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java
> |
> |
> |  User: user57
> |  Date: 01/12/06 18:55:48
> |
> |  Modified:src/main/org/jboss Main.java
> |  Log:
> |   o Not really sure why this says JBossMX now, but lets put the space back
> | in between the name and the version information.
> |
> |  Revision  ChangesPath
> |  1.58  +2 -2  jboss/src/main/org/jboss/Main.java
> |
> |  Index: Main.java
> |  ===
> |  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
> |  retrieving revision 1.57
> |  retrieving revision 1.58
> |  diff -u -r1.57 -r1.58
> |  --- Main.java  2001/12/06 16:59:09 1.57
> |  +++ Main.java  2001/12/07 02:55:47 1.58
> |  @@ -46,7 +46,7 @@
> |   *
> |   * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
> |   * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
> |  -* @version $Revision: 1.57 $
> |  +* @version $Revision: 1.58 $
> |   *
> |   * Revisions:
> |   * 
> |  @@ -234,7 +234,7 @@
> | long minutes = lapsedTime / 6;
> | long seconds = (lapsedTime - 6 * minutes) / 1000;
> | long milliseconds = (lapsedTime -6 * minutes - 1000 *
> |seconds);
> |  -  System.out.println("JBossMX MICRO-KERNEL" + version +
> |  +  System.out.println("JBossMX MICRO-KERNEL " + version +
> |" [" + version.getName() + "] Started in " +
> |minutes  + "m:" + seconds  + "s:" +milliseconds +"ms");
> |  }
> |
> |
> |
> |
> |___
> |Jboss-development mailing list
> |[EMAIL PROTECTED]
> |https://lists.sourceforge.net/lists/listinfo/jboss-development
> 


___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



RE: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-12-06 Thread marc fleury

I just updated it, the reason is because we need to clearly say what is
booted, it is really JBoss with the microkernel that is booted with the
first services.

I now say JBoss (MX microkernel) :)

marcf

|-Original Message-
|From: [EMAIL PROTECTED]
|[mailto:[EMAIL PROTECTED]]On Behalf Of Jason
|Dillon
|Sent: Thursday, December 06, 2001 9:56 PM
|To: [EMAIL PROTECTED]
|Subject: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java
|
|
|  User: user57
|  Date: 01/12/06 18:55:48
|
|  Modified:src/main/org/jboss Main.java
|  Log:
|   o Not really sure why this says JBossMX now, but lets put the space back
| in between the name and the version information.
|
|  Revision  ChangesPath
|  1.58  +2 -2  jboss/src/main/org/jboss/Main.java
|
|  Index: Main.java
|  ===
|  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
|  retrieving revision 1.57
|  retrieving revision 1.58
|  diff -u -r1.57 -r1.58
|  --- Main.java2001/12/06 16:59:09 1.57
|  +++ Main.java2001/12/07 02:55:47 1.58
|  @@ -46,7 +46,7 @@
|   *
|   * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
|   * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
|  -* @version $Revision: 1.57 $
|  +* @version $Revision: 1.58 $
|   *
|   * Revisions:
|   * 
|  @@ -234,7 +234,7 @@
| long minutes = lapsedTime / 6;
| long seconds = (lapsedTime - 6 * minutes) / 1000;
| long milliseconds = (lapsedTime -6 * minutes - 1000 *
|seconds);
|  -  System.out.println("JBossMX MICRO-KERNEL" + version +
|  +  System.out.println("JBossMX MICRO-KERNEL " + version +
|" [" + version.getName() + "] Started in " +
|minutes  + "m:" + seconds  + "s:" +milliseconds +"ms");
|  }
|
|
|
|
|___
|Jboss-development mailing list
|[EMAIL PROTECTED]
|https://lists.sourceforge.net/lists/listinfo/jboss-development


___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-12-06 Thread Jason Dillon

  User: user57  
  Date: 01/12/06 18:55:48

  Modified:src/main/org/jboss Main.java
  Log:
   o Not really sure why this says JBossMX now, but lets put the space back
 in between the name and the version information.
  
  Revision  ChangesPath
  1.58  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- Main.java 2001/12/06 16:59:09 1.57
  +++ Main.java 2001/12/07 02:55:47 1.58
  @@ -46,7 +46,7 @@
   *
   * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
   * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  -* @version $Revision: 1.57 $
  +* @version $Revision: 1.58 $
   *
   * Revisions:
   * 
  @@ -234,7 +234,7 @@
 long minutes = lapsedTime / 6;
 long seconds = (lapsedTime - 6 * minutes) / 1000;
 long milliseconds = (lapsedTime -6 * minutes - 1000 * seconds);
  -  System.out.println("JBossMX MICRO-KERNEL" + version +
  +  System.out.println("JBossMX MICRO-KERNEL " + version +
" [" + version.getName() + "] Started in " +
minutes  + "m:" + seconds  + "s:" +milliseconds +"ms");
  }
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-12-06 Thread marc fleury

  User: mnf999  
  Date: 01/12/06 08:59:09

  Modified:src/main/org/jboss Main.java
  Log:
  Just so that Bill Burke stops being confused
  
  Revision  ChangesPath
  1.57  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- Main.java 2001/11/19 06:58:56 1.56
  +++ Main.java 2001/12/06 16:59:09 1.57
  @@ -46,7 +46,7 @@
   *
   * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
   * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  -* @version $Revision: 1.56 $
  +* @version $Revision: 1.57 $
   *
   * Revisions:
   * 
  @@ -234,7 +234,7 @@
 long minutes = lapsedTime / 6;
 long seconds = (lapsedTime - 6 * minutes) / 1000;
 long milliseconds = (lapsedTime -6 * minutes - 1000 * seconds);
  -  System.out.println("JBoss " + version +
  +  System.out.println("JBossMX MICRO-KERNEL" + version +
" [" + version.getName() + "] Started in " +
minutes  + "m:" + seconds  + "s:" +milliseconds +"ms");
  }
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-11-29 Thread Scott M Stark

  User: starksm 
  Date: 01/11/29 02:02:12

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  We don't need no stinking jboss.properties file. If it exists read it,
  if not its not a fatal error.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.17 +3 -4  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.16
  retrieving revision 1.35.2.17
  diff -u -r1.35.2.16 -r1.35.2.17
  --- Main.java 2001/11/28 20:55:04 1.35.2.16
  +++ Main.java 2001/11/29 10:02:12 1.35.2.17
  @@ -27,7 +27,7 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.16 $
  + *   @version $Revision: 1.35.2.17 $
*/
   public class Main
   {
  @@ -68,12 +68,11 @@
 // Load system properties
 URL jbossProps = 
Main.class.getClassLoader().getResource(confName+"/jboss.properties");
 InputStream propertiesIn = 
Main.class.getClassLoader().getResourceAsStream(confName+"/jboss.properties");
  -  if ( propertiesIn == null )
  +  if ( propertiesIn != null )
 {
  - throw new IOException("jboss.properties missing");
  + System.getProperties().load(propertiesIn);
 }
   
  -  System.getProperties().load(propertiesIn);
   
 /* Set a jboss.home property from the location of the Main.class jar
if the property does not exist.
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-11-28 Thread Scott M Stark

  User: starksm 
  Date: 01/11/28 12:55:04

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Print out the full implementation title and version on startup
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.16 +4 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.15
  retrieving revision 1.35.2.16
  diff -u -r1.35.2.15 -r1.35.2.16
  --- Main.java 2001/11/28 06:18:11 1.35.2.15
  +++ Main.java 2001/11/28 20:55:04 1.35.2.16
  @@ -27,7 +27,7 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.15 $
  + *   @version $Revision: 1.35.2.16 $
*/
   public class Main
   {
  @@ -117,6 +117,9 @@
  // Constructors --
  public Main(String confName, String patchDir)
  {
  +  Package mainPkg = Package.getPackage("org.jboss");
  +  System.out.println("JBoss release: "+mainPkg.getImplementationTitle());
  +  System.out.println("JBoss version: "+mainPkg.getImplementationVersion());
 long startTime = System.currentTimeMillis();
   
 try
  @@ -230,7 +233,6 @@
 }
   
 // Done
  -  Package mainPkg = Package.getPackage("org.jboss");
 long stopTime = System.currentTimeMillis();
 long lapsedTime = stopTime - startTime;
 long minutes = lapsedTime / 6;
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-11-27 Thread Scott M Stark

  User: starksm 
  Date: 01/11/27 22:18:11

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Use a trival subclass of MLet that returns an empty URL[] from getURLs to
  force the use of the rmi codebase as the annotated codebase.
  Remove the embedded version string in favor of the Package.getSpecificationTitle
  value
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.15 +30 -5 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.14
  retrieving revision 1.35.2.15
  diff -u -r1.35.2.14 -r1.35.2.15
  --- Main.java 2001/11/11 08:15:58 1.35.2.14
  +++ Main.java 2001/11/28 06:18:11 1.35.2.15
  @@ -27,13 +27,12 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.14 $
  + *   @version $Revision: 1.35.2.15 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.4.4";
  // Attributes 
   
  // Static 
  @@ -167,7 +166,8 @@
}
   
// Create MLet
  - MLet mlet = new MLet(urls);
  + MLet mlet = new NullURLsMLet(urls);
  +
server.registerMBean(mlet, new ObjectName(server.getDefaultDomain(), 
"service", "MLet"));
   
// Set MLet as classloader for this app
  @@ -230,11 +230,36 @@
 }
   
 // Done
  +  Package mainPkg = Package.getPackage("org.jboss");
 long stopTime = System.currentTimeMillis();
 long lapsedTime = stopTime - startTime;
 long minutes = lapsedTime / 6;
 long seconds = (lapsedTime - 6 * minutes) / 1000;
  -  long milliseconds = lapsedTime - 6 * minutes - 1000 * seconds; 
  -  System.out.println("JBoss "+versionIdentifier+" Started in 
"+minutes+"m:"+seconds+"s."+milliseconds);
  +  long milliseconds = lapsedTime - 6 * minutes - 1000 * seconds;
  +  String version = mainPkg.getSpecificationTitle();
  +  System.out.println(version+" Started in 
"+minutes+"m:"+seconds+"s."+milliseconds);
  +   }
  +
  +   /**
  +*/
  +   static class NullURLsMLet extends MLet
  +   {
  +  URL[] empty = {};
  +  public NullURLsMLet()
  +  {
  +  }
  +  public NullURLsMLet(URL[] urls)
  +  {
  + super(urls);
  +  }
  +
  +  public URL[] getURLs()
  +  {
  + return empty;
  +  }
  +  public URL[] getLocalURLs()
  +  {
  + return super.getURLs();
  +  }
  }
   }
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-11-18 Thread David Jencks

  User: d_jencks
  Date: 01/11/18 22:58:56

  Modified:src/main/org/jboss Main.java
  Log:
  Cleaned up deployment a bit and enabled jar in sar
  
  Revision  ChangesPath
  1.56  +10 -3 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- Main.java 2001/10/30 20:09:19 1.55
  +++ Main.java 2001/11/19 06:58:56 1.56
  @@ -46,7 +46,7 @@
   *
   * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
   * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  -* @version $Revision: 1.55 $
  +* @version $Revision: 1.56 $
   *
   * Revisions:
   * 
  @@ -191,8 +191,15 @@
  null, loader);
   
   // Deployer
  -server.createMBean("org.jboss.deployment.ServiceDeployer",
  -   null, loader);
  +ObjectName serviceDeployer = server.createMBean(
  +   "org.jboss.deployment.ServiceDeployer",
  +   null, loader).getObjectName();
  +
  +//Ok, now deploy jboss-service.xml
  +server.invoke(serviceDeployer, 
  +  "deploy", 
  +  new Object[] {confDir + "jboss-service.xml"},
  +  new String[] {"java.lang.String"});
}
catch(RuntimeMBeanException e)
{
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-11-11 Thread Scott M Stark

  User: starksm 
  Date: 01/11/11 00:15:58

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Add milliseconds to start time
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.14 +3 -3  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.13
  retrieving revision 1.35.2.14
  diff -u -r1.35.2.13 -r1.35.2.14
  --- Main.java 2001/11/09 10:35:49 1.35.2.13
  +++ Main.java 2001/11/11 08:15:58 1.35.2.14
  @@ -27,7 +27,7 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.13 $
  + *   @version $Revision: 1.35.2.14 $
*/
   public class Main
   {
  @@ -234,7 +234,7 @@
 long lapsedTime = stopTime - startTime;
 long minutes = lapsedTime / 6;
 long seconds = (lapsedTime - 6 * minutes) / 1000;
  -  System.out.println("JBoss "+versionIdentifier+" Started in 
"+minutes+"m:"+seconds+"s");
  +  long milliseconds = lapsedTime - 6 * minutes - 1000 * seconds; 
  +  System.out.println("JBoss "+versionIdentifier+" Started in 
"+minutes+"m:"+seconds+"s."+milliseconds);
  }
   }
  -
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-11-09 Thread Scott M Stark

  User: starksm 
  Date: 01/11/09 02:35:49

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Remove the setting of the security properties as this should be done through
  the command line
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.13 +1 -16 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.12
  retrieving revision 1.35.2.13
  diff -u -r1.35.2.12 -r1.35.2.13
  --- Main.java 2001/10/19 23:57:34 1.35.2.12
  +++ Main.java 2001/11/09 10:35:49 1.35.2.13
  @@ -27,7 +27,7 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.12 $
  + *   @version $Revision: 1.35.2.13 $
*/
   public class Main
   {
  @@ -103,21 +103,6 @@
 System.out.println("Warning: no auth.conf found in config="+confName);
 }
 }
  -
  -  // Set security
  -  URL serverPolicy = 
Main.class.getClassLoader().getResource(confName+"/server.policy");
  -
  -  if ( serverPolicy == null )
  -  {
  - throw new IOException("server.policy missing");
  -  }
  -
  -  System.setProperty("java.security.policy", serverPolicy.getFile());
  -
  -  // Set security manager
  -  // Optional for better performance
  -  if (System.getProperty("java.security.manager") != null)
  - 
System.setSecurityManager((SecurityManager)Class.forName(System.getProperty("java.security.manager")).newInstance());
   
 // Start server - Main does not have the proper permissions
 AccessController.doPrivileged(new PrivilegedAction()
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-10-30 Thread marc fleury

  User: mnf999  
  Date: 01/10/30 12:09:20

  Modified:src/main/org/jboss Main.java
  Log:
  Support for the net-boot option instead of net-install (clearer words) and some 
comments in the stateful container
  
  Revision  ChangesPath
  1.55  +11 -30jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Main.java 2001/10/16 22:18:08 1.54
  +++ Main.java 2001/10/30 20:09:19 1.55
  @@ -46,7 +46,7 @@
   *
   * @author mailto:[EMAIL PROTECTED]";>Marc Fleury
   * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  -* @version $Revision: 1.54 $
  +* @version $Revision: 1.55 $
   *
   * Revisions:
   * 
  @@ -59,6 +59,11 @@
   *   Replaced custom command line option parsing with gnu.getopt.
   *   Added -D option to set system properties
   * 
  +* 20011030 marcf:
  +* 
  +*   Replaced net-install by net-boot.  Net-install should be reserved for 
installation 
  +*   that really duplicate the code on the local machines. net-boot doesn't and 
just runs in VM
  +* 
   */
   public class Main
   {
  @@ -209,31 +214,7 @@
{
   re.getTargetException().printStackTrace();
}
  - 
  - /*
  - * URL mletConf = mlet.getResource("boot.jmx");
  - * URL mletConf = new URL(confDir+"boot.jmx");
  - *
  - * Set beans = mlet.getMBeansFromURL(mletConf);
  - *
  - * Iterator enum = beans.iterator();
  - * while (enum.hasNext())
  - * {
  - * Object obj = enum.next();
  - * if (obj instanceof RuntimeOperationsException)
  - * 
((RuntimeOperationsException)obj).getTargetException().printStackTrace(err);
  - * else if (obj instanceof RuntimeErrorException)
  - * ((RuntimeErrorException)obj).getTargetError().printStackTrace(err);
  - * else if (obj instanceof MBeanException)
  - * ((MBeanException)obj).getTargetException().printStackTrace(err);
  - * else if (obj instanceof RuntimeMBeanException)
  - * ((RuntimeMBeanException)obj).getTargetException().printStackTrace(err);
  - * else if (obj instanceof ReflectionException)
  - * ((ReflectionException)obj).getTargetException().printStackTrace(err);
  - * else if (obj instanceof Throwable)
  - * ((Throwable)obj).printStackTrace(err);
  - * }
  - */
  +
 }
 catch (Exception e)
 {
  @@ -309,7 +290,7 @@
new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
new LongOpt("help-examples", LongOpt.NO_ARGUMENT, null, 10),
new LongOpt("patch-dir", LongOpt.REQUIRED_ARGUMENT, null, 'p'),
  - new LongOpt("net-install", LongOpt.REQUIRED_ARGUMENT, null, 'n'),
  + new LongOpt("net-boot", LongOpt.REQUIRED_ARGUMENT, null, 'n'),
new LongOpt("configuration", LongOpt.REQUIRED_ARGUMENT, null, 'c'),
 };
 
  @@ -343,7 +324,7 @@
  System.out.println("--Stop 
processing options");
  System.out.println("-D[=]Set a system 
property");
  System.out.println("-p, --patch-dir  Set the patch 
directory, takes an absolute file name");
  -   System.out.println("-n, --net-installSet the 
network install url");
  +   System.out.println("-n, --net-boot   Boot from net 
with the given url as base");
  System.out.println("-c, --configuration Set the server 
configuration name");
  System.out.println();   
  System.exit(0);
  @@ -367,7 +348,7 @@
   
   case 10:
  // show help examples
  -   System.out.println("example: " + programName + " --net-install 
http://www.jboss.org/jboss --configuration jboxx --patch-dir /tmp/dir");
  +   System.out.println("example: " + programName + " --net-boot 
http://www.jboss.org/jboss --configuration jboxx --patch-dir /tmp/dir");
  System.out.println("will download from the webserver and run the the 
configuration called jboxx, it will uses jar patches found in /tmp/dir");
  System.out.println();
  System.exit(0);
  @@ -379,7 +360,7 @@
   break;
   
   case 'n':
  -   // set the net install url
  +   // set the net boot url
  arg = getopt.getOptarg();
  installURL = arg.startsWith("http://";) ? arg : "http://"; + arg;
  
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-10-19 Thread Scott M Stark

  User: starksm 
  Date: 01/10/19 16:57:34

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Update versionIdentifier = "2.4.4"
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.12 +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.11
  retrieving revision 1.35.2.12
  diff -u -r1.35.2.11 -r1.35.2.12
  --- Main.java 2001/10/03 07:27:50 1.35.2.11
  +++ Main.java 2001/10/19 23:57:34 1.35.2.12
  @@ -27,13 +27,13 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.11 $
  + *   @version $Revision: 1.35.2.12 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.4.3";
  +   String versionIdentifier = "2.4.4";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-10-03 Thread Scott M Stark

  User: starksm 
  Date: 01/10/03 00:27:50

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Update release version to 2.4.3
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.11 +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.10
  retrieving revision 1.35.2.11
  diff -u -r1.35.2.10 -r1.35.2.11
  --- Main.java 2001/09/20 18:00:06 1.35.2.10
  +++ Main.java 2001/10/03 07:27:50 1.35.2.11
  @@ -27,13 +27,13 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.10 $
  + *   @version $Revision: 1.35.2.11 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.4.2";
  +   String versionIdentifier = "2.4.3";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-09-26 Thread Jason Dillon

  User: user57  
  Date: 01/09/26 19:30:40

  Modified:src/main/org/jboss Main.java
  Log:
   o replaced custom command line option parsing in Main with gnu.getopt
   o added -D to set system properties
   o expanded the help text, moved examples to --help-examples
   o setting -Djboss.boot.loader.name in run.sh and run.bat, so the cl help
 bits know which program name to use (default to "jboss" when unknown)
   o run.jar includes gnu.getopt.* (two classes and 6 properties files) this
 makes run.jar about 17k.
  
  Revision  ChangesPath
  1.51  +113 -28   jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- Main.java 2001/09/26 21:47:04 1.50
  +++ Main.java 2001/09/27 02:30:40 1.51
  @@ -38,12 +38,15 @@
   import org.jboss.system.ServiceLibraries;
   import org.jboss.system.URLClassLoader;
   
  +import gnu.getopt.Getopt;
  +import gnu.getopt.LongOpt;
  +
   /**
* The main entry point for the JBoss server.
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.50 $
  + * @version $Revision: 1.51 $
*
* Revisions:
* 
  @@ -51,6 +54,11 @@
* 
*   Initial import, support for net-install
* 
  + * 20010925 jason:
  + * 
  + *   Replaced custom command line option parsing with gnu.getopt.
  + *   Added -D option to set system properties
  + * 
*/
   public class Main
   {
  @@ -298,36 +306,113 @@
   
 // Given conf name
   
  -  for (int a = 0; a < args.length; a++)
  -  {
  - if (args[a].endsWith("help"))
  - {
  -System.out.println("Usage: run --patch-dir --net-install 
--configuration");
  -System.out.println("For example: run.sh --net-install 
http://www.jboss.org/jboss --configuration jboxx");
  -System.out.println(" will download from the webserver and run the the 
configuration called jboxx");
  - }
  - if (args[a].startsWith("--patch-dir") ||
  - args[a].startsWith("-p"))
  - {
  -patchDir = args[a + 1];
  - }
  +  //
  +  // parse command line options
  +  //
   
  - else if (args[a].startsWith("--net-install") ||
  -  args[a].startsWith("-n"))
  - {
  -installURL = args[a + 1].startsWith("http://";) ? args[a + 1] : 
"http://"; + args[a + 1];
  -if (!installURL.endsWith("/"))
  -{
  -   installURL = installURL + "/";
  -}
  - }
  - else if (args[a].startsWith("--configuration") ||
  -  args[a].startsWith("-c"))
  - {
  -configDir = args[a + 1];
  +  // set this from a system property or default to jboss
  +  String programName = System.getProperty("jboss.boot.loader.name",
  +  "jboss");
  +  String sopts = "-:hD:p:n:c:";
  +  LongOpt[] lopts = {
  + new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
  + new LongOpt("help-examples", LongOpt.NO_ARGUMENT, null, 10),
  + new LongOpt("patch-dir", LongOpt.REQUIRED_ARGUMENT, null, 'p'),
  + new LongOpt("net-install", LongOpt.REQUIRED_ARGUMENT, null, 'n'),
  + new LongOpt("configuration", LongOpt.REQUIRED_ARGUMENT, null, 'c'),
  +  };
  +  
  +  Getopt getopt = new Getopt(programName, args, sopts, lopts);
  +  int code;
  +  String arg;
  +  
  +  while ((code = getopt.getopt()) != -1) {
  + switch (code) {
  +case ':':
  +case '?':
  +   // for now both of these should exit with error status
  +   System.exit(1);
  +   break; // for completeness
  +
  +case 1:
  +   // this will catch non-option arguments
  +   // (which we don't currently care about)
  +   System.err.println(programName +
  +  ": unused non-option argument: " +
  +  getopt.getOptarg());
  +   break; // for completeness
  + 
  +case 'h':
  +   // show command line help
  +   System.out.println("usage: " + programName + " [options]");
  +   System.out.println();
  +   System.out.println("options:");
  +   System.out.println("-h, --helpShow this help 
message");
  +   System.out.println("--help-examples   Show some 
command line examples");
  +   System.out.println("--Stop 
processing options");
  +   System.out.println("-D[=]Set a system 

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-09-26 Thread David Jencks

  User: d_jencks
  Date: 01/09/26 14:47:04

  Modified:src/main/org/jboss Main.java
  Log:
  ServiceDeployer: added local dir support, undeploy support for depends, reworked 
classpath dependencies. Changed config files to work. REMOVE core-service.xml or 
build.sh cleancvs update -d -P >update11.log
  
  Revision  ChangesPath
  1.50  +6 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Main.java 2001/09/19 01:20:51 1.49
  +++ Main.java 2001/09/26 21:47:04 1.50
  @@ -43,7 +43,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.49 $
  + * @version $Revision: 1.50 $
*
* Revisions:
* 
  @@ -128,7 +128,11 @@
while (bootURLs.hasNext())
{
   // The libraries will register themselves with the libraries
  -new URLClassLoader(new URL[]{(URL)bootURLs.next()});
  +URL thisUrl = (URL)bootURLs.next();
  +//Only the boot urls are keyed on themselves: 
  +//everything else is copied for loading but keyed on the
  +//original deployed url.
  +new URLClassLoader(new URL[]{thisUrl}, thisUrl);
}
   
// Create MBeanClassLoader for the base system
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-09-20 Thread Scott M Stark

  User: starksm 
  Date: 01/09/20 11:00:07

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Get rid of the deprecated Date usage and update to 2.4.2 for next release
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.10 +26 -13jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.9
  retrieving revision 1.35.2.10
  diff -u -r1.35.2.9 -r1.35.2.10
  --- Main.java 2001/09/07 01:38:01 1.35.2.9
  +++ Main.java 2001/09/20 18:00:06 1.35.2.10
  @@ -22,35 +22,46 @@
   import javax.management.*;
   import javax.management.loading.*;
   
  -/**
  - *
  - *   @see 
  +/** The JBoss server main entry point.
  +
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.9 $
  + *   @version $Revision: 1.35.2.10 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.4.1";
  +   String versionIdentifier = "2.4.2";
  // Attributes 
   
  // Static 
  public static void main(final String[] args)
  -   throws Exception
  +  throws Exception
  {
 Thread.currentThread().setName("JBossMain");
 String cn = "default"; // Default configuration name is "default", i.e. all 
conf files are in "/conf/default"
 String patchDir = null;
 // Given conf name?
  -  if (args.length == 1)
  - cn = args[0];
 for(int a = 0; a < args.length; a ++)
 {
 if( args[a].startsWith("-p") )
  -  patchDir = args[a+1];
  +  {
  +  a ++;
  +  patchDir = args[a];
  +  File tst = new File(patchDir);
  +  if( tst.exists() == false )
  + throw new IllegalArgumentException("Patch dir: 
"+tst.getAbsolutePath()+" does not exist");
  +  }
  +  else if( args[a].charAt(0) == '-' )
  +  {
  + throw new IllegalArgumentException("Usage: [-p ] 
[]");
  +  }
  +  else
  +  {
  + cn = args[a];
  +  }
 }
 final String confName = cn;
 final String patchDirName = patchDir;
  @@ -122,7 +133,7 @@
  // Constructors --
  public Main(String confName, String patchDir)
  {
  -   Date startTime = new Date();
  +  long startTime = System.currentTimeMillis();
   
 try
 {
  @@ -234,9 +245,11 @@
 }
   
 // Done
  -  Date stopTime = new Date();
  -  Date lapsedTime = new Date(stopTime.getTime()-startTime.getTime());
  -  System.out.println("JBoss "+versionIdentifier+" Started in 
"+lapsedTime.getMinutes()+"m:"+lapsedTime.getSeconds()+"s");
  +  long stopTime = System.currentTimeMillis();
  +  long lapsedTime = stopTime - startTime;
  +  long minutes = lapsedTime / 6;
  +  long seconds = (lapsedTime - 6 * minutes) / 1000;
  +  System.out.println("JBoss "+versionIdentifier+" Started in 
"+minutes+"m:"+seconds+"s");
  }
   }
   
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-09-18 Thread Scott M Stark

  User: starksm 
  Date: 01/09/18 18:20:51

  Modified:src/main/org/jboss Main.java
  Log:
  Remove the security config comment block
  
  Revision  ChangesPath
  1.49  +7 -42 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Main.java 2001/09/11 18:34:58 1.48
  +++ Main.java 2001/09/19 01:20:51 1.49
  @@ -43,7 +43,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.48 $
  + * @version $Revision: 1.49 $
*
* Revisions:
* 
  @@ -74,7 +74,7 @@
  String libDir,
  String spineDir)
  {
  -  Date startTime = new Date();
  +  long startTime = System.currentTimeMillis();
   
 try
 {
  @@ -239,14 +239,13 @@
 }
   
 // Done
  -  Date lapsedTime = new Date(new Date().getTime() - startTime.getTime());
  -  Calendar cal = Calendar.getInstance();
  -  cal.setTime(lapsedTime);
  -
  +  long stopTime = System.currentTimeMillis();
  +  long lapsedTime = stopTime - startTime;
  +  long minutes = lapsedTime / 6;
  +  long seconds = (lapsedTime - 6 * minutes) / 1000;
 System.out.println("JBoss " + version +
   " [" + version.getName() + "] Started in " +
  -cal.get(Calendar.MINUTE) + "m:" +
  -cal.get(Calendar.SECOND) + "s");
  +minutes  + "m:" + seconds  + "s");
  }
   
  /**
  @@ -374,38 +373,4 @@
}
 }
  }
  -
  -   /*
  -* Setup security
  -* XXX marcf: what are the reason that would prevent us from making this an MBean
  -* Set the JAAS login config file if not already set
  -* if( System.getProperty("java.security.auth.login.config") == null )
  -* {
  -* URL loginConfig = mlet.getResource("auth.conf");
  -* if( loginConfig != null )
  -* {
  -* System.setProperty("java.security.auth.login.config", 
loginConfig.toExternalForm());
  -* System.out.println("Using JAAS LoginConfig: "+loginConfig.toExternalForm());
  -* }
  -* else
  -* {
  -* System.out.println("Warning: no auth.conf found in config="+confName);
  -* }
  -* }
  -*
  -* Set security using the mlet, if a patch was passed it will look in that path 
first
  -* URL serverPolicy = mlet.getResource("server.policy");
  -*
  -* if ( serverPolicy == null )
  -* {
  -* throw new IOException("server.policy missing");
  -* }
  -*
  -* System.setProperty("java.security.policy", serverPolicy.getFile());
  -*
  -* Set security manager
  -* Optional for better performance
  -* if (System.getProperty("java.security.manager") != null)
  -* 
System.setSecurityManager((SecurityManager)Class.forName(System.getProperty("java.security.manager")).newInstance());
  -*/
   }
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-09-11 Thread Scott M Stark

  User: starksm 
  Date: 01/09/11 11:34:58

  Modified:src/main/org/jboss Main.java
  Log:
  Convert all logging to org.jboss.logging.Logger which is a subclass of
  org.apache.log4j.Category.
  
  Revision  ChangesPath
  1.48  +5 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- Main.java 2001/09/10 23:05:36 1.47
  +++ Main.java 2001/09/11 18:34:58 1.48
  @@ -43,7 +43,7 @@
*
* @author mailto:[EMAIL PROTECTED]";>Marc Fleury
* @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.47 $
  + * @version $Revision: 1.48 $
*
* Revisions:
* 
  @@ -157,7 +157,6 @@
   }
   
   // Create the Loggers
  -server.createMBean("org.jboss.logging.Logger", null, loader);
   server.createMBean("org.jboss.logging.Log4jService", null, loader);
   
   // General Purpose Architecture information
  @@ -187,6 +186,10 @@
   // Deployer
   server.createMBean("org.jboss.deployment.ServiceDeployer",
  null, loader);
  + }
  + catch(RuntimeMBeanException e)
  + {
  +e.getTargetException().printStackTrace();
}
catch (RuntimeOperationsException roe)
{
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-09-06 Thread Scott M Stark

  User: starksm 
  Date: 01/09/06 18:38:01

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Update the release ID to 2.4.1
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.9  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.8
  retrieving revision 1.35.2.9
  diff -u -r1.35.2.8 -r1.35.2.9
  --- Main.java 2001/08/21 00:59:13 1.35.2.8
  +++ Main.java 2001/09/07 01:38:01 1.35.2.9
  @@ -28,13 +28,13 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.8 $
  + *   @version $Revision: 1.35.2.9 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.4.0";
  +   String versionIdentifier = "2.4.1";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-08-31 Thread Jason Dillon

  User: user57  
  Date: 01/08/31 21:31:39

  Modified:src/main/org/jboss Main.java
  Log:
   o pretty'd & removed the extra versionIdentifer from main()
  
  Revision  ChangesPath
  1.46  +358 -320  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Main.java 2001/09/01 04:11:59 1.45
  +++ Main.java 2001/09/01 04:31:39 1.46
  @@ -1,348 +1,386 @@
   /*
  -* JBoss, the OpenSource J2EE webOS
  -*
  -* Distributable under LGPL license.
  -* See terms of license at gnu.org.
  -*/
  -
  + * JBoss, the OpenSource J2EE webOS
  + *
  + * Distributable under LGPL license.
  + * See terms of license at gnu.org.
  + */
   package org.jboss;
   
  +import java.io.BufferedReader;
   import java.io.File;
  +import java.io.FileWriter;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.io.PrintStream;
  -import java.io.BufferedReader;
   import java.io.InputStreamReader;
  +import java.io.PrintStream;
   import java.io.PrintWriter;
  -import java.io.FileWriter;
   import java.net.URL;
  -import java.util.Date;
   import java.util.ArrayList;
  +import java.util.Calendar;
  +import java.util.Date;
   import java.util.Iterator;
   import java.util.Set;
  -import java.util.Calendar;
   import java.security.AccessController;
   import java.security.PrivilegedAction;
   
  +import javax.management.MBeanException;
   import javax.management.MBeanServer;
  -import javax.management.ObjectName;
   import javax.management.MBeanServerFactory;
  -import javax.management.loading.MLet;
  +import javax.management.ObjectName;
   import javax.management.ReflectionException;
  -import javax.management.RuntimeMBeanException;
  -import javax.management.MBeanException;
   import javax.management.RuntimeErrorException;
  +import javax.management.RuntimeMBeanException;
   import javax.management.RuntimeOperationsException;
  +import javax.management.loading.MLet;
   
  -import org.jboss.system.ServiceLibraries;
   import org.jboss.system.MBeanClassLoader;
  +import org.jboss.system.ServiceLibraries;
   import org.jboss.system.URLClassLoader;
  +
   /**
  -*
  -*   @see 
  -*   @author mailto:[EMAIL PROTECTED]";>Marc Fleury.
  -* @version $Revision: 1.45 $
  -* 
  -*   Revisions:
  -*   20010830 marcf: 
  -*  
  -*Initial import, support for net-install
  -*  
  -*
  -*
  -*/
  + * The main entry point for the JBoss server.
  + *
  + * @authormailto:[EMAIL PROTECTED]";>Marc Fleury
  + * @authormailto:[EMAIL PROTECTED]";>Jason Dillon
  + * @version   $Revision: 1.46 $
  + *
  + * Revisions:
  + * 
  + * 20010830 marcf:
  + * 
  + *   Initial import, support for net-install
  + * 
  + */
   public class Main
   {
  -   // Constants -
  -
  -   /** The version & build information holder. */
  +   /**
  +* The version & build information holder.
  +*/
  private Version version = Version.getInstance();
  +   
  +   /**
  +* Constructor for the Main object
  +*
  +* @param installURL  Description of Parameter
  +* @param confDir Description of Parameter
  +* @param patchDirDescription of Parameter
  +* @param libDir  Description of Parameter
  +* @param spineDirDescription of Parameter
  +*/
  +   public Main(String installURL,
  +   String confDir,
  +   String patchDir,
  +   String libDir,
  +   String spineDir)
  +   {
  +  Date startTime = new Date();
  +
  +  try
  +  {
  + final PrintStream err = System.err;
  +
  + System.setProperty("jboss.system.installationURL", installURL);
  + System.setProperty("jboss.system.configurationDirectory", confDir);
  + System.setProperty("jboss.system.patchDirectory", patchDir);
  + System.setProperty("jboss.system.libraryDirectory", libDir);
  + System.setProperty("jboss.system.version", version.toString());
  + System.setProperty("jboss.system.version.name", version.getName());
  +
  + // Give feedback about from where jndi.properties is read
  + URL jndiLocation = this.getClass().getResource("/jndi.properties");
  + if (jndiLocation instanceof URL)
  + {
  +System.out.println("Please make sure the following is intended (check 
your CLASSPATH):");
  +System.out.println(" jndi.properties is read from " + jndiLocation);
  + }
  +
  + // Create MBeanServer
  + final MBeanServer server = 
MBeanServerFactory.createMBeanServer("JBOSS-SYSTEM");
  +
  + // Initialize the MBean libraries repository
  + server.registerMBean(ServiceLibraries.getLibraries(), new 
ObjectName(server.getDefaultDomain(), "spine", "ServiceLibrarie

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java Version.java

2001-08-31 Thread Jason Dillon

  User: user57  
  Date: 01/08/31 21:11:59

  Modified:src/main/org/jboss Main.java Version.java
  Log:
   o re-enabled usage of Version & changed back to using Calader to avoid
 deprecated warnings.
  
  Revision  ChangesPath
  1.45  +21 -12jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Main.java 2001/08/30 04:28:42 1.44
  +++ Main.java 2001/09/01 04:11:59 1.45
  @@ -20,6 +20,7 @@
   import java.util.ArrayList;
   import java.util.Iterator;
   import java.util.Set;
  +import java.util.Calendar;
   import java.security.AccessController;
   import java.security.PrivilegedAction;
   
  @@ -40,7 +41,7 @@
   *
   *   @see 
   *   @author mailto:[EMAIL PROTECTED]";>Marc Fleury.
  -* @version $Revision: 1.44 $
  +* @version $Revision: 1.45 $
   * 
   *   Revisions:
   *   20010830 marcf: 
  @@ -52,10 +53,12 @@
   */
   public class Main
   {
  - // Constants -
  - 
  - String versionIdentifier = "pre-3.0 [RABBIT-HOLE]";
  - // Attributes 
  +   // Constants -
  +
  +   /** The version & build information holder. */
  +   private Version version = Version.getInstance();
  +
  +   // Attributes 

// Static 
public static void main(final String[] args)
  @@ -150,7 +153,8 @@
System.setProperty("jboss.system.configurationDirectory", 
confDir);
System.setProperty("jboss.system.patchDirectory", patchDir);
System.setProperty("jboss.system.libraryDirectory", libDir);
  - System.setProperty("jboss.system.version", versionIdentifier);
  + System.setProperty("jboss.system.version", version.toString());
  +System.setProperty("jboss.system.version.name", 
version.getName());

// Give feedback about from where jndi.properties is read
URL jndiLocation = 
this.getClass().getResource("/jndi.properties");
  @@ -265,11 +269,16 @@
{
e.printStackTrace();
}
  - 
  - // Done
  - Date stopTime = new Date();
  - Date lapsedTime = new Date(stopTime.getTime()-startTime.getTime());
  - System.out.println("JBoss "+versionIdentifier+" Started in 
"+lapsedTime.getMinutes()+"m:"+lapsedTime.getSeconds()+"s");
  +
  +// Done
  +Date lapsedTime = new Date(new Date().getTime() - 
startTime.getTime());
  +Calendar cal = Calendar.getInstance();
  +cal.setTime(lapsedTime);
  +  
  +System.out.println("JBoss " + version +
  +   " [" + version.getName() + "] Started in " +
  +   cal.get(Calendar.MINUTE) + "m:" +
  +   cal.get(Calendar.SECOND) + "s");
}


  @@ -336,4 +345,4 @@
if (System.getProperty("java.security.manager") != null)

System.setSecurityManager((SecurityManager)Class.forName(System.getProperty("java.security.manager")).newInstance());
*/
  -}
  \ No newline at end of file
  +}
  
  
  
  1.2   +113 -84   jboss/src/main/org/jboss/Version.java
  
  Index: Version.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Version.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Version.java  2001/08/28 02:08:18 1.1
  +++ Version.java  2001/09/01 04:11:59 1.2
  @@ -1,171 +1,164 @@
   /*
  - * JBoss, the OpenSource EJB server
  + * JBoss, the OpenSource J2EE webOS
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
  -
   package org.jboss;
  +import java.io.IOException;
   
  -import java.util.Properties;
  -import java.util.Map;
  +import java.io.InputStream;
   import java.util.Collections;
  +import java.util.Map;
   
  -import java.io.InputStream;
  -import java.io.IOException;
  +import java.util.Properties;
   
   /**
  - * Provides access to JBoss version (and build) properties.
  - * 
  - * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.1 $
  + *  Provides access to JBoss version (and build) properties.
  + *
  + * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  + * @version$Revision: 1.2 $
*/
   public final class Version
   {
  -

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-08-29 Thread marc fleury

  User: mnf999  
  Date: 01/08/29 21:28:42

  Modified:src/main/org/jboss Main.java
  Log:
  new Main for 3.0
  
  Revision  ChangesPath
  1.44  +320 -234  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- Main.java 2001/08/28 02:08:18 1.43
  +++ Main.java 2001/08/30 04:28:42 1.44
  @@ -1,9 +1,9 @@
   /*
  - * JBoss, the OpenSource EJB server
  - *
  - * Distributable under LGPL license.
  - * See terms of license at gnu.org.
  - */
  +* JBoss, the OpenSource J2EE webOS
  +*
  +* Distributable under LGPL license.
  +* See terms of license at gnu.org.
  +*/
   
   package org.jboss;
   
  @@ -16,238 +16,324 @@
   import java.io.PrintWriter;
   import java.io.FileWriter;
   import java.net.URL;
  -
  +import java.util.Date;
   import java.util.ArrayList;
  -import java.util.Set;
   import java.util.Iterator;
  -import java.util.Date;
  -import java.util.Calendar;
  -
  -import java.security.*;
  -
  -import javax.management.*;
  -import javax.management.loading.*;
  +import java.util.Set;
  +import java.security.AccessController;
  +import java.security.PrivilegedAction;
   
  +import javax.management.MBeanServer;
  +import javax.management.ObjectName;
  +import javax.management.MBeanServerFactory;
  +import javax.management.loading.MLet;
  +import javax.management.ReflectionException;
  +import javax.management.RuntimeMBeanException;
  +import javax.management.MBeanException;
  +import javax.management.RuntimeErrorException;
  +import javax.management.RuntimeOperationsException;
  +
  +import org.jboss.system.ServiceLibraries;
  +import org.jboss.system.MBeanClassLoader;
  +import org.jboss.system.URLClassLoader;
   /**
  - * The main entry point for the JBoss server.
  - * 
  - * @author mailto:[EMAIL PROTECTED]";>Rickard Öberg.
  - * @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
  - * @author mailto:[EMAIL PROTECTED]";>Scott Stark.
  - * @author mailto:[EMAIL PROTECTED]";>Jason Dillon
  - * @version $Revision: 1.43 $
  - */
  +*
  +*   @see 
  +*   @author mailto:[EMAIL PROTECTED]";>Marc Fleury.
  +* @version $Revision: 1.44 $
  +* 
  +*   Revisions:
  +*   20010830 marcf: 
  +*  
  +*Initial import, support for net-install
  +*  
  +*
  +*
  +*/
   public class Main
   {
  -   // Constants -
  -
  -   private Version version = Version.getInstance();
  -
  -   // Attributes 
  -
  -   // Static 
  -   public static void main(final String[] args)
  -  throws Exception
  -   {
  -  String cn = "default"; // Default configuration name is "default", i.e. all 
conf files are in "/conf/default"
  -  String patchDir = null;
  -  // Given conf name?
  -  if (args.length == 1)
  - cn = args[0];
  -  for(int a = 0; a < args.length; a ++)
  -  {
  - if( args[a].startsWith("-p") )
  -patchDir = args[a+1];
  -  }
  -  final String confName = cn;
  -  final String patchDirName = patchDir;
  -
  -  // Load system properties
  -  URL jbossProps = 
Main.class.getClassLoader().getResource(confName+"/jboss.properties");
  -  InputStream propertiesIn = 
Main.class.getClassLoader().getResourceAsStream(confName+"/jboss.properties");
  -  if ( propertiesIn == null )
  -  {
  - throw new IOException("jboss.properties missing");
  -  }
  -
  -  System.getProperties().load(propertiesIn);
  -
  -  /* Set a jboss.home property from the location of the Main.class jar
  - if the property does not exist.
  -  */
  -  if( System.getProperty("jboss.home") == null )
  -  {
  - String path = 
Main.class.getProtectionDomain().getCodeSource().getLocation().getFile();
  - File runJar = new File(path);
  - // Home dir should be the parent of the dir containing run.jar
  - File homeDir = new File(runJar.getParent(), "..");
  - System.setProperty("jboss.home", homeDir.getCanonicalPath());
  -  }
  -  System.out.println("jboss.home = "+System.getProperty("jboss.home"));
  -
  -  // Set the JAAS login config file if not already set
  -  if( System.getProperty("java.security.auth.login.config") == null )
  -  {
  - URL loginConfig = 
Main.class.getClassLoader().getResource(confName+"/auth.conf");
  - if( loginConfig != null )
  - {
  -System.setProperty("java.security.auth.login.config", 
loginConfig.toExternalForm());
  -System.out.println("Using JAAS LoginConfig: 
"+loginConfig.toExternalForm());
  - }
  - else
  - {
  -System.out.println("Warning: no auth.conf found in c

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-08-20 Thread Scott M Stark

  User: starksm 
  Date: 01/08/20 17:59:13

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Update the version string
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.8  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.7
  retrieving revision 1.35.2.8
  diff -u -r1.35.2.7 -r1.35.2.8
  --- Main.java 2001/07/29 02:33:45 1.35.2.7
  +++ Main.java 2001/08/21 00:59:13 1.35.2.8
  @@ -28,13 +28,13 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.7 $
  + *   @version $Revision: 1.35.2.8 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.4 BETA(Rel_2_4_0_26)";
  +   String versionIdentifier = "2.4.0";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-08-03 Thread Bill Burke

  User: patriot1burke
  Date: 01/08/03 13:33:12

  Modified:src/main/org/jboss Main.java
  Log:
  rollback to 1.39
  
  Revision  ChangesPath
  1.42  +131 -174  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- Main.java 2001/08/03 17:54:25 1.41
  +++ Main.java 2001/08/03 20:33:11 1.42
  @@ -1,5 +1,5 @@
   /*
  - * JBoss, the OpenSource J2EE webOS
  + * JBoss, the OpenSource EJB server
*
* Distributable under LGPL license.
* See terms of license at gnu.org.
  @@ -28,7 +28,7 @@
*   @author mailto:[EMAIL PROTECTED]";>Rickard Öberg.
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author mailto:[EMAIL PROTECTED]";>Scott Stark.
  - *   @version $Revision: 1.41 $
  + *   @version $Revision: 1.42 $
*/
   public class Main
   {
  @@ -39,144 +39,145 @@
   
  // Static 
  public static void main(final String[] args)
  -  throws Exception
  +   throws Exception
  {
  -  /* 
  -   *  Set a jboss.home property from the location of the Main.class jar
  -   *  if the property does not exist.
  -   *  marcf: we don't use this property at all for now 
  -   *  it should be used for all the modules that need a file "anchor"
  -   *  it should be moved to an "FileSystemAnchor" MBean
  -   */
  +  String cn = "default"; // Default configuration name is "default", i.e. all 
conf files are in "/conf/default"
  +  String patchDir = null;
  +  // Given conf name?
  +  if (args.length == 1)
  + cn = args[0];
  +  for(int a = 0; a < args.length; a ++)
  +  {
  +  if( args[a].startsWith("-p") )
  +  patchDir = args[a+1];
  +  }
  +  final String confName = cn;
  +  final String patchDirName = patchDir;
  +
  +  // Load system properties
  +  URL jbossProps = 
Main.class.getClassLoader().getResource(confName+"/jboss.properties");
  +  InputStream propertiesIn = 
Main.class.getClassLoader().getResourceAsStream(confName+"/jboss.properties");
  +  if ( propertiesIn == null )
  +  {
  + throw new IOException("jboss.properties missing");
  +  }
  +
  +  System.getProperties().load(propertiesIn);
  +
  +  /* Set a jboss.home property from the location of the Main.class jar
  + if the property does not exist.
  +  */
 if( System.getProperty("jboss.home") == null )
 {
  - String path = 
Main.class.getProtectionDomain().getCodeSource().getLocation().getFile();
  - File runJar = new File(path);
  - // Home dir should be the parent of the dir containing run.jar
  - File homeDir = new File(runJar.getParent(), "..");
  - System.setProperty("jboss.home", homeDir.getCanonicalPath());
  +  String path = 
Main.class.getProtectionDomain().getCodeSource().getLocation().getFile();
  +  File runJar = new File(path);
  +  // Home dir should be the parent of the dir containing run.jar
  +  File homeDir = new File(runJar.getParent(), "..");
  +  System.setProperty("jboss.home", homeDir.getCanonicalPath());
 }
 System.out.println("jboss.home = "+System.getProperty("jboss.home"));
  -  
  -  String installURL = "file://" + 
System.getProperty("jboss.home")+File.separatorChar;
  -  String configDir = "default"; // Default configuration name is "default", 
i.e. all conf files are in "/conf/default"
  -  String patchDir = "";
  -  
  -  // Given conf name
  -  
  -  for(int a = 0; a < args.length; a ++)
  +
  +  // Set the JAAS login config file if not already set
  +  if( System.getProperty("java.security.auth.login.config") == null )
 {
  - 
  - if( args[a].startsWith("--patch-dir") || args[a].startsWith("-p"))
  -patchDir = args[a+1];
  - 
  - else if( args[a].startsWith("--net-install") || args[a].startsWith("-n"))
  - {   
  -installURL = args[a+1].startsWith("http://";) ?  args[a+1] : 
"http://"+args[a+1] ;
  -if (!installURL.endsWith("/"))
  -   installURL = installURL+"/";
  - }
  - 
  - else if(args[a].startsWith("--conf-dir") || args[a].startsWith("-c"))
  -configDir = args[a+1];
  -  }
  -  
  -  configDir = installURL + (installURL.startsWith("http:") ? 
"conf/"+configDir+"/" : "conf"+ File.separatorChar+ configDir+ File.separatorChar);
  -  
  -  final String iURL = installURL;
  -  final String cDir = configDir;
  -  //final String lDir = loadDir;
  -  final String pDir = patchDir;
  -  
  -// Start server - Main does not

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-08-01 Thread marc fleury

  User: mnf999  
  Date: 01/08/01 11:11:14

  Modified:src/main/org/jboss Main.java
  Log:
  Moving to 3.0 RABBIT HOLE.
  
  Revision  ChangesPath
  1.39  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Main.java 2001/06/22 18:59:51 1.38
  +++ Main.java 2001/08/01 18:11:14 1.39
  @@ -28,13 +28,13 @@
*   @author mailto:[EMAIL PROTECTED]";>Rickard Öberg.
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author mailto:[EMAIL PROTECTED]";>Scott Stark.
  - *   @version $Revision: 1.38 $
  + *   @version $Revision: 1.39 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.5 ALPHA";
  +   String versionIdentifier = "pre-3.0 [RABBIT-HOLE]";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-07-28 Thread Scott M Stark

  User: starksm 
  Date: 01/07/28 19:33:45

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Update version tag to Rel_2_4_0_26
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.7  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.6
  retrieving revision 1.35.2.7
  diff -u -r1.35.2.6 -r1.35.2.7
  --- Main.java 2001/07/28 00:42:33 1.35.2.6
  +++ Main.java 2001/07/29 02:33:45 1.35.2.7
  @@ -28,13 +28,13 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.6 $
  + *   @version $Revision: 1.35.2.7 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.4 BETA(Rel_2_4_0_25)";
  +   String versionIdentifier = "2.4 BETA(Rel_2_4_0_26)";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-07-27 Thread Scott M Stark

  User: starksm 
  Date: 01/07/27 17:42:33

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Update the version string to Rel_2_4_0_25
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.6  +3 -3  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.5
  retrieving revision 1.35.2.6
  diff -u -r1.35.2.5 -r1.35.2.6
  --- Main.java 2001/07/19 20:13:07 1.35.2.5
  +++ Main.java 2001/07/28 00:42:33 1.35.2.6
  @@ -27,14 +27,14 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
  - *   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.5 $
  + *   @author [EMAIL PROTECTED]
  + *   @version $Revision: 1.35.2.6 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.4 BETA(Rel_2_4_0_23)";
  +   String versionIdentifier = "2.4 BETA(Rel_2_4_0_25)";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-07-19 Thread Scott M Stark

  User: starksm 
  Date: 01/07/19 13:13:07

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Add support for binding the JRMP/RMI objects on a specific address
  Integrate the jnp changes to support binding the name service on a specific address
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.5  +241 -241  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.4
  retrieving revision 1.35.2.5
  diff -u -r1.35.2.4 -r1.35.2.5
  --- Main.java 2001/07/09 08:33:26 1.35.2.4
  +++ Main.java 2001/07/19 20:13:07 1.35.2.5
  @@ -1,242 +1,242 @@
  -/*
  - * JBoss, the OpenSource EJB server
  - *
  - * Distributable under LGPL license.
  - * See terms of license at gnu.org.
  - */
  -
  -package org.jboss;
  -
  -import java.io.File;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.PrintStream;
  -import java.io.BufferedReader;
  -import java.io.InputStreamReader;
  -import java.io.PrintWriter;
  -import java.io.FileWriter;
  -import java.net.URL;
  -import java.security.*;
  -import java.util.*;
  -
  -import javax.management.*;
  -import javax.management.loading.*;
  -
  -/**
  - *
  - *   @see 
  - *   @author Rickard Öberg ([EMAIL PROTECTED])
  - *   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
  - *   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.4 $
  - */
  -public class Main
  -{
  -   // Constants -
  -
  -   String versionIdentifier = "2.4 BETA(Rel_2_4_0_14)";
  -   // Attributes 
  -
  -   // Static 
  -   public static void main(final String[] args)
  -   throws Exception
  -   {
  +/*
  + * JBoss, the OpenSource EJB server
  + *
  + * Distributable under LGPL license.
  + * See terms of license at gnu.org.
  + */
  +
  +package org.jboss;
  +
  +import java.io.File;
  +import java.io.IOException;
  +import java.io.InputStream;
  +import java.io.PrintStream;
  +import java.io.BufferedReader;
  +import java.io.InputStreamReader;
  +import java.io.PrintWriter;
  +import java.io.FileWriter;
  +import java.net.URL;
  +import java.security.*;
  +import java.util.*;
  +
  +import javax.management.*;
  +import javax.management.loading.*;
  +
  +/**
  + *
  + *   @see 
  + *   @author Rickard Öberg ([EMAIL PROTECTED])
  + *   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
  + *   @author [EMAIL PROTECTED]
  + *   @version $Revision: 1.35.2.5 $
  + */
  +public class Main
  +{
  +   // Constants -
  +
  +   String versionIdentifier = "2.4 BETA(Rel_2_4_0_23)";
  +   // Attributes 
  +
  +   // Static 
  +   public static void main(final String[] args)
  +   throws Exception
  +   {
 Thread.currentThread().setName("JBossMain");
  -  String cn = "default"; // Default configuration name is "default", i.e. all 
conf files are in "/conf/default"
  -  String patchDir = null;
  -  // Given conf name?
  -  if (args.length == 1)
  - cn = args[0];
  -  for(int a = 0; a < args.length; a ++)
  -  {
  -  if( args[a].startsWith("-p") )
  -  patchDir = args[a+1];
  -  }
  -  final String confName = cn;
  -  final String patchDirName = patchDir;
  -
  -  // Load system properties
  -  URL jbossProps = 
Main.class.getClassLoader().getResource(confName+"/jboss.properties");
  -  InputStream propertiesIn = 
Main.class.getClassLoader().getResourceAsStream(confName+"/jboss.properties");
  -  if ( propertiesIn == null )
  -  {
  - throw new IOException("jboss.properties missing");
  -  }
  -
  -  System.getProperties().load(propertiesIn);
  -
  -  /* Set a jboss.home property from the location of the Main.class jar
  - if the property does not exist.
  -  */
  -  if( System.getProperty("jboss.home") == null )
  -  {
  -  String path = 
Main.class.getProtectionDomain().getCodeSource().getLocation().getFile();
  -  File runJar = new File(path);
  -  // Home dir should be the parent of the dir containing run.jar
  -  File homeDir = new File(runJar.getParent(), "..");
  -  System.setProperty("jboss.home", homeDir.getCanonicalPath());
  -  }
  -  System.out.println("jboss.home = "+System.getProperty("jboss.home"));
  -
  -  // Set the JAAS login config file if not already set
  -  if( System.getProperty("java.security.auth.login.config") == null )
  -  {
  -  URL loginConfig = 
Main.class.getClassLoader().getResource(co

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-07-09 Thread Scott M Stark

  User: starksm 
  Date: 01/07/09 01:33:26

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Update support for unauthenticated users via the standard security
  manager and login modules.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.4  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.3
  retrieving revision 1.35.2.4
  diff -u -r1.35.2.3 -r1.35.2.4
  --- Main.java 2001/07/08 21:19:27 1.35.2.3
  +++ Main.java 2001/07/09 08:33:26 1.35.2.4
  @@ -28,13 +28,13 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.3 $
  + *   @version $Revision: 1.35.2.4 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.4 BETA(Rel_2_4_0_13)";
  +   String versionIdentifier = "2.4 BETA(Rel_2_4_0_14)";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-07-08 Thread Scott M Stark

  User: starksm 
  Date: 01/07/08 14:19:28

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Merge the latest JBossMQ changes into the 2.4 release
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.3  +242 -241  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.2
  retrieving revision 1.35.2.3
  diff -u -r1.35.2.2 -r1.35.2.3
  --- Main.java 2001/06/23 01:26:40 1.35.2.2
  +++ Main.java 2001/07/08 21:19:27 1.35.2.3
  @@ -1,241 +1,242 @@
  -/*
  - * JBoss, the OpenSource EJB server
  - *
  - * Distributable under LGPL license.
  - * See terms of license at gnu.org.
  - */
  -
  -package org.jboss;
  -
  -import java.io.File;
  -import java.io.IOException;
  -import java.io.InputStream;
  -import java.io.PrintStream;
  -import java.io.BufferedReader;
  -import java.io.InputStreamReader;
  -import java.io.PrintWriter;
  -import java.io.FileWriter;
  -import java.net.URL;
  -import java.security.*;
  -import java.util.*;
  -
  -import javax.management.*;
  -import javax.management.loading.*;
  -
  -/**
  - *
  - *   @see 
  - *   @author Rickard Öberg ([EMAIL PROTECTED])
  - *   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
  - *   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.2 $
  - */
  -public class Main
  -{
  -   // Constants -
  -
  -   String versionIdentifier = "2.4 BETA(Rel_2_4_0_6)";
  -   // Attributes 
  -
  -   // Static 
  -   public static void main(final String[] args)
  -   throws Exception
  -   {
  -  String cn = "default"; // Default configuration name is "default", i.e. all 
conf files are in "/conf/default"
  -  String patchDir = null;
  -  // Given conf name?
  -  if (args.length == 1)
  - cn = args[0];
  -  for(int a = 0; a < args.length; a ++)
  -  {
  -  if( args[a].startsWith("-p") )
  -  patchDir = args[a+1];
  -  }
  -  final String confName = cn;
  -  final String patchDirName = patchDir;
  -
  -  // Load system properties
  -  URL jbossProps = 
Main.class.getClassLoader().getResource(confName+"/jboss.properties");
  -  InputStream propertiesIn = 
Main.class.getClassLoader().getResourceAsStream(confName+"/jboss.properties");
  -  if ( propertiesIn == null )
  -  {
  - throw new IOException("jboss.properties missing");
  -  }
  -
  -  System.getProperties().load(propertiesIn);
  -
  -  /* Set a jboss.home property from the location of the Main.class jar
  - if the property does not exist.
  -  */
  -  if( System.getProperty("jboss.home") == null )
  -  {
  -  String path = 
Main.class.getProtectionDomain().getCodeSource().getLocation().getFile();
  -  File runJar = new File(path);
  -  // Home dir should be the parent of the dir containing run.jar
  -  File homeDir = new File(runJar.getParent(), "..");
  -  System.setProperty("jboss.home", homeDir.getCanonicalPath());
  -  }
  -  System.out.println("jboss.home = "+System.getProperty("jboss.home"));
  -
  -  // Set the JAAS login config file if not already set
  -  if( System.getProperty("java.security.auth.login.config") == null )
  -  {
  -  URL loginConfig = 
Main.class.getClassLoader().getResource(confName+"/auth.conf");
  -  if( loginConfig != null )
  -  {
  -  System.setProperty("java.security.auth.login.config", 
loginConfig.toExternalForm());
  -  System.out.println("Using JAAS LoginConfig: 
"+loginConfig.toExternalForm());
  -  }
  -  else
  -  {
  -  System.out.println("Warning: no auth.conf found in config="+confName);
  -  }
  -  }
  -
  -  // Set security
  -  URL serverPolicy = 
Main.class.getClassLoader().getResource(confName+"/server.policy");
  -
  -  if ( serverPolicy == null )
  -  {
  - throw new IOException("server.policy missing");
  -  }
  -
  -  System.setProperty("java.security.policy", serverPolicy.getFile());
  -
  -  // Set security manager
  -  // Optional for better performance
  -  if (System.getProperty("java.security.manager") != null)
  - 
System.setSecurityManager((SecurityManager)Class.forName(System.getProperty("java.security.manager")).newInstance());
  -
  -  // Start server - Main does not have the proper permissions
  -  AccessController.doPrivileged(new PrivilegedAction()
  -  {
  - public Object run()
  - {
  -new Main(confName, patchDirName);
  -return null;
  - }
  - 

[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-06-22 Thread starksm

  User: starksm 
  Date: 01/06/22 18:26:40

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Update the version to include Rel_2_4_0_6
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.2  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35.2.1
  retrieving revision 1.35.2.2
  diff -u -r1.35.2.1 -r1.35.2.2
  --- Main.java 2001/06/22 04:51:25 1.35.2.1
  +++ Main.java 2001/06/23 01:26:40 1.35.2.2
  @@ -28,13 +28,13 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35.2.1 $
  + *   @version $Revision: 1.35.2.2 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.4 BETA(Rel_2_4_0_2)";
  +   String versionIdentifier = "2.4 BETA(Rel_2_4_0_6)";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-06-22 Thread starksm

  User: starksm 
  Date: 01/06/22 11:59:51

  Modified:src/main/org/jboss Main.java
  Log:
  The main trunk version is really 2.5 heading towards a 3.0 release
  
  Revision  ChangesPath
  1.38  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Main.java 2001/06/19 02:26:14 1.37
  +++ Main.java 2001/06/22 18:59:51 1.38
  @@ -28,13 +28,13 @@
*   @author mailto:[EMAIL PROTECTED]";>Rickard Öberg.
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author mailto:[EMAIL PROTECTED]";>Scott Stark.
  - *   @version $Revision: 1.37 $
  + *   @version $Revision: 1.38 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "3.0 ALPHA";
  +   String versionIdentifier = "2.5 ALPHA";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-06-21 Thread starksm

  User: starksm 
  Date: 01/06/21 21:51:25

  Modified:src/main/org/jboss Tag: Branch_2_4 Main.java
  Log:
  Set the beta release version string
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.35.2.1  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35
  retrieving revision 1.35.2.1
  diff -u -r1.35 -r1.35.2.1
  --- Main.java 2001/06/15 08:30:10 1.35
  +++ Main.java 2001/06/22 04:51:25 1.35.2.1
  @@ -28,13 +28,13 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35 $
  + *   @version $Revision: 1.35.2.1 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.3 BETA";
  +   String versionIdentifier = "2.4 BETA(Rel_2_4_0_2)";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-06-18 Thread starksm

  User: starksm 
  Date: 01/06/18 19:26:14

  Modified:src/main/org/jboss Main.java
  Log:
  Change versionIdentifier to "3.0 ALPHA"
  
  Revision  ChangesPath
  1.37  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Main.java 2001/06/18 20:01:21 1.36
  +++ Main.java 2001/06/19 02:26:14 1.37
  @@ -28,13 +28,13 @@
*   @author mailto:[EMAIL PROTECTED]";>Rickard Öberg.
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author mailto:[EMAIL PROTECTED]";>Scott Stark.
  - *   @version $Revision: 1.36 $
  + *   @version $Revision: 1.37 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.3 BETA";
  +   String versionIdentifier = "3.0 ALPHA";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-06-18 Thread mnf999

  User: mnf999  
  Date: 01/06/18 13:01:21

  Modified:src/main/org/jboss Main.java
  Log:
  Updating the new names and author tags to reflect the new coding guidelines
  
  Revision  ChangesPath
  1.36  +3 -3  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Main.java 2001/06/15 08:30:10 1.35
  +++ Main.java 2001/06/18 20:01:21 1.36
  @@ -25,10 +25,10 @@
   /**
*
*   @see 
  - *   @author Rickard Öberg ([EMAIL PROTECTED])
  + *   @author mailto:[EMAIL PROTECTED]";>Rickard Öberg.
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
  - *   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.35 $
  + *   @author mailto:[EMAIL PROTECTED]";>Scott Stark.
  + *   @version $Revision: 1.36 $
*/
   public class Main
   {
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-06-15 Thread starksm

  User: starksm 
  Date: 01/06/15 01:30:10

  Modified:src/main/org/jboss Main.java
  Log:
  Remove the DocumentBuilderFactory.newInstance() call that simply loaded
  the current JAXP parser.
  
  Remove the SecurityAssociation.setServer() call and move it to the
  JaasSecurityManagerService.
  
  Revision  ChangesPath
  1.35  +1 -10 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Main.java 2001/05/25 01:41:34 1.34
  +++ Main.java 2001/06/15 08:30:10 1.35
  @@ -22,17 +22,13 @@
   import javax.management.*;
   import javax.management.loading.*;
   
  -import javax.xml.parsers.DocumentBuilderFactory;
  -
  -import org.jboss.security.SecurityAssociation;
  -
   /**
*
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.34 $
  + *   @version $Revision: 1.35 $
*/
   public class Main
   {
  @@ -111,9 +107,6 @@
 if (System.getProperty("java.security.manager") != null)

System.setSecurityManager((SecurityManager)Class.forName(System.getProperty("java.security.manager")).newInstance());
   
  -  // use thread-local principal and credential propagation
  -  SecurityAssociation.setServer();
  -
 // Start server - Main does not have the proper permissions
 AccessController.doPrivileged(new PrivilegedAction()
 {
  @@ -203,8 +196,6 @@
   else if (obj instanceof Throwable)
  ((Throwable)obj).printStackTrace(err);
}
  -
  - DocumentBuilderFactory.newInstance();
   
// Load configuration
server.invoke(new ObjectName(":service=Configuration"), 
"loadConfiguration", new Object[0], new String[0]);
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-05-30 Thread starksm

  User: starksm 
  Date: 01/05/30 08:32:11

  Modified:src/main/org/jboss Tag: Branch_2_2 Main.java
  Log:
  Fix typo in setting of located auth.conf file
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.30.2.6  +1 -1  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.30.2.5
  retrieving revision 1.30.2.6
  diff -u -r1.30.2.5 -r1.30.2.6
  --- Main.java 2001/05/25 01:05:50 1.30.2.5
  +++ Main.java 2001/05/30 15:32:11 1.30.2.6
  @@ -32,7 +32,7 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
  - *   @version $Revision: 1.30.2.5 $
  + *   @version $Revision: 1.30.2.6 $
*/
   public class Main
   {
  @@ -87,7 +87,7 @@
 URL loginConfig = 
Main.class.getClassLoader().getResource(confName+"/auth.conf");
 if( loginConfig != null )
 {
  -  System.getProperty("java.security.auth.login.config", 
loginConfig.toExternalForm());
  +  System.setProperty("java.security.auth.login.config", 
loginConfig.toExternalForm());
 System.out.println("Using JAAS LoginConfig: 
"+loginConfig.toExternalForm());
 }
 else
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-05-24 Thread starksm

  User: starksm 
  Date: 01/05/24 18:41:35

  Modified:src/main/org/jboss Main.java
  Log:
  Fix typo on setting of auth.conf property
  
  Revision  ChangesPath
  1.34  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Main.java 2001/05/25 01:03:49 1.33
  +++ Main.java 2001/05/25 01:41:34 1.34
  @@ -32,7 +32,7 @@
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
*   @author [EMAIL PROTECTED]
  - *   @version $Revision: 1.33 $
  + *   @version $Revision: 1.34 $
*/
   public class Main
   {
  @@ -87,7 +87,7 @@
 URL loginConfig = 
Main.class.getClassLoader().getResource(confName+"/auth.conf");
 if( loginConfig != null )
 {
  -  System.getProperty("java.security.auth.login.config", 
loginConfig.toExternalForm());
  +  System.setProperty("java.security.auth.login.config", 
loginConfig.toExternalForm());
 System.out.println("Using JAAS LoginConfig: 
"+loginConfig.toExternalForm());
 }
 else
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-05-24 Thread starksm

  User: starksm 
  Date: 01/05/24 18:05:50

  Modified:src/main/org/jboss Tag: Branch_2_2 Main.java
  Log:
  The JAAS login config file URL should be determined by querying the
  class loader for confName/auth.conf, not from the jboss.properties file.
  
  Fix some NPEs in the login modules
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.30.2.5  +16 -2 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.30.2.4
  retrieving revision 1.30.2.5
  diff -u -r1.30.2.4 -r1.30.2.5
  --- Main.java 2001/05/24 18:10:31 1.30.2.4
  +++ Main.java 2001/05/25 01:05:50 1.30.2.5
  @@ -32,7 +32,7 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
  - *   @version $Revision: 1.30.2.4 $
  + *   @version $Revision: 1.30.2.5 $
*/
   public class Main
   {
  @@ -81,9 +81,23 @@
 }
 System.out.println("jboss.home = "+System.getProperty("jboss.home"));
   
  +  // Set the JAAS login config file if not already set
  +  if( System.getProperty("java.security.auth.login.config") == null )
  +  {
  +  URL loginConfig = 
Main.class.getClassLoader().getResource(confName+"/auth.conf");
  +  if( loginConfig != null )
  +  {
  +  System.getProperty("java.security.auth.login.config", 
loginConfig.toExternalForm());
  +  System.out.println("Using JAAS LoginConfig: 
"+loginConfig.toExternalForm());
  +  }
  +  else
  +  {
  +  System.out.println("Warning: no auth.conf found in config="+confName);
  +  }
  +  }
  +
 // Set security
 URL serverPolicy = 
Main.class.getClassLoader().getResource(confName+"/server.policy");
  -
 if ( serverPolicy == null )
 {
throw new IOException("server.policy missing");
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-05-24 Thread starksm

  User: starksm 
  Date: 01/05/24 18:03:49

  Modified:src/main/org/jboss Main.java
  Log:
  The JAAS login config file URL should be determined by querying the
  class loader for confName/auth.conf, not from the jboss.properties file.
  
  Revision  ChangesPath
  1.33  +17 -1 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Main.java 2001/04/14 22:14:14 1.32
  +++ Main.java 2001/05/25 01:03:49 1.33
  @@ -31,7 +31,8 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
  - *   @version $Revision: 1.32 $
  + *   @author [EMAIL PROTECTED]
  + *   @version $Revision: 1.33 $
*/
   public class Main
   {
  @@ -79,6 +80,21 @@
 System.setProperty("jboss.home", homeDir.getCanonicalPath());
 }
 System.out.println("jboss.home = "+System.getProperty("jboss.home"));
  +
  +  // Set the JAAS login config file if not already set
  +  if( System.getProperty("java.security.auth.login.config") == null )
  +  {
  +  URL loginConfig = 
Main.class.getClassLoader().getResource(confName+"/auth.conf");
  +  if( loginConfig != null )
  +  {
  +  System.getProperty("java.security.auth.login.config", 
loginConfig.toExternalForm());
  +  System.out.println("Using JAAS LoginConfig: 
"+loginConfig.toExternalForm());
  +  }
  +  else
  +  {
  +  System.out.println("Warning: no auth.conf found in config="+confName);
  +  }
  +  }
   
 // Set security
 URL serverPolicy = 
Main.class.getClassLoader().getResource(confName+"/server.policy");
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-05-24 Thread starksm

  User: starksm 
  Date: 01/05/24 11:10:31

  Modified:src/main/org/jboss Tag: Branch_2_2 Main.java
  Log:
  Update versionIdentifier to "2.2.2"
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.30.2.4  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.30.2.3
  retrieving revision 1.30.2.4
  diff -u -r1.30.2.3 -r1.30.2.4
  --- Main.java 2001/04/12 04:50:03 1.30.2.3
  +++ Main.java 2001/05/24 18:10:31 1.30.2.4
  @@ -32,13 +32,13 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]";>Daniel O'Connor.
  - *   @version $Revision: 1.30.2.3 $
  + *   @version $Revision: 1.30.2.4 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.2.1";
  +   String versionIdentifier = "2.2.2";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-04-14 Thread user57

  User: user57  
  Date: 01/04/14 15:14:14

  Modified:src/main/org/jboss Main.java
  Log:
   o Removing DependencyManager and jboss.dependencies, since they were not
 in use by any other part of the system.
   o Removed import of DependencyManager from Main.
  
  Revision  ChangesPath
  1.32  +1 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Main.java 2001/04/04 20:26:39 1.31
  +++ Main.java 2001/04/14 22:14:14 1.32
  @@ -24,7 +24,6 @@
   
   import javax.xml.parsers.DocumentBuilderFactory;
   
  -import org.jboss.dependencies.DependencyManager;
   import org.jboss.security.SecurityAssociation;
   
   /**
  @@ -32,7 +31,7 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]">Daniel O'Connor.
  - *   @version $Revision: 1.31 $
  + *   @version $Revision: 1.32 $
*/
   public class Main
   {
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-04-11 Thread starksm

  User: starksm 
  Date: 01/04/11 21:50:03

  Modified:src/main/org/jboss Tag: Branch_2_2 Main.java
  Log:
  Drop the unwanted FINAL element of the version string
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.30.2.3  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.30.2.2
  retrieving revision 1.30.2.3
  diff -u -r1.30.2.2 -r1.30.2.3
  --- Main.java 2001/04/12 02:29:33 1.30.2.2
  +++ Main.java 2001/04/12 04:50:03 1.30.2.3
  @@ -32,13 +32,13 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]">Daniel O'Connor.
  - *   @version $Revision: 1.30.2.2 $
  + *   @version $Revision: 1.30.2.3 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.2.1 FINAL";
  +   String versionIdentifier = "2.2.1";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



Re: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-04-11 Thread Scott M Stark

Ok, fine by me.

- Original Message - 
From: "marc fleury" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Wednesday, April 11, 2001 9:07 PM
Subject: RE: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java


> Again legacy...
> 
> 2.odd 2.even serves the purpose better, so go with that, drop "FINAL"...
> 
> It serves no purpose at this point,
> 
> marc



___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



RE: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-04-11 Thread marc fleury

Again legacy...

2.odd 2.even serves the purpose better, so go with that, drop "FINAL"...

It serves no purpose at this point,

marc

|-Original Message-
|From: [EMAIL PROTECTED]
|[mailto:[EMAIL PROTECTED]]On Behalf Of Scott
|M Stark
|Sent: Wednesday, April 11, 2001 11:29 PM
|To: [EMAIL PROTECTED]
|Subject: Re: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java
|
|
|Can't say that I care either way but that is the convention that has been
|in use.
|
|> What's the purpose of the "FINAL" designation? I assume that it
|means that
|> this is a stable, tested release, but the word "final" doesn't make sense
|> to me. Perhaps it's just me, though.
|>
|> Toby.
|>
|
|
|
|___
|Jboss-development mailing list
|[EMAIL PROTECTED]
|http://lists.sourceforge.net/lists/listinfo/jboss-development


___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



Re: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-04-11 Thread Scott M Stark

Can't say that I care either way but that is the convention that has been
in use.

> What's the purpose of the "FINAL" designation? I assume that it means that
> this is a stable, tested release, but the word "final" doesn't make sense
> to me. Perhaps it's just me, though.
> 
> Toby.
> 



___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



RE: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-04-11 Thread marc fleury

It is legacy at this point.

We used to run 2.0 BETA and then move to 2.0 FINAL.

marc


|-Original Message-
|From: [EMAIL PROTECTED]
|[mailto:[EMAIL PROTECTED]]On Behalf Of Toby
|Allsopp
|Sent: Wednesday, April 11, 2001 11:11 PM
|To: [EMAIL PROTECTED]
|Subject: Re: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java
|
|
|On Wed, Apr 11, 2001 at 07:29:33PM -0700, 
|[EMAIL PROTECTED] wrote:
|>   User: starksm 
|>   Date: 01/04/11 19:29:33
|> 
|>   Modified:src/main/org/jboss Tag: Branch_2_2 Main.java
|>   Log:
|>   Update the version string to "2.2.1 FINAL" in prepration for 
|the release.
|
|What's the purpose of the "FINAL" designation? I assume that it means that
|this is a stable, tested release, but the word "final" doesn't make sense
|to me. Perhaps it's just me, though.
|
|Toby.
|
|___
|Jboss-development mailing list
|[EMAIL PROTECTED]
|http://lists.sourceforge.net/lists/listinfo/jboss-development

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



Re: [JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-04-11 Thread Toby Allsopp

On Wed, Apr 11, 2001 at 07:29:33PM -0700, [EMAIL PROTECTED] wrote:
>   User: starksm 
>   Date: 01/04/11 19:29:33
> 
>   Modified:src/main/org/jboss Tag: Branch_2_2 Main.java
>   Log:
>   Update the version string to "2.2.1 FINAL" in prepration for the release.

What's the purpose of the "FINAL" designation? I assume that it means that
this is a stable, tested release, but the word "final" doesn't make sense
to me. Perhaps it's just me, though.

Toby.

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-04-11 Thread starksm

  User: starksm 
  Date: 01/04/11 19:29:33

  Modified:src/main/org/jboss Tag: Branch_2_2 Main.java
  Log:
  Update the version string to "2.2.1 FINAL" in prepration for the release.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.30.2.2  +2 -2  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.30.2.1
  retrieving revision 1.30.2.2
  diff -u -r1.30.2.1 -r1.30.2.2
  --- Main.java 2001/04/04 20:21:36 1.30.2.1
  +++ Main.java 2001/04/12 02:29:33 1.30.2.2
  @@ -32,13 +32,13 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]">Daniel O'Connor.
  - *   @version $Revision: 1.30.2.1 $
  + *   @version $Revision: 1.30.2.2 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.2.0 FINAL";
  +   String versionIdentifier = "2.2.1 FINAL";
  // Attributes 
   
  // Static 
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-04-04 Thread biorn_steedom

  User: biorn_steedom
  Date: 01/04/04 13:26:39

  Modified:src/main/org/jboss Main.java
  Log:
  Updated the version identifier to 2.3 BETA
  
  Revision  ChangesPath
  1.31  +5 -5  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Main.java 2001/03/27 07:23:06 1.30
  +++ Main.java 2001/04/04 20:26:39 1.31
  @@ -32,13 +32,13 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]">Daniel O'Connor.
  - *   @version $Revision: 1.30 $
  + *   @version $Revision: 1.31 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.1-BETA-Mar-26-2001";
  +   String versionIdentifier = "2.3 BETA";
  // Attributes 
   
  // Static 
  @@ -55,7 +55,7 @@
 if( args[a].startsWith("-p") )
 patchDir = args[a+1];
 }
  -  final String confName = cn;   
  +  final String confName = cn;
 final String patchDirName = patchDir;
   
 // Load system properties
  @@ -114,7 +114,7 @@
  public Main(String confName, String patchDir)
  {
  Date startTime = new Date();
  -  
  +
 try
 {
System.out.println("Using configuration \""+confName+"\"");
  @@ -190,7 +190,7 @@
}
   
DocumentBuilderFactory.newInstance();
  - 
  +
// Load configuration
server.invoke(new ObjectName(":service=Configuration"), 
"loadConfiguration", new Object[0], new String[0]);
   
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-04-04 Thread biorn_steedom

  User: biorn_steedom
  Date: 01/04/04 13:21:36

  Modified:src/main/org/jboss Tag: Branch_2_2 Main.java
  Log:
  Updated the version identifier to 2.2.0 FINAL
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.30.2.1  +5 -5  jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.30
  retrieving revision 1.30.2.1
  diff -u -r1.30 -r1.30.2.1
  --- Main.java 2001/03/27 07:23:06 1.30
  +++ Main.java 2001/04/04 20:21:36 1.30.2.1
  @@ -32,13 +32,13 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]">Daniel O'Connor.
  - *   @version $Revision: 1.30 $
  + *   @version $Revision: 1.30.2.1 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.1-BETA-Mar-26-2001";
  +   String versionIdentifier = "2.2.0 FINAL";
  // Attributes 
   
  // Static 
  @@ -55,7 +55,7 @@
 if( args[a].startsWith("-p") )
 patchDir = args[a+1];
 }
  -  final String confName = cn;   
  +  final String confName = cn;
 final String patchDirName = patchDir;
   
 // Load system properties
  @@ -114,7 +114,7 @@
  public Main(String confName, String patchDir)
  {
  Date startTime = new Date();
  -  
  +
 try
 {
System.out.println("Using configuration \""+confName+"\"");
  @@ -190,7 +190,7 @@
}
   
DocumentBuilderFactory.newInstance();
  - 
  +
// Load configuration
server.invoke(new ObjectName(":service=Configuration"), 
"loadConfiguration", new Object[0], new String[0]);
   
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-03-26 Thread starksm

  User: starksm 
  Date: 01/03/26 23:23:06

  Modified:src/main/org/jboss Main.java
  Log:
  Set a jboss.home system property if one does not exist for use in
  security policy files and other situations where the dist directory avoid
  harded coded paths.
  
  Update the SecurityInterceptor comments.
  
  Revision  ChangesPath
  1.30  +15 -2 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Main.java 2001/03/25 22:20:05 1.29
  +++ Main.java 2001/03/27 07:23:06 1.30
  @@ -32,13 +32,13 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]">Daniel O'Connor.
  - *   @version $Revision: 1.29 $
  + *   @version $Revision: 1.30 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "2.1-BETA-Mar-24-2001";
  +   String versionIdentifier = "2.1-BETA-Mar-26-2001";
  // Attributes 
   
  // Static 
  @@ -67,6 +67,19 @@
 }
   
 System.getProperties().load(propertiesIn);
  +
  +  /* Set a jboss.home property from the location of the Main.class jar
  + if the property does not exist.
  +  */
  +  if( System.getProperty("jboss.home") == null )
  +  {
  +  String path = 
Main.class.getProtectionDomain().getCodeSource().getLocation().getFile();
  +  File runJar = new File(path);
  +  // Home dir should be the parent of the dir containing run.jar
  +  File homeDir = new File(runJar.getParent(), "..");
  +  System.setProperty("jboss.home", homeDir.getCanonicalPath());
  +  }
  +  System.out.println("jboss.home = "+System.getProperty("jboss.home"));
   
 // Set security
 URL serverPolicy = 
Main.class.getClassLoader().getResource(confName+"/server.policy");
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development



[JBoss-dev] CVS update: jboss/src/main/org/jboss Main.java

2001-03-25 Thread starksm

  User: starksm 
  Date: 01/03/25 14:20:06

  Modified:src/main/org/jboss Main.java
  Log:
  Add catch of the JXM RuntimeErrorException so that the true exception can
  be printed out.
  
  Revision  ChangesPath
  1.29  +15 -6 jboss/src/main/org/jboss/Main.java
  
  Index: Main.java
  ===
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/Main.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Main.java 2001/02/08 03:32:37 1.28
  +++ Main.java 2001/03/25 22:20:05 1.29
  @@ -32,13 +32,13 @@
*   @see 
*   @author Rickard Öberg ([EMAIL PROTECTED])
*   @author mailto:[EMAIL PROTECTED]">Daniel O'Connor.
  - *   @version $Revision: 1.28 $
  + *   @version $Revision: 1.29 $
*/
   public class Main
   {
  // Constants -
   
  -   String versionIdentifier = "PRE-2.1";
  +   String versionIdentifier = "2.1-BETA-Mar-24-2001";
  // Attributes 
   
  // Static 
  @@ -189,17 +189,26 @@
server.invoke(new ObjectName(":service=ServiceControl"), "init", new 
Object[0] , new String[0]);
server.invoke(new ObjectName(":service=ServiceControl"), "start", new 
Object[0] , new String[0]);
   
  -  } catch (RuntimeOperationsException e)
  +  }
  +  catch (RuntimeOperationsException e)
 {
System.out.println("Runtime error");
e.getTargetException().printStackTrace();
  -  } catch (MBeanException e)
  +  }
  +  catch (RuntimeErrorException e)
 {
  + System.out.println("Runtime error");
  + e.getTargetError().printStackTrace();
  +  }
  +  catch (MBeanException e)
  +  {
e.getTargetException().printStackTrace();
  -  } catch (RuntimeMBeanException e)
  +  }
  +  catch (RuntimeMBeanException e)
 {
e.getTargetException().printStackTrace();
  -  } catch (Exception e)
  +  }
  +  catch (Exception e)
 {
e.printStackTrace();
 }
  
  
  

___
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development