dblevins 2005/07/09 04:51:00
Modified: modules/core/src/java/org/openejb/core/stateful
SimplePassivater.java
Log:
I can't fix this Tomcat integration issue with all the silly statics.
Killing the statics. Death to the statics!
Added a class called SystemInstance, which is a singleton and hopefully the
only important static for the 1.0 codebase someday.
Changed FileUtils to get its instances from SystemInstance, then inlined all
that code.
Changed ClasspathUtils to get its Loader instance from SystemInstance and
managed to inline all the remaining code.
Revision Changes Path
1.4 +4 -3
openejb1/modules/core/src/java/org/openejb/core/stateful/SimplePassivater.java
Index: SimplePassivater.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/core/stateful/SimplePassivater.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimplePassivater.java 19 Jun 2005 22:40:32 -0000 1.3
+++ SimplePassivater.java 9 Jul 2005 08:51:00 -0000 1.4
@@ -55,6 +55,7 @@
import org.openejb.core.EnvProps;
import org.openejb.util.FileUtils;
+import org.openejb.loader.SystemInstance;
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Richard Monson-Haefel</a>
@@ -75,7 +76,7 @@
try{
if(dir!=null) {
- sessionDirectory = FileUtils.getBase().getDirectory(dir);
+ sessionDirectory =
SystemInstance.get().getBase().getDirectory(dir);
}else {
sessionDirectory = new
File(System.getProperty("java.io.tmpdir", File.separator + "tmp"));
}
