Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
Hi,
I haven't had time to play with it, but wanted to say +1 as I think this is a
cool effort and a good idea.
Yoav
--- Costin Manolache [EMAIL PROTECTED] wrote:
I have few weeks, I'm trying to sync up some of the few changes I made
in the last year before the code is moved to svn and try a bit more
the 'embedded' scenario ( both single-jar tomcat - that actually works
well, and also coyote-only ).
I uploaded 2 jars at http://people.apache.org/~costin/mini - one has
full jasper, the other only the jsp runtime. There are still few
requirements on the dir structure - you need to have the conf/web.xml,
work/, webapps/, but besides that it's just 'java -jar
tomcat+jasper.jar', no extra jars required.
tomcat-http11.jar is just coyote, with a javascript adapter as example (
let me know if you want to play with it, I'll send additional info ).
Costin
Henri Gomez wrote:
Happy to see Costin is back :)
15 Sep 2005 06:04:01 -, [EMAIL PROTECTED] [EMAIL PROTECTED]:
costin 2005/09/14 23:04:01
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
Support for corner case, when all tomcat is in a single jar and no fancy
classloaders are used.
Revision ChangesPath
1.23 +9 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Bootstrap.java3 May 2005 14:12:52 - 1.22
+++ Bootstrap.java15 Sep 2005 06:04:01 - 1.23
@@ -95,6 +95,10 @@
private void initClassLoaders() {
try {
commonLoader = createClassLoader(common, null);
+if( commonLoader == null ) {
+// no config file, default to this loader - we might be
in a 'single' env.
+commonLoader=this.getClass().getClassLoader();
+}
catalinaLoader = createClassLoader(server, commonLoader);
sharedLoader = createClassLoader(shared, commonLoader);
} catch (Throwable t) {
@@ -122,10 +126,10 @@
// Local repository
boolean packed = false;
if (repository.startsWith(CATALINA_HOME_TOKEN)) {
-repository = getCatalinaHome()
+repository = getCatalinaHome()
+
repository.substring(CATALINA_HOME_TOKEN.length());
} else if (repository.startsWith(CATALINA_BASE_TOKEN)) {
-repository = getCatalinaBase()
+repository = getCatalinaBase()
+
repository.substring(CATALINA_BASE_TOKEN.length());
}
@@ -159,14 +163,14 @@
// Retrieving MBean server
MBeanServer mBeanServer = null;
if (MBeanServerFactory.findMBeanServer(null).size() 0) {
-mBeanServer =
+mBeanServer =
(MBeanServer)
MBeanServerFactory.findMBeanServer(null).get(0);
} else {
mBeanServer = MBeanServerFactory.createMBeanServer();
}
// Register the server classloader
-ObjectName objectName =
+ObjectName objectName =
new ObjectName(Catalina:type=ServerClassLoader,name= +
name);
mBeanServer.registerMBean(classLoader, objectName);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
[EMAIL PROTECTED] wrote: costin 2005/09/14 23:04:01 Modified:catalina/src/share/org/apache/catalina/startup Bootstrap.java Log: Support for corner case, when all tomcat is in a single jar and no fancy classloaders are used. That's nice functionality :) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
I have few weeks, I'm trying to sync up some of the few changes I made
in the last year before the code is moved to svn and try a bit more
the 'embedded' scenario ( both single-jar tomcat - that actually works
well, and also coyote-only ).
I uploaded 2 jars at http://people.apache.org/~costin/mini - one has
full jasper, the other only the jsp runtime. There are still few
requirements on the dir structure - you need to have the conf/web.xml,
work/, webapps/, but besides that it's just 'java -jar
tomcat+jasper.jar', no extra jars required.
tomcat-http11.jar is just coyote, with a javascript adapter as example (
let me know if you want to play with it, I'll send additional info ).
Costin
Henri Gomez wrote:
Happy to see Costin is back :)
15 Sep 2005 06:04:01 -, [EMAIL PROTECTED] [EMAIL PROTECTED]:
costin 2005/09/14 23:04:01
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
Support for corner case, when all tomcat is in a single jar and no fancy
classloaders are used.
Revision ChangesPath
1.23 +9 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Bootstrap.java3 May 2005 14:12:52 - 1.22
+++ Bootstrap.java15 Sep 2005 06:04:01 - 1.23
@@ -95,6 +95,10 @@
private void initClassLoaders() {
try {
commonLoader = createClassLoader(common, null);
+if( commonLoader == null ) {
+// no config file, default to this loader - we might be in a
'single' env.
+commonLoader=this.getClass().getClassLoader();
+}
catalinaLoader = createClassLoader(server, commonLoader);
sharedLoader = createClassLoader(shared, commonLoader);
} catch (Throwable t) {
@@ -122,10 +126,10 @@
// Local repository
boolean packed = false;
if (repository.startsWith(CATALINA_HOME_TOKEN)) {
-repository = getCatalinaHome()
+repository = getCatalinaHome()
+ repository.substring(CATALINA_HOME_TOKEN.length());
} else if (repository.startsWith(CATALINA_BASE_TOKEN)) {
-repository = getCatalinaBase()
+repository = getCatalinaBase()
+ repository.substring(CATALINA_BASE_TOKEN.length());
}
@@ -159,14 +163,14 @@
// Retrieving MBean server
MBeanServer mBeanServer = null;
if (MBeanServerFactory.findMBeanServer(null).size() 0) {
-mBeanServer =
+mBeanServer =
(MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
} else {
mBeanServer = MBeanServerFactory.createMBeanServer();
}
// Register the server classloader
-ObjectName objectName =
+ObjectName objectName =
new ObjectName(Catalina:type=ServerClassLoader,name= + name);
mBeanServer.registerMBean(classLoader, objectName);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
costin 2005/09/14 23:04:01
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
Support for corner case, when all tomcat is in a single jar and no fancy
classloaders are used.
Revision ChangesPath
1.23 +9 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Bootstrap.java3 May 2005 14:12:52 - 1.22
+++ Bootstrap.java15 Sep 2005 06:04:01 - 1.23
@@ -95,6 +95,10 @@
private void initClassLoaders() {
try {
commonLoader = createClassLoader(common, null);
+if( commonLoader == null ) {
+// no config file, default to this loader - we might be in a
'single' env.
+commonLoader=this.getClass().getClassLoader();
+}
catalinaLoader = createClassLoader(server, commonLoader);
sharedLoader = createClassLoader(shared, commonLoader);
} catch (Throwable t) {
@@ -122,10 +126,10 @@
// Local repository
boolean packed = false;
if (repository.startsWith(CATALINA_HOME_TOKEN)) {
-repository = getCatalinaHome()
+repository = getCatalinaHome()
+ repository.substring(CATALINA_HOME_TOKEN.length());
} else if (repository.startsWith(CATALINA_BASE_TOKEN)) {
-repository = getCatalinaBase()
+repository = getCatalinaBase()
+ repository.substring(CATALINA_BASE_TOKEN.length());
}
@@ -159,14 +163,14 @@
// Retrieving MBean server
MBeanServer mBeanServer = null;
if (MBeanServerFactory.findMBeanServer(null).size() 0) {
-mBeanServer =
+mBeanServer =
(MBeanServer)
MBeanServerFactory.findMBeanServer(null).get(0);
} else {
mBeanServer = MBeanServerFactory.createMBeanServer();
}
// Register the server classloader
-ObjectName objectName =
+ObjectName objectName =
new ObjectName(Catalina:type=ServerClassLoader,name= + name);
mBeanServer.registerMBean(classLoader, objectName);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
Happy to see Costin is back :)
15 Sep 2005 06:04:01 -, [EMAIL PROTECTED] [EMAIL PROTECTED]:
costin 2005/09/14 23:04:01
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
Support for corner case, when all tomcat is in a single jar and no fancy
classloaders are used.
Revision ChangesPath
1.23 +9 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Bootstrap.java3 May 2005 14:12:52 - 1.22
+++ Bootstrap.java15 Sep 2005 06:04:01 - 1.23
@@ -95,6 +95,10 @@
private void initClassLoaders() {
try {
commonLoader = createClassLoader(common, null);
+if( commonLoader == null ) {
+// no config file, default to this loader - we might be in
a 'single' env.
+commonLoader=this.getClass().getClassLoader();
+}
catalinaLoader = createClassLoader(server, commonLoader);
sharedLoader = createClassLoader(shared, commonLoader);
} catch (Throwable t) {
@@ -122,10 +126,10 @@
// Local repository
boolean packed = false;
if (repository.startsWith(CATALINA_HOME_TOKEN)) {
-repository = getCatalinaHome()
+repository = getCatalinaHome()
+ repository.substring(CATALINA_HOME_TOKEN.length());
} else if (repository.startsWith(CATALINA_BASE_TOKEN)) {
-repository = getCatalinaBase()
+repository = getCatalinaBase()
+ repository.substring(CATALINA_BASE_TOKEN.length());
}
@@ -159,14 +163,14 @@
// Retrieving MBean server
MBeanServer mBeanServer = null;
if (MBeanServerFactory.findMBeanServer(null).size() 0) {
-mBeanServer =
+mBeanServer =
(MBeanServer)
MBeanServerFactory.findMBeanServer(null).get(0);
} else {
mBeanServer = MBeanServerFactory.createMBeanServer();
}
// Register the server classloader
-ObjectName objectName =
+ObjectName objectName =
new ObjectName(Catalina:type=ServerClassLoader,name= + name);
mBeanServer.registerMBean(classLoader, objectName);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
remm2004/08/16 16:48:59
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
- New error message when JMX isn't there.
Revision ChangesPath
1.20 +5 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Bootstrap.java23 Jun 2004 16:59:41 - 1.19
+++ Bootstrap.java16 Aug 2004 23:48:59 - 1.20
@@ -63,13 +63,10 @@
private static final String JMX_ERROR_MESSAGE =
-Due to new licensing guidelines mandated by the Apache Software\n
-+ Foundation Board of Directors, a JMX implementation can no longer\n
-+ be distributed with the Apache Tomcat binaries. As a result, you \n
-+ must download a JMX 1.2 implementation (such as the Sun Reference\n
-+ Implementation) and copy the JAR containing the API and \n
-+ implementation of the JMX specification to: \n
-+ ${catalina.home}/bin/jmx.jar;
+This release of Apache Tomcat was packaged to run on J2SE 5.0 \n
++ or later. It can be run on earlier JVMs by downloading and \n
++ installing a compatibility package from the Apache Tomcat \n
++ binary download page.;
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
remm2004/03/12 06:32:47
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
- Add error message about the absence of JMX when running standalone.
- This is not i18nized because it will most likely go to the console, and few classes
are available at the start of bootstrap.
Revision ChangesPath
1.18 +24 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Bootstrap.java2 Mar 2004 12:32:08 - 1.17
+++ Bootstrap.java12 Mar 2004 14:32:47 - 1.18
@@ -59,6 +59,16 @@
// --- Static Variables
+private static final String JMX_ERROR_MESSAGE =
+Due to new licensing guidelines mandated by the Apache Software\n
++ Foundation Board of Directors, a JMX implementation can no longer\n
++ be distributed with the Apache Tomcat binaries. As a result, you \n
++ must download a JMX 1.2 implementation (such as the Sun Reference\n
++ Implementation) and copy the JAR containing the API and \n
++ implementation of the JMX specification to: \n
++ ${catalina.home}/bin/jmx.jar;
+
+
/**
* Daemon object used by main.
*/
@@ -369,6 +379,19 @@
* @param args Command line arguments to be processed
*/
public static void main(String args[]) {
+
+try {
+// Attempt to load JMX class
+new ObjectName(test:foo=bar);
+} catch (Throwable t) {
+System.out.println(JMX_ERROR_MESSAGE);
+try {
+// Give users some time to read the message before exiting
+Thread.sleep(5000);
+} catch (Exception ex) {
+}
+return;
+}
if (daemon == null) {
daemon = new Bootstrap();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
remm2004/03/02 04:32:08
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
- Register all classloaders with JMX, so that Tomcat is actually manageable
through JMX remote (otherwise, instantiating a new MBean is not possible).
Revision ChangesPath
1.17 +22 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Bootstrap.java27 Feb 2004 14:58:48 - 1.16
+++ Bootstrap.java2 Mar 2004 12:32:08 - 1.17
@@ -25,6 +25,10 @@
import java.util.ArrayList;
import java.util.StringTokenizer;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+
import org.apache.catalina.security.SecurityClassLoad;
@@ -143,8 +147,24 @@
File[] packed = (File[]) packedList.toArray(new File[0]);
URL[] urls = (URL[]) urlList.toArray(new URL[0]);
-return ClassLoaderFactory.createClassLoader
+ClassLoader classLoader = ClassLoaderFactory.createClassLoader
(unpacked, packed, urls, parent);
+
+// Retrieving MBean server
+MBeanServer mBeanServer = null;
+if (MBeanServerFactory.findMBeanServer(null).size() 0) {
+mBeanServer =
+(MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+} else {
+mBeanServer = MBeanServerFactory.createMBeanServer();
+}
+
+// Register the server classloader
+ObjectName objectName =
+new ObjectName(Catalina:type=ServerClassLoader,name= + name);
+mBeanServer.registerMBean(classLoader, objectName);
+
+return classLoader;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java Catalina.java
remm2004/02/25 14:05:43
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java Catalina.java
Log:
- Fix bug 27127: Shutdown doesn't work with custom server port and non-default
config file.
Revision ChangesPath
1.15 +26 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Bootstrap.java19 Nov 2003 18:18:51 - 1.14
+++ Bootstrap.java25 Feb 2004 22:05:43 - 1.15
@@ -324,6 +324,30 @@
}
+ /**
+ * Stop the standlone server.
+ */
+public void stopServer(String[] arguments)
+throws Exception {
+
+Object param[];
+Class paramTypes[];
+if (arguments==null || arguments.length==0) {
+paramTypes = null;
+param = null;
+} else {
+paramTypes = new Class[1];
+paramTypes[0] = arguments.getClass();
+param = new Object[1];
+param[0] = arguments;
+}
+Method method =
+catalinaDaemon.getClass().getMethod(stopServer, paramTypes);
+method.invoke(catalinaDaemon, param);
+
+}
+
+
/**
* Set flag.
*/
@@ -397,7 +421,7 @@
daemon.load(args);
daemon.start();
} else if (command.equals(stop)) {
-daemon.stopServer();
+daemon.stopServer(args);
}
} catch (Throwable t) {
t.printStackTrace();
1.26 +12 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Catalina.java 5 Feb 2004 05:27:31 - 1.25
+++ Catalina.java 25 Feb 2004 22:05:43 - 1.26
@@ -423,6 +423,14 @@
public void stopServer() {
+stopServer(null);
+}
+
+public void stopServer(String[] arguments) {
+
+if (arguments != null) {
+arguments(arguments);
+}
if( server == null ) {
// Create and execute our Digester
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
remm2003/11/19 10:18:51
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
- The command is the last parameter, not the first one (bug 24829).
Revision ChangesPath
1.14 +3 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Bootstrap.java10 Oct 2003 12:16:37 - 1.13
+++ Bootstrap.java19 Nov 2003 18:18:51 - 1.14
@@ -382,8 +382,9 @@
try {
String command = start;
if (args.length 0) {
-command = args[0];
+command = args[args.length - 1];
}
+
if (command.equals(startd)) {
args[0] = start;
daemon.load(args);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
remm2003/10/10 05:16:37
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
- Small tweaks to allow to execute the bootstrap JAR. This won't set any
endorsed properties (maybe there's an entry for that in the manifest, but
I don't know it), but could be useful.
Revision ChangesPath
1.13 +22 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Bootstrap.java23 Sep 2003 13:43:18 - 1.12
+++ Bootstrap.java10 Oct 2003 12:16:37 - 1.13
@@ -380,7 +380,10 @@
}
try {
-String command = args[0];
+String command = start;
+if (args.length 0) {
+command = args[0];
+}
if (command.equals(startd)) {
args[0] = start;
daemon.load(args);
@@ -436,8 +439,23 @@
if (System.getProperty(catalina.home) != null)
return;
-System.setProperty(catalina.home,
- System.getProperty(user.dir));
+File bootstrapJar =
+new File(System.getProperty(user.dir), bootstrap.jar);
+if (bootstrapJar.exists()) {
+try {
+System.setProperty
+(catalina.home,
+ (new File(System.getProperty(user.dir), ..))
+ .getCanonicalPath());
+} catch (Exception e) {
+// Ignore
+System.setProperty(catalina.home,
+ System.getProperty(user.dir));
+}
+} else {
+System.setProperty(catalina.home,
+ System.getProperty(user.dir));
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java ClassLoaderFactory.java
remm2003/09/23 06:43:18
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java ClassLoaderFactory.java
Log:
- Add the possibility to specify straight URLs in the repository list (= single JARs,
remote repositories, etc).
Revision ChangesPath
1.12 +6 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Bootstrap.java2 Sep 2003 21:22:00 - 1.11
+++ Bootstrap.java23 Sep 2003 13:43:18 - 1.12
@@ -63,6 +63,7 @@
import java.io.File;
import java.lang.reflect.Method;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.StringTokenizer;
@@ -92,7 +93,6 @@
protected static final String CATALINA_HOME_TOKEN = ${catalina.home};
protected static final String CATALINA_BASE_TOKEN = ${catalina.base};
-protected static final String HTTP_TOKEN = http://;;
// --- Static Variables
@@ -154,10 +154,12 @@
StringTokenizer tokenizer = new StringTokenizer(value, ,);
while (tokenizer.hasMoreElements()) {
String repository = tokenizer.nextToken();
-// Check for a remote repository
-if (repository.startsWith(HTTP_TOKEN)) {
+// Check for a JAR URL repository
+try {
urlList.add(new URL(repository));
continue;
+} catch (MalformedURLException e) {
+// Ignore
}
// Local repository
boolean packed = false;
1.5 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java
Index: ClassLoaderFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClassLoaderFactory.java 2 Sep 2003 21:22:00 - 1.4
+++ ClassLoaderFactory.java 23 Sep 2003 13:43:18 - 1.5
@@ -222,7 +222,7 @@
}
}
-// Add remote URLs
+// Add URLs
if (urls != null) {
for (int i = 0; i urls.length; i++) {
list.add(urls[i].toString());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
remm2003/01/03 07:39:14
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
- Add support for catalina.base in loader configuration.
Revision ChangesPath
1.10 +8 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Bootstrap.java2 Dec 2002 21:33:12 - 1.9
+++ Bootstrap.java3 Jan 2003 15:39:13 - 1.10
@@ -92,7 +92,8 @@
// -- Constants
-protected static final String CATALINA_TOKEN = ${catalina.home};
+protected static final String CATALINA_HOME_TOKEN = ${catalina.home};
+protected static final String CATALINA_BASE_TOKEN = ${catalina.base};
protected static final String HTTP_TOKEN = http://;;
@@ -162,9 +163,12 @@
}
// Local repository
boolean packed = false;
-if (repository.startsWith(CATALINA_TOKEN)) {
+if (repository.startsWith(CATALINA_HOME_TOKEN)) {
repository = getCatalinaHome()
-+ repository.substring(CATALINA_TOKEN.length());
++ repository.substring(CATALINA_HOME_TOKEN.length());
+} else if (repository.startsWith(CATALINA_BASE_TOKEN)) {
+repository = getCatalinaBase()
++ repository.substring(CATALINA_BASE_TOKEN.length());
}
if (repository.endsWith(*.jar)) {
packed = true;
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java ClassLoaderFactory.java
remm2002/12/02 02:38:11
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java ClassLoaderFactory.java
Log:
- Add the possibility to specify remote codebases.
Revision ChangesPath
1.8 +15 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Bootstrap.java26 Oct 2002 12:29:56 - 1.7
+++ Bootstrap.java2 Dec 2002 10:38:11 - 1.8
@@ -97,6 +97,7 @@
protected static final String CATALINA_TOKEN = ${catalina.home};
+protected static final String HTTP_TOKEN = http://;;
// --- Static Variables
@@ -153,10 +154,17 @@
ArrayList unpackedList = new ArrayList();
ArrayList packedList = new ArrayList();
+ArrayList urlList = new ArrayList();
StringTokenizer tokenizer = new StringTokenizer(value, ,);
while (tokenizer.hasMoreElements()) {
String repository = tokenizer.nextToken();
+// Check for a remote repository
+if (repository.startsWith(HTTP_TOKEN)) {
+urlList.add(new URL(repository));
+continue;
+}
+// Local repository
boolean packed = false;
if (repository.startsWith(CATALINA_TOKEN)) {
repository = getCatalinaHome()
@@ -176,8 +184,10 @@
File[] unpacked = (File[]) unpackedList.toArray(new File[0]);
File[] packed = (File[]) packedList.toArray(new File[0]);
+URL[] urls = (URL[]) urlList.toArray(new URL[0]);
-return ClassLoaderFactory.createClassLoader(unpacked, packed, parent);
+return ClassLoaderFactory.createClassLoader
+(unpacked, packed, urls, parent);
}
1.3 +39 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java
Index: ClassLoaderFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassLoaderFactory.java 24 Oct 2002 13:53:22 - 1.2
+++ ClassLoaderFactory.java 2 Dec 2002 10:38:11 - 1.3
@@ -152,6 +152,34 @@
File packed[],
ClassLoader parent)
throws Exception {
+return createClassLoader(unpacked, packed, null, parent);
+}
+
+
+/**
+ * Create and return a new class loader, based on the configuration
+ * defaults and the specified directory paths:
+ *
+ * @param unpacked Array of pathnames to unpacked directories that should
+ * be added to the repositories of the class loader, or codenull/code
+ * for no unpacked directories to be considered
+ * @param packed Array of pathnames to directories containing JAR files
+ * that should be added to the repositories of the class loader,
+ * or codenull/code for no directories of JAR files to be considered
+ * @param urls Array of URLs to remote repositories, designing either JAR
+ * resources or uncompressed directories that should be added to
+ * the repositories of the class loader, or codenull/code for no
+ * directories of JAR files to be considered
+ * @param parent Parent class loader for the new class loader, or
+ * codenull/code for the system class loader.
+ *
+ * @exception Exception if an error occurs constructing the class loader
+ */
+public static ClassLoader createClassLoader(File unpacked[],
+File packed[],
+URL urls[],
+ClassLoader parent)
+throws Exception {
if (debug = 1)
log(Creating new class loader);
@@ -193,6 +221,13 @@
file.getCanonicalPath());
list.add(url.toString());
}
+}
+}
+
+// Add remote URLs
+if (urls != null) {
+for (int i = 0; i urls.length; i++) {
+list.add(urls[i].toString());
}
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands,
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
costin 2002/12/02 13:33:12
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
Few changes to make Bootstrap useable as an MBean ( via modeler )
This allows tomcat to be embeded using its own class loader hierarchy
( i.e. the embedding app will not need to have tomcat classes in the
main loader ).
Given that most of the admin operations will be exposed via MBeans
there is little need for the app to see tomcat internals. However
some interfaces or classes may be needed. This can be tuned by adding
classes and libs to the parent loader.
In general all tomcat .jars should work in either parent loader or in
the server loader.
Revision ChangesPath
1.9 +26 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Bootstrap.java2 Dec 2002 10:38:11 - 1.8
+++ Bootstrap.java2 Dec 2002 21:33:12 - 1.9
@@ -1,8 +1,4 @@
/*
- * $Header$
- * $Revision$
- * $Date$
- *
*
*
* The Apache Software License, Version 1.1
@@ -195,8 +191,9 @@
/**
* Initialize daemon.
*/
-private void init()
-throws Exception {
+public void init()
+throws Exception
+{
// Set Catalina path
setCatalinaHome();
@@ -290,6 +287,7 @@
*/
public void start()
throws Exception {
+if( catalinaDaemon==null ) init();
Method method = catalinaDaemon.getClass().getMethod(start, null);
method.invoke(catalinaDaemon, null);
@@ -338,6 +336,17 @@
}
+public boolean getAwait()
+throws Exception
+{
+Class paramTypes[] = new Class[0];
+Object paramValues[] = new Object[0];
+Method method =
+catalinaDaemon.getClass().getMethod(getAwait, paramTypes);
+Boolean b=(Boolean)method.invoke(catalinaDaemon, paramValues);
+return b.booleanValue();
+}
+
/**
* Destroy the Catalina Daemon.
@@ -388,6 +397,14 @@
}
+public void setCatalinaHome(String s) {
+System.setProperty( catalina.home, s );
+}
+
+public void setCatalinaBase(String s) {
+System.setProperty( catalina.base, s );
+}
+
/**
* Set the codecatalina.base/code System property to the current
@@ -424,7 +441,7 @@
/**
* Get the value of the catalina.home environment variable.
*/
-protected static String getCatalinaHome() {
+public static String getCatalinaHome() {
return System.getProperty(catalina.home,
System.getProperty(user.dir));
}
@@ -433,7 +450,7 @@
/**
* Get the value of the catalina.base environment variable.
*/
-protected static String getCatalinaBase() {
+public static String getCatalinaBase() {
return System.getProperty(catalina.base, getCatalinaHome());
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java Catalina.java
remm2002/10/26 05:29:56
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java Catalina.java
Log:
- Fix service functionality.
Revision ChangesPath
1.7 +7 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Bootstrap.java24 Oct 2002 22:06:04 - 1.6
+++ Bootstrap.java26 Oct 2002 12:29:56 - 1.7
-86,6 +86,7
* class path and therefore not visible to application level classes.
*
* author Craig R. McClanahan
+ * author Remy Maucherat
* version $Revision$ $Date$
*/
-358,9 +359,11
try {
String command = args[0];
if (command.equals(startd)) {
+args[0] = start;
daemon.load(args);
daemon.start();
} else if (command.equals(stopd)) {
+args[0] = stop;
daemon.stop();
} else if (command.equals(start)) {
daemon.setAwait(true);
1.9 +5 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Catalina.java 24 Oct 2002 22:06:04 - 1.8
+++ Catalina.java 26 Oct 2002 12:29:56 - 1.9
-98,6 +98,7
* /u
*
* author Craig R. McClanahan
+ * author Remy Maucherat
* version $Revision$ $Date$
*/
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java Catalina.java BootstrapService.java CatalinaService.java
remm2002/10/24 15:06:04
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java Catalina.java
Removed: catalina/src/share/org/apache/catalina/startup
BootstrapService.java CatalinaService.java
Log:
- Remove the *Service classes.
- The basic functionality appears to be working. The Windows service
will need to be tested and updated (tomorrow).
Revision ChangesPath
1.6 +243 -112
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Bootstrap.java24 Oct 2002 13:53:22 - 1.5
+++ Bootstrap.java24 Oct 2002 22:06:04 - 1.6
-91,76 +91,54
public final class Bootstrap {
+
+// -- Constants
+
+
+protected static final String CATALINA_TOKEN = ${catalina.home};
+
+
+// --- Static Variables
+
+
+/**
+ * Daemon object used by main.
+ */
+private static Bootstrap daemon = null;
+
+
+// -- Variables
+
+
/**
* Debugging detail level for processing the startup.
*/
protected int debug = 0;
-protected String args[];
-// Construct the class loaders we will need
+
+/**
+ * Daemon reference.
+ */
+private Object catalinaDaemon = null;
+
+
protected ClassLoader commonLoader = null;
protected ClassLoader catalinaLoader = null;
protected ClassLoader sharedLoader = null;
-protected static final String CATALINA_TOKEN = ${catalina.home};
-
-public void setDebug( int debug ) {
-this.debug=debug;
-}
-
-public void setArgs(String args[] ) {
-this.args=args;
-}
+// Private Methods
-// --- Main Program
-
-public void initClassLoaders() {
+private void initClassLoaders() {
try {
-
-/*
-File unpacked[] = new File[1];
-File packed[] = new File[1];
-File packed2[] = new File[2];
-ClassLoaderFactory.setDebug(debug);
-
-unpacked[0] = new File(getCatalinaHome(),
- common + File.separator + classes);
-packed2[0] = new File(getCatalinaHome(),
- common + File.separator + endorsed);
-packed2[1] = new File(getCatalinaHome(),
- common + File.separator + lib);
-commonLoader =
-ClassLoaderFactory.createClassLoader(unpacked, packed2, null);
-
-unpacked[0] = new File(getCatalinaHome(),
- server + File.separator + classes);
-packed[0] = new File(getCatalinaHome(),
- server + File.separator + lib);
-catalinaLoader =
-ClassLoaderFactory.createClassLoader(unpacked, packed,
- commonLoader);
-
-unpacked[0] = new File(getCatalinaBase(),
- shared + File.separator + classes);
-packed[0] = new File(getCatalinaBase(),
- shared + File.separator + lib);
-sharedLoader =
-ClassLoaderFactory.createClassLoader(unpacked, packed,
- commonLoader);
-*/
-
ClassLoaderFactory.setDebug(debug);
commonLoader = createClassLoader(common, null);
catalinaLoader = createClassLoader(server, commonLoader);
sharedLoader = createClassLoader(shared, commonLoader);
-
} catch (Throwable t) {
-
log(Class loader creation threw exception, t);
System.exit(1);
-
}
}
-203,84 +181,237
}
-// --- Main Program
+/**
+ * Initialize daemon.
+ */
+private void init()
+throws Exception {
-public void execute() {
-// Set the debug flag appropriately
-for (int i = 0; i args.length; i++) {
-if (-debug.equals(args[i]))
-setDebug( 1 );
-}
-
-
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java
costin 2002/10/22 13:25:29
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java
Log:
A bit of refactoring I had on my machine.
I'm still confused on which file is actually used, and not sure
if this is actually needed.
Revision ChangesPath
1.4 +51 -36
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bootstrap.java18 Oct 2002 21:30:43 - 1.3
+++ Bootstrap.java22 Oct 2002 20:25:29 - 1.4
-90,42 +90,29
public final class Bootstrap {
-
-// --- Static Variables
-
-
/**
* Debugging detail level for processing the startup.
*/
-private static int debug = 0;
+protected int debug = 0;
+protected String args[];
+// Construct the class loaders we will need
+protected ClassLoader commonLoader = null;
+protected ClassLoader catalinaLoader = null;
+protected ClassLoader sharedLoader = null;
+
+
+public void setDebug( int debug ) {
+this.debug=debug;
+}
+public void setArgs(String args[] ) {
+this.args=args;
+}
// --- Main Program
-
-/**
- * The main program for the bootstrap.
- *
- * param args Command line arguments to be processed
- */
-public static void main(String args[]) {
-
-// Set the debug flag appropriately
-for (int i = 0; i args.length; i++) {
-if (-debug.equals(args[i]))
-debug = 1;
-}
-
-// Configure catalina.base from catalina.home if not yet set
-if (System.getProperty(catalina.base) == null)
-System.setProperty(catalina.base, getCatalinaHome());
-
-// Construct the class loaders we will need
-ClassLoader commonLoader = null;
-ClassLoader catalinaLoader = null;
-ClassLoader sharedLoader = null;
+public void initClassLoaders() {
try {
-
File unpacked[] = new File[1];
File packed[] = new File[1];
File packed2[] = new File[2];
-161,6 +148,23
System.exit(1);
}
+}
+
+// --- Main Program
+
+public void execute() {
+// Set the debug flag appropriately
+for (int i = 0; i args.length; i++) {
+if (-debug.equals(args[i]))
+setDebug( 1 );
+}
+
+// Configure catalina.base from catalina.home if not yet set
+if (System.getProperty(catalina.base) == null)
+System.setProperty(catalina.base, getCatalinaHome());
+
+this.initClassLoaders();
+
Thread.currentThread().setContextClassLoader(catalinaLoader);
-205,14 +209,25
e.printStackTrace(System.out);
System.exit(2);
}
+}
+
+/**
+ * The main program for the bootstrap.
+ *
+ * param args Command line arguments to be processed
+ */
+public static void main(String args[]) {
+Bootstrap bootstrap=new Bootstrap();
+bootstrap.setArgs( args );
+bootstrap.execute();
}
/**
* Get the value of the catalina.home environment variable.
*/
-private static String getCatalinaHome() {
+protected String getCatalinaHome() {
return System.getProperty(catalina.home,
System.getProperty(user.dir));
}
-221,7 +236,7
/**
* Get the value of the catalina.base environment variable.
*/
-private static String getCatalinaBase() {
+protected String getCatalinaBase() {
return System.getProperty(catalina.base, getCatalinaHome());
}
-231,7 +246,7
*
* param message The message to be logged
*/
-private static void log(String message) {
+protected void log(String message) {
System.out.print(Bootstrap: );
System.out.println(message);
-245,7 +260,7
* param message The message to be logged
* param exception The exception to be logged
*/
-private static void log(String message, Throwable exception) {
+protected void log(String message, Throwable exception) {
log(message);
exception.printStackTrace(System.out);
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup Bootstrap.java BootstrapService.java
jfarcand2002/10/18 14:30:43
Modified:catalina/src/share/org/apache/catalina/startup
Bootstrap.java BootstrapService.java
Log:
Use the security.SecurityClassLoad.
Revision ChangesPath
1.3 +7 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Bootstrap.java24 Aug 2002 02:27:27 - 1.2
+++ Bootstrap.java18 Oct 2002 21:30:43 - 1.3
-72,6 +72,7
import java.net.URL;
import java.util.ArrayList;
import org.apache.catalina.loader.StandardClassLoader;
+import org.apache.catalina.security.SecurityClassLoad;
/**
-114,7 +115,7
if (-debug.equals(args[i]))
debug = 1;
}
-
+
// Configure catalina.base from catalina.home if not yet set
if (System.getProperty(catalina.base) == null)
System.setProperty(catalina.base, getCatalinaHome());
-160,13 +161,11
System.exit(1);
}
-
-
Thread.currentThread().setContextClassLoader(catalinaLoader);
+
// Load our startup class and call its process() method
try {
-
SecurityClassLoad.securityClassLoad(catalinaLoader);
// Instantiate a startup class instance
1.4 +5 -4
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/BootstrapService.java
Index: BootstrapService.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/BootstrapService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BootstrapService.java 11 Oct 2002 10:54:52 - 1.3
+++ BootstrapService.java 18 Oct 2002 21:30:43 - 1.4
-72,6 +72,7
import java.net.URL;
import java.util.ArrayList;
import org.apache.catalina.loader.StandardClassLoader;
+import org.apache.catalina.security.SecurityClassLoad;
/**
--
To unsubscribe, e-mail: mailto:tomcat-dev-unsubscribe;jakarta.apache.org
For additional commands, e-mail: mailto:tomcat-dev-help;jakarta.apache.org
