pier 2004/05/03 13:40:46
Modified: src/kernel/org/apache/cocoon/kernel/archival
HashLibrary.java Library.java
src/kernel/org/apache/cocoon/kernel/configuration
Configuration.java ConfigurationBuilder.java
ConfigurationSerializer.java
src/kernel/org/apache/cocoon/kernel/deployment Block.java
Deployer.java Instance.java Loader.java
src/kernel/org/apache/cocoon/kernel/identification
AbstractDescriptor.java BlockDescriptor.java
DescriptorBuilder.java InterfaceDescriptor.java
src/kernel/org/apache/cocoon/kernel/resolution
FileResource.java JarResource.java
LocalResolver.java Resource.java
src/kernel/org/apache/cocoon/kernel/startup
AbstractLogger.java Main.java Servlet.java
Log:
Performed Eclipse's re-organization of import statements.
Fixed bug in ConfigurationBuilder setting a default zero-length string
value to the first member of each Configuration element.
Updated startup servlet to include some slightly better debug information.
Revision Changes Path
1.4 +2 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/archival/HashLibrary.java
Index: HashLibrary.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/archival/HashLibrary.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HashLibrary.java 31 Mar 2004 13:01:38 -0000 1.3
+++ HashLibrary.java 3 May 2004 20:40:45 -0000 1.4
@@ -17,6 +17,7 @@
import java.util.HashSet;
import java.util.Iterator;
+
import org.apache.cocoon.kernel.identification.Descriptor;
import org.apache.cocoon.kernel.identification.Identifier;
import org.apache.cocoon.kernel.identification.ParsedIdentifier;
1.4 +2 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/archival/Library.java
Index: Library.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/archival/Library.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Library.java 31 Mar 2004 13:01:38 -0000 1.3
+++ Library.java 3 May 2004 20:40:45 -0000 1.4
@@ -16,6 +16,7 @@
package org.apache.cocoon.kernel.archival;
import java.util.Set;
+
import org.apache.cocoon.kernel.identification.Descriptor;
import org.apache.cocoon.kernel.identification.Identifier;
1.4 +3 -3
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/configuration/Configuration.java
Index: Configuration.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/configuration/Configuration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Configuration.java 31 Mar 2004 13:01:38 -0000 1.3
+++ Configuration.java 3 May 2004 20:40:45 -0000 1.4
@@ -17,8 +17,8 @@
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Collection;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.NoSuchElementException;
1.4 +6 -4
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/configuration/ConfigurationBuilder.java
Index: ConfigurationBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/configuration/ConfigurationBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConfigurationBuilder.java 31 Mar 2004 13:01:38 -0000 1.3
+++ ConfigurationBuilder.java 3 May 2004 20:40:45 -0000 1.4
@@ -20,15 +20,17 @@
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
+
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.helpers.DefaultHandler;
/**
* <p>The [EMAIL PROTECTED] ConfigurationBuilder} builds [EMAIL PROTECTED]
Configuration} instances
@@ -56,7 +58,7 @@
private List stack = new ArrayList();
/** <p>The buffer holding element values.</p> */
- private StringBuffer buffer = new StringBuffer();
+ private StringBuffer buffer = null;
/** <p>The current [EMAIL PROTECTED] Locator}.</p> */
private Locator locator = null;
1.5 +6 -4
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/configuration/ConfigurationSerializer.java
Index: ConfigurationSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/configuration/ConfigurationSerializer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConfigurationSerializer.java 31 Mar 2004 13:01:38 -0000 1.4
+++ ConfigurationSerializer.java 3 May 2004 20:40:45 -0000 1.5
@@ -18,14 +18,16 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.Iterator;
+
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
-import org.xml.sax.ContentHandler;
+
+import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
+import org.xml.sax.helpers.AttributesImpl;
/**
* <p>The [EMAIL PROTECTED] ConfigurationSerializer} serializes [EMAIL
PROTECTED] Configuration}
1.4 +2 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/deployment/Block.java
Index: Block.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/deployment/Block.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Block.java 31 Mar 2004 13:01:38 -0000 1.3
+++ Block.java 3 May 2004 20:40:45 -0000 1.4
@@ -16,6 +16,7 @@
package org.apache.cocoon.kernel.deployment;
import java.util.Iterator;
+
import org.apache.cocoon.kernel.identification.Descriptor;
/**
1.6 +2 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/deployment/Deployer.java
Index: Deployer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/deployment/Deployer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Deployer.java 31 Mar 2004 13:01:38 -0000 1.5
+++ Deployer.java 3 May 2004 20:40:45 -0000 1.6
@@ -16,6 +16,7 @@
package org.apache.cocoon.kernel.deployment;
import java.util.Iterator;
+
import org.apache.cocoon.kernel.identification.Identifier;
/**
1.4 +2 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/deployment/Instance.java
Index: Instance.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/deployment/Instance.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Instance.java 31 Mar 2004 13:01:38 -0000 1.3
+++ Instance.java 3 May 2004 20:40:45 -0000 1.4
@@ -16,6 +16,7 @@
package org.apache.cocoon.kernel.deployment;
import java.util.Iterator;
+
import org.apache.cocoon.kernel.configuration.Configurable;
import org.apache.cocoon.kernel.configuration.Parameters;
1.4 +2 -2
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/deployment/Loader.java
Index: Loader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/deployment/Loader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Loader.java 31 Mar 2004 13:01:38 -0000 1.3
+++ Loader.java 3 May 2004 20:40:45 -0000 1.4
@@ -15,9 +15,9 @@
*/
package org.apache.cocoon.kernel.deployment;
+import org.apache.cocoon.kernel.archival.Library;
import org.apache.cocoon.kernel.identification.Descriptor;
import org.apache.cocoon.kernel.identification.Identifier;
-import org.apache.cocoon.kernel.archival.Library;
/**
* <p>The [EMAIL PROTECTED] Loader} interface describes an object loading
[EMAIL PROTECTED] Block}
1.7 +2 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/AbstractDescriptor.java
Index: AbstractDescriptor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/AbstractDescriptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractDescriptor.java 16 Apr 2004 14:14:13 -0000 1.6
+++ AbstractDescriptor.java 3 May 2004 20:40:45 -0000 1.7
@@ -21,6 +21,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import org.apache.cocoon.kernel.configuration.Configuration;
import org.apache.cocoon.kernel.configuration.ConfigurationException;
1.5 +2 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/BlockDescriptor.java
Index: BlockDescriptor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/BlockDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BlockDescriptor.java 31 Mar 2004 13:01:39 -0000 1.4
+++ BlockDescriptor.java 3 May 2004 20:40:45 -0000 1.5
@@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+
import org.apache.cocoon.kernel.configuration.Configuration;
import org.apache.cocoon.kernel.configuration.ConfigurationException;
1.5 +2 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/DescriptorBuilder.java
Index: DescriptorBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/DescriptorBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DescriptorBuilder.java 1 Apr 2004 14:58:58 -0000 1.4
+++ DescriptorBuilder.java 3 May 2004 20:40:45 -0000 1.5
@@ -17,6 +17,7 @@
import java.io.IOException;
import java.net.URL;
+
import org.apache.cocoon.kernel.configuration.Configuration;
import org.apache.cocoon.kernel.configuration.ConfigurationBuilder;
import org.apache.cocoon.kernel.configuration.ConfigurationException;
1.5 +3 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/InterfaceDescriptor.java
Index: InterfaceDescriptor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/InterfaceDescriptor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InterfaceDescriptor.java 31 Mar 2004 13:01:39 -0000 1.4
+++ InterfaceDescriptor.java 3 May 2004 20:40:45 -0000 1.5
@@ -15,6 +15,8 @@
*/
package org.apache.cocoon.kernel.identification;
+import java.util.Map;
+
import org.apache.cocoon.kernel.configuration.Configuration;
import org.apache.cocoon.kernel.configuration.ConfigurationException;
1.4 +2 -2
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/resolution/FileResource.java
Index: FileResource.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/resolution/FileResource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileResource.java 31 Mar 2004 13:01:39 -0000 1.3
+++ FileResource.java 3 May 2004 20:40:45 -0000 1.4
@@ -17,8 +17,8 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
1.4 +3 -3
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/resolution/JarResource.java
Index: JarResource.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/resolution/JarResource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JarResource.java 31 Mar 2004 13:01:39 -0000 1.3
+++ JarResource.java 3 May 2004 20:40:45 -0000 1.4
@@ -15,14 +15,14 @@
*/
package org.apache.cocoon.kernel.resolution;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.jar.JarFile;
import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
/**
* <p>A [EMAIL PROTECTED] JarResource} is the implementation of the [EMAIL
PROTECTED] Resource}
1.4 +3 -3
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/resolution/LocalResolver.java
Index: LocalResolver.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/resolution/LocalResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalResolver.java 31 Mar 2004 13:01:39 -0000 1.3
+++ LocalResolver.java 3 May 2004 20:40:45 -0000 1.4
@@ -17,15 +17,15 @@
import java.io.File;
import java.io.IOException;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.jar.JarFile;
import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
/**
* <p>A [EMAIL PROTECTED] LocalResolver} is an implementation of the [EMAIL
PROTECTED] Resolver}
1.4 +2 -2
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/resolution/Resource.java
Index: Resource.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/resolution/Resource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Resource.java 31 Mar 2004 13:01:39 -0000 1.3
+++ Resource.java 3 May 2004 20:40:45 -0000 1.4
@@ -15,8 +15,8 @@
*/
package org.apache.cocoon.kernel.resolution;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
1.5 +2 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/startup/AbstractLogger.java
Index: AbstractLogger.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/startup/AbstractLogger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractLogger.java 31 Mar 2004 13:01:39 -0000 1.4
+++ AbstractLogger.java 3 May 2004 20:40:46 -0000 1.5
@@ -17,6 +17,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+
import org.xml.sax.SAXException;
/**
1.4 +3 -3
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/startup/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/startup/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Main.java 31 Mar 2004 13:01:39 -0000 1.3
+++ Main.java 3 May 2004 20:40:46 -0000 1.4
@@ -15,9 +15,9 @@
*/
package org.apache.cocoon.kernel.startup;
-import org.apache.cocoon.kernel.configuration.ConfigurationBuilder;
-import org.apache.cocoon.kernel.KernelDeployer;
import org.apache.cocoon.kernel.Installer;
+import org.apache.cocoon.kernel.KernelDeployer;
+import org.apache.cocoon.kernel.configuration.ConfigurationBuilder;
/**
*
1.2 +31 -7
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/startup/Servlet.java
Index: Servlet.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/startup/Servlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Servlet.java 1 Apr 2004 14:58:58 -0000 1.1
+++ Servlet.java 3 May 2004 20:40:46 -0000 1.2
@@ -15,12 +15,16 @@
*/
package org.apache.cocoon.kernel.startup;
+import java.net.URL;
+
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
-import org.apache.cocoon.kernel.KernelDeployer;
+import org.apache.cocoon.kernel.CoreWirings;
import org.apache.cocoon.kernel.Installer;
+import org.apache.cocoon.kernel.KernelDeployer;
+import org.apache.cocoon.kernel.composition.Wirings;
import org.apache.cocoon.kernel.configuration.Configuration;
import org.apache.cocoon.kernel.configuration.ConfigurationBuilder;
@@ -56,7 +60,7 @@
}
/* Find our configurations */
- String deplconf = this.getInitParameter("deployer-config");
+ String deplconf = this.getInitParameter("deployer-config");
String instconf = this.getInitParameter("installer-config");
if (deplconf == null) {
String message = "Parameter \"deployer-config\" not specified";
@@ -67,27 +71,47 @@
logger.fatal(message);
throw new ServletException(message);
}
-
+
/* Let's start up */
this.logger.info("Kernel startup");
try {
+ URL deplurl = ctxt.getResource(deplconf);
+ if (deplurl == null) {
+ String message = "Unable to find deployer
configurations \""
+ + deplconf + "\"";
+ logger.fatal(message);
+ throw new ServletException(message);
+ }
+
+ URL insturl = ctxt.getResource(instconf);
+ if (insturl == null) {
+ String message = "Unable to find installer
configuration \""
+ + deplconf + "\"";
+ logger.fatal(message);
+ throw new ServletException(message);
+ }
+
Configuration conf = null;
/* Now let's create our core deployer */
KernelDeployer deployer = new KernelDeployer();
deployer.logger(logger);
- conf = ConfigurationBuilder.parse(ctxt.getResource(deplconf));
+ conf = ConfigurationBuilder.parse(deplurl);
deployer.configure(conf);
/* Instantiate an installer and process deployment */
Installer installer = new Installer(deployer);
- conf = ConfigurationBuilder.parse(ctxt.getResource(instconf));
+ conf = ConfigurationBuilder.parse(insturl);
installer.process(conf);
+ /* Store the current wirings as an application attribute */
+ String attribute = Wirings.class.getName();
+ ctxt.setAttribute(attribute, new CoreWirings(deployer));
+
} catch (Throwable throwable) {
String message = "An error occurred initializing the kernel";
logger.fatal(message, throwable);
- //throw new ServletException(message, throwable);
+ throw new ServletException(message, throwable);
}
}
