jlaskowski 2004/08/25 18:57:56
Modified: modules/core/src/java/org/openejb/loader
EmbeddingLoader.java
Log:
openejb-loader-VERSION.war resurrection; use it instead of openejb-webadmin to have
OpenEJB loaded per Tomcat instance. openejb-webadmin hasn't worked well, as once it
was loaded no WebAdmin JSPs could be compiled. Other webapps worked fine, and so did
those that used OpenEJB
Revision Changes Path
1.3 +12 -8
openejb1/modules/core/src/java/org/openejb/loader/EmbeddingLoader.java
Index: EmbeddingLoader.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/loader/EmbeddingLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EmbeddingLoader.java 5 Jul 2004 15:47:46 -0000 1.2
+++ EmbeddingLoader.java 25 Aug 2004 22:57:56 -0000 1.3
@@ -87,16 +87,20 @@
}
loaded = true;
}
-
- // Sets the openejb.home system variable
+
+ /**
+ * Loads all the libraries in the lib and dist directories depending on the
+ * environment it pulls it from openejb.home or openejb.base directory
+ *
+ * @param env
+ * @throws Exception
+ */
private void importOpenEJBLibraries( Hashtable env ) throws Exception{
try{
- // Loads all the libraries in the openejb.home/lib directory
- ClasspathUtils.addJarsToPath("lib", "tomcat-webapp", env);
-
- // Loads all the libraries in the openejb.home/dist directory
- ClasspathUtils.addJarsToPath("dist", "tomcat-webapp", env);
+ String openejbLoader = (String) env.get("openejb.loader");
+ ClasspathUtils.addJarsToPath("lib", (openejbLoader == null ? "tomcat" :
openejbLoader), env);
+ ClasspathUtils.addJarsToPath("dist", (openejbLoader == null ? "tomcat"
: openejbLoader), env);
} catch (Exception e){
throw new Exception( "Could not load OpenEJB libraries. Exception: "+
e.getClass().getName()+" "+ e.getMessage());
