stefano 00/09/22 15:18:00
Modified: src/org/apache/cocoon Tag: xml-cocoon2 Main.java
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
Log:
fix latest compilation problems
Revision Changes Path
No revision
No revision
1.1.4.7 +2 -2 xml-cocoon/src/org/apache/cocoon/Attic/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Main.java,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -r1.1.4.6 -r1.1.4.7
--- Main.java 2000/09/22 12:21:08 1.1.4.6
+++ Main.java 2000/09/22 22:17:58 1.1.4.7
@@ -32,7 +32,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.4.6 $ $Date: 2000/09/22 12:21:08 $
+ * @version CVS $Revision: 1.1.4.7 $ $Date: 2000/09/22 22:17:58 $
*/
public class Main {
@@ -113,7 +113,7 @@
File work = getDir(workDir, "working");
File conf = getConfigurationFile(confFile);
File root = conf.getParentFile();
- Main main = new Main(new Cocoon(conf, null, work), conf, dest);
+ Main main = new Main(new Cocoon(conf, null, work.toString()),
conf, dest);
System.out.println("[main] Starting...");
main.process(targets);
System.out.println("[main] Done.");
No revision
No revision
1.1.4.22 +3 -32
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.21
retrieving revision 1.1.4.22
diff -u -r1.1.4.21 -r1.1.4.22
--- CocoonServlet.java 2000/09/22 20:27:36 1.1.4.21
+++ CocoonServlet.java 2000/09/22 22:17:59 1.1.4.22
@@ -40,7 +40,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Nicola Ken Barozzi</a> Aisa
- * @version CVS $Revision: 1.1.4.21 $ $Date: 2000/09/22 20:27:36 $
+ * @version CVS $Revision: 1.1.4.22 $ $Date: 2000/09/22 22:17:59 $
*/
public class CocoonServlet extends HttpServlet {
@@ -83,20 +83,7 @@
String configFileName = conf.getInitParameter("configurations");
if (configFileName == null) {
- ServletException fatalException =
- new ServletException("Servlet initialization argument "
- + "'configurations' not specified");
- Notification n = new Notification(this, fatalException);
- n.setType("cocoon-init-error");
- n.setTitle("Cocoon error upon init.");
- // FIXME (SM) We should use Servlet log channels for this
- // since otherwise it might get lost or end up being in bad
- // places if we are run under server frameworks such as avalon
- // since our servlet container might hook to Avalon own loggin
- // methods.
- Notifier.notify(n, System.out);
-
- throw fatalException;
+ throw new ServletException("Servlet initialization argument
'configurations' not specified");
} else {
this.context.log("Using configuration file: " + configFileName);
}
@@ -104,19 +91,7 @@
try {
this.configFile = new
File(this.context.getResource(configFileName).getFile());
} catch (java.net.MalformedURLException mue) {
- ServletException fatalException =
- new ServletException("Servlet initialization argument "
- + "'configurations' not found at "
- + configFileName);
- Notification n = new Notification(this, fatalException);
- n.setType("cocoon-init-error");
- n.setTitle("Cocoon error upon init.");
- n.addExtraDescription("requested-configuration-file",
- this.configFile.toString());
- // FIXME (SM) see above
- Notifier.notify(n, System.out);
-
- throw fatalException;
+ throw new ServletException("Servlet initialization argument
'configurations' not found at " + configFileName);
}
this.cocoon = this.create();
@@ -285,15 +260,11 @@
try {
this.context.log("Reloading from: " + this.configFile);
-
Cocoon c = new Cocoon(this.configFile, this.classpath,
this.workDir);
-
this.creationTime = System.currentTimeMillis();
-
return c;
} catch (Exception e) {
this.context.log("Exception reloading: " + e.getMessage());
-
this.exception = e;
}
