bloritsch 01/01/30 21:21:50
Modified: src/org/apache/cocoon/components/classloader Tag:
xml-cocoon2 ClassLoaderManagerImpl.java
src/org/apache/cocoon/components/language/programming/java
Tag: xml-cocoon2 JavaLanguage.java Javac.java
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
Log:
Fixed class-loading errors and NullPointerException when using
Classic Compiler in JavaC.java.
Revision Changes Path
No revision
No revision
1.1.2.7 +2 -6
xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManagerImpl.java
Index: ClassLoaderManagerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/classloader/Attic/ClassLoaderManagerImpl.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ClassLoaderManagerImpl.java 2001/01/30 17:25:18 1.1.2.6
+++ ClassLoaderManagerImpl.java 2001/01/31 05:21:39 1.1.2.7
@@ -19,7 +19,7 @@
* A singleton-like implementation of <code>ClassLoaderManager</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/01/30 17:25:18 $
+ * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/01/31 05:21:39 $
*/
public class ClassLoaderManagerImpl implements ClassLoaderManager,
ThreadSafe {
/**
@@ -63,10 +63,6 @@
*
*/
public synchronized void reinstantiate() {
- try {
- instance = new RepositoryClassLoader(new URL[]
{ClassUtils.getCocoonURL()}, ClassUtils.getClassLoader());
- } catch (MalformedURLException mue) {
- instance = new RepositoryClassLoader();
- }
+ instance = new RepositoryClassLoader();
}
}
No revision
No revision
1.1.2.19 +10 -5
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/JavaLanguage.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- JavaLanguage.java 2001/01/29 19:12:08 1.1.2.18
+++ JavaLanguage.java 2001/01/31 05:21:44 1.1.2.19
@@ -32,7 +32,7 @@
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/01/29 19:12:08 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/01/31 05:21:44 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe {
@@ -173,15 +173,20 @@
}
if (!compiler.compile()) {
- StringBuffer message = new StringBuffer("Error compiling " +
filename + ":\n");
+ StringBuffer message = new StringBuffer("Error compiling ");
+ message.append(filename);
+ message.append(":\n");
List errors = compiler.getErrors();
int count = errors.size();
for (int i = 0; i < count; i++) {
CompilerError error = (CompilerError) errors.get(i);
- message.append("Line " + error.getStartLine()
- + ", column " + error.getStartColumn()
- + ": " + error.getMessage());
+ message.append("Line ");
+ message.append(error.getStartLine());
+ message.append(", column ");
+ message.append(error.getStartColumn());
+ message.append(": ");
+ message.append(error.getMessage());
}
throw new LanguageException(message.toString());
1.1.2.10 +4 -3
xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Javac.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Javac.java 2000/12/18 21:17:29 1.1.2.9
+++ Javac.java 2001/01/31 05:21:45 1.1.2.10
@@ -12,12 +12,13 @@
import java.util.*;
import org.apache.cocoon.components.language.programming.*;
import org.apache.cocoon.util.ClassUtils;
+import org.apache.log.LogKit;
/**
* This class wraps the Sun's Javac Compiler.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.9 $ $Date: 2000/12/18 21:17:29 $
+ * @version $Revision: 1.1.2.10 $ $Date: 2001/01/31 05:21:45 $
* @since 2.0
*/
@@ -35,12 +36,12 @@
ClassUtils.loadClass(MODERN_CLASS);
modern = true;
} catch (ClassNotFoundException e) {
- log.warn("Javac connector could not find modern compiler -- falling
back to classic.");
+ LogKit.getLoggerFor("cocoon").warn("Javac connector could not find
modern compiler -- falling back to classic.");
try {
ClassUtils.loadClass(CLASSIC_CLASS);
modern = false;
} catch (Exception ex) {
- log.error("No compiler found in your classpath. Make sure you
added 'tools.jar'", ex);
+ LogKit.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.1.4.47 +1 -16
xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
retrieving revision 1.1.4.46
retrieving revision 1.1.4.47
diff -u -r1.1.4.46 -r1.1.4.47
--- CocoonServlet.java 2001/01/30 17:25:35 1.1.4.46
+++ CocoonServlet.java 2001/01/31 05:21:48 1.1.4.47
@@ -53,7 +53,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.4.46 $ $Date: 2001/01/30 17:25:35 $
+ * @version CVS $Revision: 1.1.4.47 $ $Date: 2001/01/31 05:21:48 $
*/
public class CocoonServlet extends HttpServlet {
@@ -106,8 +106,6 @@
ClassUtils.setClassLoader(this.getClass().getClassLoader());
- this.setupCocoonJar(conf.getInitParameter("cocoon-jar"),
this.context);
-
this.createCocoon();
}
@@ -188,19 +186,6 @@
this.classpath = buildClassPath.toString();
}
-
- /**
- * Set up the Cocoon Jar path. That way it can be loaded by the Cocoon
- * classloader instead of the servlet classloader. This is to protect
- * Cocoon from broken classloaders.
- */
- private void setupCocoonJar(String cocoonJar, ServletContext context) {
- try {
- ClassUtils.setCocoonURL(context.getResource(cocoonJar));
- } catch (MalformedURLException mue) {
- log.debug("Could not set the Cocoon URL for the jar file.", mue);
- }
- }
/**
* Set up the log level and path. The default log level is
