cziegeler 01/07/12 08:03:15
Modified: src/org/apache/cocoon/components/language/programming/java
Tag: cocoon_20_branch Javac.java
src/org/apache/cocoon/generation Tag: cocoon_20_branch
ImageDirectoryGenerator.java
src/org/apache/cocoon/util Tag: cocoon_20_branch
NetUtils.java
Log:
Removed references to deprecated LogKit
Revision Changes Path
No revision
No revision
1.2.2.2 +4 -4
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Javac.java 2001/07/02 21:53:18 1.2.2.1
+++ Javac.java 2001/07/12 15:02:55 1.2.2.2
@@ -18,7 +18,7 @@
import java.util.StringTokenizer;
import org.apache.cocoon.components.language.programming.CompilerError;
import org.apache.cocoon.util.ClassUtils;
-import org.apache.log.LogKit;
+import org.apache.log.Hierarchy;
import org.apache.log.Logger;
import sun.tools.javac.Main;
@@ -26,7 +26,7 @@
* This class wraps the Sun's Javac Compiler.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.2.2.1 $ $Date: 2001/07/02 21:53:18 $
+ * @version $Revision: 1.2.2.2 $ $Date: 2001/07/12 15:02:55 $
* @since 2.0
*/
@@ -44,12 +44,12 @@
ClassUtils.loadClass(MODERN_CLASS);
modern = true;
} catch (ClassNotFoundException e) {
- LogKit.getLoggerFor("cocoon").debug("Javac connector could not find modern
compiler -- falling back to classic.");
+ Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").debug("Javac
connector could not find modern compiler -- falling back to classic.");
try {
ClassUtils.loadClass(CLASSIC_CLASS);
modern = false;
} catch (Exception ex) {
- LogKit.getLoggerFor("cocoon").error("No compiler found in your
classpath. Make sure you added 'tools.jar'", ex);
+ Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").error("No
compiler found in your classpath. Make sure you added 'tools.jar'", ex);
throw new RuntimeException("No compiler found in your classpath. Make
sure you added 'tools.jar'");
}
}
No revision
No revision
1.4.2.1 +7 -7
xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java
Index: ImageDirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ImageDirectoryGenerator.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ImageDirectoryGenerator.java 2001/05/10 15:36:37 1.4
+++ ImageDirectoryGenerator.java 2001/07/12 15:03:04 1.4.2.1
@@ -13,7 +13,7 @@
import java.io.FileReader;
import java.io.IOException;
import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.log.LogKit;
+import org.apache.log.Hierarchy;
import org.apache.log.Logger;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -23,7 +23,7 @@
* files.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald A. Ball Jr.</a>
- * @version $Revision: 1.4 $ $Date: 2001/05/10 15:36:37 $
+ * @version $Revision: 1.4.2.1 $ $Date: 2001/07/12 15:03:04 $
*/
public class ImageDirectoryGenerator extends DirectoryGenerator {
@@ -58,7 +58,7 @@
if(type.equals("gif")) return getGifSize(file);
else return getJpegSize(file);
} catch(Exception e) {
- LogKit.getLoggerFor("cocoon").debug("File is not a valid GIF or Jpeg",
e);
+ Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").debug("File is
not a valid GIF or Jpeg", e);
throw new RuntimeException("File is not a valid GIF or Jpeg");
}
@@ -110,7 +110,7 @@
}
}
} catch(Exception e) {
- LogKit.getLoggerFor("cocoon").debug("Not a valid Jpeg file!", e);
+ Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").debug("Not a
valid Jpeg file!", e);
throw new RuntimeException("Not a valid Jpeg file!");
}
@@ -118,7 +118,7 @@
return dim;
} finally {
- if(in != null) try { in.close(); } catch(Exception e)
{LogKit.getLoggerFor("cocoon").debug("Close stream", e);}
+ if(in != null) try { in.close(); } catch(Exception e)
{Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").debug("Close stream", e);}
}
}
@@ -147,7 +147,7 @@
return dim;
} finally {
- if(in != null) try { in.close(); } catch(Exception e)
{LogKit.getLoggerFor("cocoon").debug("Close stream", e);}
+ if(in != null) try { in.close(); } catch(Exception e)
{Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").debug("Close stream", e);}
}
}
@@ -171,7 +171,7 @@
return null;
} finally {
- if(in != null) try { in.close(); } catch(Exception e)
{LogKit.getLoggerFor("cocoon").debug("Close stream", e);}
+ if(in != null) try { in.close(); } catch(Exception e)
{Hierarchy.getDefaultHierarchy().getLoggerFor("cocoon").debug("Close stream", e);}
}
}
}
No revision
No revision
1.1.1.1.2.1 +1 -2 xml-cocoon2/src/org/apache/cocoon/util/NetUtils.java
Index: NetUtils.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/NetUtils.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- NetUtils.java 2001/05/09 20:49:33 1.1.1.1
+++ NetUtils.java 2001/07/12 15:03:11 1.1.1.1.2.1
@@ -12,14 +12,13 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
-import org.apache.log.LogKit;
/**
* A collection of <code>File</code>, <code>URL</code> and filename
* utility methods
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:33 $
+ * @version CVS $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/12 15:03:11 $
*/
public class NetUtils {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
