bloritsch 01/02/13 21:08:43
Modified: . Tag: xml-cocoon2 build.xml
src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
Log:
Fixed NullPointerExceptions and made Lifecycle work in the proper order.
Revision Changes Path
No revision
No revision
1.6.2.54 +1 -1 xml-cocoon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/build.xml,v
retrieving revision 1.6.2.53
retrieving revision 1.6.2.54
diff -u -r1.6.2.53 -r1.6.2.54
--- build.xml 2001/02/12 05:56:49 1.6.2.53
+++ build.xml 2001/02/14 05:08:40 1.6.2.54
@@ -114,7 +114,7 @@
<echo message="------------------- ${fullname} ${version} [${year}]
----------------"/>
<property name="debug" value="on"/>
- <property name="optimize" value="on"/>
+ <property name="optimize" value="off"/>
<property name="deprecation" value="off"/>
<property name="build.compiler" value="classic"/>
<property name="target.vm" value="1.2"/>
No revision
No revision
1.4.2.51 +6 -3 xml-cocoon/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.4.2.50
retrieving revision 1.4.2.51
diff -u -r1.4.2.50 -r1.4.2.51
--- Cocoon.java 2001/02/14 04:10:31 1.4.2.50
+++ Cocoon.java 2001/02/14 05:08:42 1.4.2.51
@@ -49,7 +49,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4.2.50 $ $Date: 2001/02/14 04:10:31 $
+ * @version CVS $Revision: 1.4.2.51 $ $Date: 2001/02/14 05:08:42 $
*/
public class Cocoon extends AbstractLoggable
implements Component, Configurable, ComponentManager, Modifiable,
Processor, Constants, Contextualizable {
@@ -82,7 +82,7 @@
private File workDir;
/** The component manager. */
- private DefaultComponentManager componentManager = new
DefaultComponentManager();
+ private DefaultComponentManager componentManager;
/**
* Create a new <code>Cocoon</code> instance.
@@ -95,7 +95,6 @@
public void contextualize(Context context) {
if (this.context == null) {
this.context = context;
- this.componentManager.contextualize(this.context);
this.classpath = (String)
context.get(Constants.CONTEXT_CLASSPATH);
this.workDir = (File) context.get(Constants.CONTEXT_WORK_DIR);
@@ -104,6 +103,10 @@
}
public void init() throws Exception {
+ this.componentManager = new DefaultComponentManager();
+ this.componentManager.contextualize(this.context);
+ this.componentManager.setLogger(getLogger());
+
getLogger().debug("New Cocoon object.");
// Setup the default parser, for parsing configuration.
No revision
No revision
1.1.4.55 +2 -2
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.54
retrieving revision 1.1.4.55
diff -u -r1.1.4.54 -r1.1.4.55
--- CocoonServlet.java 2001/02/14 04:53:26 1.1.4.54
+++ CocoonServlet.java 2001/02/14 05:08:42 1.1.4.55
@@ -59,7 +59,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.54 $ $Date: 2001/02/14 04:53:26 $
+ * @version CVS $Revision: 1.1.4.55 $ $Date: 2001/02/14 05:08:42 $
*/
public class CocoonServlet extends HttpServlet {
@@ -402,8 +402,8 @@
URL configFile = (URL)
this.appContext.get(Constants.CONTEXT_CONFIG_URL);
log.info("Reloading from: " + configFile.toExternalForm());
Cocoon c = (Cocoon)
ClassUtils.newInstance("org.apache.cocoon.Cocoon");
- c.setLogger(this.log);
c.contextualize(this.appContext);
+ c.setLogger(this.log);
c.init();
this.creationTime = new Date().getTime();
this.cocoon = c;
