dims 02/02/08 13:36:54
Modified: src/java/org/apache/cocoon/components/language/generator
ProgramGeneratorImpl.java
src/java/org/apache/cocoon/components/language/programming
CompiledProgrammingLanguage.java
Log:
- Revert back to old behavior for reload=true, preload=true.
- Now for Precompile/Pregeneration you need todo 2 things
1. Use "build.precompile=true" in when running the build.
2. Set auto-reload=false in cocoon.xconf for program-generator
Revision Changes Path
1.9 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ProgramGeneratorImpl.java 8 Feb 2002 19:07:05 -0000 1.8
+++ ProgramGeneratorImpl.java 8 Feb 2002 21:36:53 -0000 1.9
@@ -93,7 +93,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Vadim Gritsenko</a>
- * @version CVS $Id: ProgramGeneratorImpl.java,v 1.8 2002/02/08 19:07:05 dims Exp $
+ * @version CVS $Id: ProgramGeneratorImpl.java,v 1.9 2002/02/08 21:36:53 dims Exp $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Parameterizable,
@@ -269,7 +269,7 @@
* FIXME: It's the program (not the instance) that must
* be queried for changes!!!
*/
- if (programInstance != null && !this.preload && this.autoReload) {
+ if (programInstance != null && this.autoReload) {
// Autoreloading: Unload program if its source is modified
long lastModified = source.getLastModified();
if (lastModified == 0 ||
programInstance.modifiedSince(lastModified)) {
1.7 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java
Index: CompiledProgrammingLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/CompiledProgrammingLanguage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CompiledProgrammingLanguage.java 8 Feb 2002 19:07:05 -0000 1.6
+++ CompiledProgrammingLanguage.java 8 Feb 2002 21:36:54 -0000 1.7
@@ -73,7 +73,7 @@
* A compiled programming language. This class extends
<code>AbstractProgrammingLanguage</code> adding support for compilation
* and object program files
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Id: CompiledProgrammingLanguage.java,v 1.6 2002/02/08 19:07:05
dims Exp $
+ * @version CVS $Id: CompiledProgrammingLanguage.java,v 1.7 2002/02/08 21:36:54
dims Exp $
*/
public abstract class CompiledProgrammingLanguage extends
AbstractProgrammingLanguage implements Contextualizable {
@@ -140,7 +140,7 @@
File baseDir = new File(baseDirectory, dir);
File[] files = baseDir.listFiles();
- for (int i = 0; i < files.length; i++) {
+ for (int i = 0;(files != null) && (i < files.length); i++) {
if (files[i].getName().startsWith(file)) {
files[i].delete();
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
