dblevins 2005/08/28 04:34:33
Modified: modules/core/src/java/org/openejb/alt/config
ConfigurationFactory.java
Log:
Changed logging setup a bit and added a hack for a hack
Revision Changes Path
1.23 +13 -10
openejb1/modules/core/src/java/org/openejb/alt/config/ConfigurationFactory.java
Index: ConfigurationFactory.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/alt/config/ConfigurationFactory.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ConfigurationFactory.java 26 Aug 2005 21:12:29 -0000 1.22
+++ ConfigurationFactory.java 28 Aug 2005 08:34:33 -0000 1.23
@@ -109,7 +109,7 @@
public class ConfigurationFactory implements OpenEjbConfigurationFactory,
ProviderDefaults {
public static final String DEFAULT_SECURITY_ROLE =
"openejb.default.security.role";
- protected static final Logger logger = Logger.getInstance("OpenEJB",
"org.openejb.util.resources");
+ protected static final Logger logger =
Logger.getInstance("OpenEJB.startup", "org.openejb.util.resources");
protected static final Messages messages = new
Messages("org.openejb.util.resources");
private AutoDeployer deployer;
@@ -664,14 +664,17 @@
assignBeansToContainers(beans, ejbds);
- try {
- //TODO:2: This is really temporary, jars should have their
- // own classpaths. We have code for this, but it has a couple
- // issues in the CMP container that prevent us from relying on
it.
- File jarFile =
SystemInstance.get().getHome().getFile(jar.jarURI);
-
SystemInstance.get().getClassPath().addJarToPath(jarFile.toURL());
- } catch (Exception e) {
- e.printStackTrace();
+ if
(!"tomcat-webapp".equals(SystemInstance.get().getProperty("openejb.loader"))){
+ try {
+ //TODO:2: This is really temporary, jars should have their
+ // own classpaths. We have code for this, but it has a
couple
+ // issues in the CMP container that prevent us from relying
on it.
+ File base = SystemInstance.get().getBase().getDirectory();
+ File jarFile = new File(base, jar.jarURI);
+
SystemInstance.get().getClassPath().addJarToPath(jarFile.toURL());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
return ejbJar;
}
