cziegeler 2003/11/05 13:01:06
Modified: . status.xml
src/java/org/apache/cocoon Cocoon.java
Log:
<action dev="CZ" type="fix" due-to="Andrea Poeschl" due-to-email="[EMAIL
PROTECTED]">
Fixing precompilation of the XSPs for the CLI.
</action>
Revision Changes Path
1.181 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- status.xml 1 Nov 2003 20:29:46 -0000 1.180
+++ status.xml 5 Nov 2003 21:01:06 -0000 1.181
@@ -192,6 +192,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="fix" due-to="Andrea Poeschl" due-to-email="[EMAIL
PROTECTED]">
+ Fixing precompilation of the XSPs for the CLI.
+ </action>
<action dev="BRD" type="update">
Woody: in the form definition, for widgets that have child widgets,
those
child widgets should now be embedded inside a wd:widgets element.
1.20 +7 -1 cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Cocoon.java 24 Oct 2003 13:00:16 -0000 1.19
+++ Cocoon.java 5 Nov 2003 21:01:06 -0000 1.20
@@ -743,6 +743,10 @@
throws Exception {
ProgramGenerator programGenerator = null;
Source source = null;
+ Object key = CocoonComponentManager.startProcessing(environment);
+ CocoonComponentManager.enterEnvironment(environment,
+ this.componentManager,
+ this);
try {
if (getLogger().isDebugEnabled()) {
getLogger().debug("XSP generation begin:" + fileName);
@@ -759,6 +763,8 @@
} finally {
this.sourceResolver.release(source);
this.componentManager.release(programGenerator);
+ CocoonComponentManager.leaveEnvironment();
+ CocoonComponentManager.endProcessing(environment, key);
}
}
