dblevins 2005/07/09 05:10:39
Modified: modules/core/src/java/org/openejb/loader SystemInstance.java
SystemLoader.java TomcatWebappLoader.java
package.html
Log:
Renamed ClasspathUtils.Loader to ClasspathUtils.ClassPath. Will be moving it
shortly.
Revision Changes Path
1.2 +4 -4
openejb1/modules/core/src/java/org/openejb/loader/SystemInstance.java
Index: SystemInstance.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/SystemInstance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SystemInstance.java 9 Jul 2005 08:51:00 -0000 1.1
+++ SystemInstance.java 9 Jul 2005 09:10:39 -0000 1.2
@@ -69,14 +69,14 @@
private final FileUtils base;
private ClassLoader classLoader;
private final HashMap components;
- private final ClasspathUtils.Loader loader;
+ private final ClasspathUtils.ClassPath classPath;
private SystemInstance(Properties properties) throws Exception {
this.properties = properties;
this.home = new FileUtils("openejb.home", "user.dir", properties);
this.base = new FileUtils("openejb.base", "openejb.home",
properties);
this.components = new HashMap();
- loader =
ClasspathUtils.LoaderFactory.createLoader(properties.getProperty("openejb.loader",
"context"));
+ classPath =
ClasspathUtils.ClassPathFactory.createLoader(properties.getProperty("openejb.loader",
"context"));
}
@@ -108,8 +108,8 @@
return base;
}
- public ClasspathUtils.Loader getLoader() {
- return loader;
+ public ClasspathUtils.ClassPath getLoader() {
+ return classPath;
}
public ClassLoader getClassLoader() {
1.6 +3 -3
openejb1/modules/core/src/java/org/openejb/loader/SystemLoader.java
Index: SystemLoader.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/SystemLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SystemLoader.java 9 Jul 2005 08:51:00 -0000 1.5
+++ SystemLoader.java 9 Jul 2005 09:10:39 -0000 1.6
@@ -62,10 +62,10 @@
public class SystemLoader implements Loader {
static boolean loaded = false;
- private final ClasspathUtils.Loader loader;
+ private final ClasspathUtils.ClassPath classPath;
public SystemLoader() {
- this.loader = SystemInstance.get().getLoader();
+ this.classPath = SystemInstance.get().getLoader();
}
/**
@@ -122,7 +122,7 @@
private void addJarsToPath(String dir) throws Exception {
Hashtable env = System.getProperties();
File dirAtHome = SystemInstance.get().getHome().getDirectory(dir);
- loader.addJarsToPath(dirAtHome);
+ classPath.addJarsToPath(dirAtHome);
}
}
1.8 +3 -3
openejb1/modules/core/src/java/org/openejb/loader/TomcatWebappLoader.java
Index: TomcatWebappLoader.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/TomcatWebappLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TomcatWebappLoader.java 9 Jul 2005 08:51:00 -0000 1.7
+++ TomcatWebappLoader.java 9 Jul 2005 09:10:39 -0000 1.8
@@ -58,10 +58,10 @@
public class TomcatWebappLoader implements Loader {
static boolean loaded = false;
- private final ClasspathUtils.Loader loader;
+ private final ClasspathUtils.ClassPath classPath;
public TomcatWebappLoader() {
- this.loader = SystemInstance.get().getLoader();
+ this.classPath = SystemInstance.get().getLoader();
}
/**
@@ -125,6 +125,6 @@
private void addJarsToPath(String dir) throws Exception {
Hashtable env = System.getProperties();
File dirAtHome = SystemInstance.get().getHome().getDirectory(dir);
- loader.addJarsToPath(dirAtHome);
+ classPath.addJarsToPath(dirAtHome);
}
}
1.4 +2 -2
openejb1/modules/core/src/java/org/openejb/loader/package.html
Index: package.html
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/package.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- package.html 19 Jun 2005 22:40:32 -0000 1.3
+++ package.html 9 Jul 2005 09:10:39 -0000 1.4
@@ -50,7 +50,7 @@
</head>
<body bgcolor="white">
-The classes and interfaces directly under this package define the OpenEJB
Tomcat loader.
+The classes and interfaces directly under this package define the OpenEJB
Tomcat classPathathath.
<h2>Package Specification</h2>
