bloritsch 01/05/31 10:39:13
Modified: src/org/apache/cocoon Cocoon.java Main.java
Notification.java Notifier.java
src/org/apache/cocoon/acting AbstractValidatorAction.java
ResourceExistsAction.java
src/org/apache/cocoon/caching PipelineCacheKey.java
src/org/apache/cocoon/components/classloader
ClassLoaderManagerImpl.java
src/org/apache/cocoon/components/language/generator
ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup
AbstractMarkupLanguage.java Logicsheet.java
LogicsheetCodeGenerator.java
src/org/apache/cocoon/components/language/markup/xsp
XSPCookieHelper.java XSPRequestHelper.java
XSPUtil.java
src/org/apache/cocoon/components/language/programming/java
JavaLanguage.java Javac.java
src/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
AbstractStreamPipeline.java
CachingEventPipeline.java
src/org/apache/cocoon/components/saxconnector
CIncludeSAXConnector.java XIncludeSAXConnector.java
src/org/apache/cocoon/components/store MRUMemoryStore.java
src/org/apache/cocoon/generation DirectoryGenerator.java
FileGenerator.java JspGenerator.java
PhpGenerator.java ScriptGenerator.java
StatusGenerator.java VelocityGenerator.java
src/org/apache/cocoon/matching RequestParamMatcher.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/reading ResourceReader.java
src/org/apache/cocoon/serialization
AbstractTextSerializer.java
src/org/apache/cocoon/servlet CocoonServlet.java
src/org/apache/cocoon/sitemap AbstractSitemap.java
ContentAggregator.java Handler.java Manager.java
src/org/apache/cocoon/transformation
AbstractDOMTransformer.java I18nTransformer.java
I18nTransformer2.java TraxTransformer.java
XIncludeTransformer.java
src/org/apache/cocoon/util ClassUtils.java
src/org/apache/cocoon/xml IncludeXMLConsumer.java
Log:
Remove unnecessary casts
Remove extraneous "synchronized" method modifiers
Remove unnecessary "instanceof" evaluations
Convert "var = var + val" to "var += val"
Revision Changes Path
1.8 +7 -8 xml-cocoon2/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Cocoon.java 2001/05/31 16:12:33 1.7
+++ Cocoon.java 2001/05/31 17:37:30 1.8
@@ -53,7 +53,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.7 $ $Date: 2001/05/31 16:12:33 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/05/31 17:37:30 $
*/
public class Cocoon extends AbstractLoggable implements ThreadSafe, Component,
Initializable, Disposable, Modifiable, Processor, Contextualizable {
/** The application context */
@@ -146,7 +146,6 @@
try {
p = (Parser)this.componentManager.lookup(Roles.PARSER);
SAXConfigurationHandler b = new SAXConfigurationHandler();
- ClassLoader cl = (ClassLoader)
this.context.get(Constants.CONTEXT_CLASS_LOADER);
InputStream inputStream =
ClassUtils.getResource("org/apache/cocoon/cocoon.roles").openStream();
InputSource is = new InputSource(inputStream);
is.setSystemId(this.configurationFile.toExternalForm());
@@ -157,7 +156,7 @@
getLogger().error("Could not configure Cocoon environment", e);
throw new ConfigurationException("Error trying to load configurations",
e);
} finally {
- if (p != null) this.componentManager.release((Component) p);
+ if (p != null) this.componentManager.release(p);
}
DefaultRoleManager drm = new DefaultRoleManager();
@@ -177,7 +176,7 @@
getLogger().error("Could not configure Cocoon environment", e);
throw new ConfigurationException("Error trying to load
configurations",e);
} finally {
- if (p != null) this.componentManager.release((Component) p);
+ if (p != null) this.componentManager.release(p);
}
Configuration conf = this.configuration;
@@ -208,7 +207,7 @@
getLogger().error("Could not configure Cocoon environment", e);
throw new ConfigurationException("Error trying to load
configurations", e);
} finally {
- if (p != null) this.componentManager.release((Component) p);
+ if (p != null) this.componentManager.release(p);
}
DefaultRoleManager urm = new DefaultRoleManager(drm);
@@ -335,7 +334,7 @@
throw e;
} finally {
environment.setURLResolver(null);
- if (programGenerator != null) this.componentManager.release((Component)
programGenerator);
+ if (programGenerator != null)
this.componentManager.release(programGenerator);
if (urlFactory != null) this.componentManager.release((Component)
urlFactory);
}
}
@@ -359,13 +358,13 @@
CompiledComponent xsp = (CompiledComponent)
programGenerator.load(fileName, markupLanguage, programmingLanguage, environment);
getLogger().debug("XSP generation complete:" + xsp);
- this.componentManager.release((Component) programGenerator);
+ this.componentManager.release(programGenerator);
} catch (Exception e) {
getLogger().error("Main: Error compiling XSP", e);
throw e;
} finally {
environment.setURLResolver(null);
- if (programGenerator != null) this.componentManager.release((Component)
programGenerator);
+ if (programGenerator != null)
this.componentManager.release(programGenerator);
if (urlFactory != null) this.componentManager.release((Component)
urlFactory);
}
}
1.4 +1 -2 xml-cocoon2/src/org/apache/cocoon/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Main.java 2001/05/25 22:00:47 1.3
+++ Main.java 2001/05/31 17:37:31 1.4
@@ -47,7 +47,7 @@
* Command line entry point.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/25 22:00:47 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:37:31 $
*/
public class Main {
@@ -465,7 +465,6 @@
String getPage(String uri, Map links, OutputStream stream) throws Exception {
HashMap parameters = new HashMap();
- String deparameterizedURI = NetUtils.deparameterize(uri, parameters);
FileSavingEnvironment env = new FileSavingEnvironment(uri, context,
attributes, parameters, links, stream);
cocoon.process(env);
return env.getContentType();
1.2 +3 -3 xml-cocoon2/src/org/apache/cocoon/Notification.java
Index: Notification.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Notification.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Notification.java 2001/05/09 20:49:27 1.1
+++ Notification.java 2001/05/31 17:37:32 1.2
@@ -116,9 +116,9 @@
*
*@param t Description of Parameter
*/
- public Notification(Object sender, SAXException t) {
- this(sender, (Throwable) t);
- addExtraDescription("SAX-processing-exception", ((SAXException)
t).getException().toString());
+ public Notification(Object sender, SAXException se) {
+ this(sender, (Throwable) se);
+ addExtraDescription("SAX-processing-exception",
se.getException().toString());
}
/**
1.2 +1 -3 xml-cocoon2/src/org/apache/cocoon/Notifier.java
Index: Notifier.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Notifier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Notifier.java 2001/05/09 20:49:27 1.1
+++ Notifier.java 2001/05/31 17:37:33 1.2
@@ -24,7 +24,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:27 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:37:33 $
*/
public class Notifier {
@@ -82,8 +82,6 @@
final String PREFIX = Constants.ERROR_NAMESPACE_PREFIX;
final String URI = Constants.ERROR_NAMESPACE_URI;
-
- String buf;
// Start the document
ch.startDocument();
1.4 +13 -3
xml-cocoon2/src/org/apache/cocoon/acting/AbstractValidatorAction.java
Index: AbstractValidatorAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/AbstractValidatorAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractValidatorAction.java 2001/05/28 21:25:22 1.3
+++ AbstractValidatorAction.java 2001/05/31 17:37:38 1.4
@@ -1,4 +1,4 @@
-// $Id: AbstractValidatorAction.java,v 1.3 2001/05/28 21:25:22 balld Exp $
+// $Id: AbstractValidatorAction.java,v 1.4 2001/05/31 17:37:38 bloritsch Exp $
package org.apache.cocoon.acting;
import org.apache.avalon.framework.configuration.Configurable;
@@ -98,7 +98,7 @@
* </tr>
* </table>
* @author Martin Man <[EMAIL PROTECTED]>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/28 21:25:22 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:37:38 $
*/
public abstract class AbstractValidatorAction
extends AbstractComplementaryConfigurableAction
@@ -489,6 +489,8 @@
* returns it, otherwise it returns the parsed Double value.
* If the parameter is nullable and really is null and no default value
* was specified, return -1 so that the validation succeeds.
+ *
+ * FIXME: is the name parameter needed? It is not used
*/
private Double getDoubleValue (String name,
Configuration conf, Object param, boolean is_string) {
@@ -537,6 +539,9 @@
* returns it, otherwise it returns the parsed Double value.
* If the parameter is nullable and really is null and no default value
* was specified, return -1 so that the validation succeeds.
+ *
+ * FIXME:
+ * Is the name parameter needed? it is not used.
*/
private Long getLongValue (String name,
Configuration conf, Object param, boolean is_string) {
@@ -585,6 +590,11 @@
* returns it, otherwise it returns the parsed Double value.
* If the parameter is nullable and really is null and no default value
* was specified, return "" so that the validation succeeds.
+ *
+ * FIXME:
+ * Is the "is_string" parameter really needed?
+ * Is the "name" parameter really needed?
+ * Neither are used
*/
private String getStringValue (String name,
Configuration conf, Object param, boolean is_string) {
@@ -634,5 +644,5 @@
}
}
-// $Id: AbstractValidatorAction.java,v 1.3 2001/05/28 21:25:22 balld Exp $
+// $Id: AbstractValidatorAction.java,v 1.4 2001/05/31 17:37:38 bloritsch Exp $
// vim: set et ts=4 sw=4:
1.4 +2 -2
xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java
Index: ResourceExistsAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/acting/ResourceExistsAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceExistsAction.java 2001/05/23 14:55:35 1.3
+++ ResourceExistsAction.java 2001/05/31 17:37:39 1.4
@@ -34,7 +34,7 @@
* null otherwise. It has only been tested with context urls.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 14:55:35 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:37:39 $
*/
public class ResourceExistsAction extends ComposerAction {
@@ -42,7 +42,7 @@
HashMap results = new HashMap();
String urlstring = parameters.getParameter("url",null);
try {
- InputStream input = resolver.resolve(urlstring).getInputStream();
+ resolver.resolve(urlstring).getInputStream();
} catch (Exception e) {
getLogger().debug("ResourceExistsAction: exception: ",e);
return null;
1.2 +3 -3 xml-cocoon2/src/org/apache/cocoon/caching/PipelineCacheKey.java
Index: PipelineCacheKey.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/caching/PipelineCacheKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PipelineCacheKey.java 2001/05/09 20:50:03 1.1
+++ PipelineCacheKey.java 2001/05/31 17:37:43 1.2
@@ -15,7 +15,7 @@
* or more <code>ComponentCacheKey</code> objects.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:03 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:37:43 $
*/
public final class PipelineCacheKey {
@@ -27,7 +27,7 @@
this.list = new ArrayList();
}
this.list.add(key);
- toStringValue = toStringValue + key.toString();
+ toStringValue += key.toString();
}
public void addKey(PipelineCacheKey key) {
@@ -35,7 +35,7 @@
this.list = new ArrayList();
}
this.list.add(key);
- toStringValue = toStringValue + key.toString();
+ toStringValue += key.toString();
}
public String toString() {
1.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java
Index: ClassLoaderManagerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassLoaderManagerImpl.java 2001/05/09 20:49:49 1.1
+++ ClassLoaderManagerImpl.java 2001/05/31 17:37:47 1.2
@@ -18,7 +18,7 @@
* A singleton-like implementation of <code>ClassLoaderManager</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:49 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:37:47 $
*/
public class ClassLoaderManagerImpl implements ClassLoaderManager, ThreadSafe {
/**
@@ -61,7 +61,7 @@
* Reinstantiate the proxied class loader to allow for class reloading
*
*/
- public synchronized void reinstantiate() {
+ public void reinstantiate() {
instance = new RepositoryClassLoader();
}
}
1.5 +6 -6
xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProgramGeneratorImpl.java 2001/05/31 13:05:17 1.4
+++ ProgramGeneratorImpl.java 2001/05/31 17:37:50 1.5
@@ -48,7 +48,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 13:05:17 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/05/31 17:37:50 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
@@ -160,8 +160,8 @@
getLogger().debug("Language Exception", le);
throw new ProcessingException("Language Exception", le);
} finally {
- this.markupSelector.release((Component) markupLanguage);
- this.languageSelector.release((Component) programmingLanguage);
+ this.markupSelector.release(markupLanguage);
+ this.languageSelector.release(programmingLanguage);
}
try {
@@ -208,8 +208,8 @@
getLogger().debug("Language Exception", le);
throw new ProcessingException("Language Exception", le);
} finally {
- this.markupSelector.release((Component) markupLanguage);
- this.languageSelector.release((Component) programmingLanguage);
+ this.markupSelector.release(markupLanguage);
+ this.languageSelector.release(programmingLanguage);
}
}
// Instantiate
@@ -263,7 +263,7 @@
}
public void release(CompiledComponent component) {
- this.cache.release((Component) component);
+ this.cache.release(component);
}
/**
1.4 +1 -2
xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractMarkupLanguage.java 2001/05/31 13:18:45 1.3
+++ AbstractMarkupLanguage.java 2001/05/31 17:37:52 1.4
@@ -50,7 +50,7 @@
* logicsheets as the only means of code generation. Code generation should be
decoupled from this context!!!
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/31 13:18:45 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:37:52 $
*/
public abstract class AbstractMarkupLanguage extends AbstractLoggable implements
MarkupLanguage, Composable, Configurable {
/** The supported language table */
@@ -312,7 +312,6 @@
*/
protected void addLogicsheetToList(LanguageDescriptor language, String
logicsheetLocation, SourceResolver resolver)
throws MalformedURLException, IOException, SAXException {
- String systemId = null;
InputSource inputSource = null;
URL url = null;
1.3 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/language/markup/Logicsheet.java
Index: Logicsheet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/Logicsheet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Logicsheet.java 2001/05/22 14:32:35 1.2
+++ Logicsheet.java 2001/05/31 17:37:53 1.3
@@ -46,7 +46,7 @@
* transformed into an equivalent XSLT stylesheet anyway... This class should
probably be based on an interface...
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/22 14:32:35 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/31 17:37:53 $
*/
public class Logicsheet extends AbstractLoggable {
/** The trax TransformerFactory */
@@ -72,7 +72,7 @@
/**
* Helper for TransformerFactory.
*/
- private synchronized SAXTransformerFactory getTransformerFactory()
+ private SAXTransformerFactory getTransformerFactory()
{
if(tfactory == null) {
tfactory = (SAXTransformerFactory) TransformerFactory.newInstance();
1.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java
Index: LogicsheetCodeGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogicsheetCodeGenerator.java 2001/05/09 20:49:50 1.1
+++ LogicsheetCodeGenerator.java 2001/05/31 17:37:54 1.2
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:50 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:37:54 $
*/
public class LogicsheetCodeGenerator extends AbstractLoggable implements
MarkupCodeGenerator {
@@ -79,7 +79,7 @@
/**
* Helper for TransformerFactory.
*/
- private synchronized SAXTransformerFactory getTransformerFactory()
+ private SAXTransformerFactory getTransformerFactory()
{
if(tfactory == null) {
tfactory = (SAXTransformerFactory) TransformerFactory.newInstance();
1.2 +0 -2
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java
Index: XSPCookieHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSPCookieHelper.java 2001/05/09 20:49:53 1.1
+++ XSPCookieHelper.java 2001/05/31 17:37:57 1.2
@@ -330,8 +330,6 @@
Hashtable nodeTable = new Hashtable();
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
-
if (cookieName != null)
retrieveByName = true;
else
1.5 +1 -5
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java
Index: XSPRequestHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPRequestHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSPRequestHelper.java 2001/05/25 18:49:52 1.4
+++ XSPRequestHelper.java 2001/05/31 17:37:58 1.5
@@ -22,7 +22,7 @@
* The <code>Request</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/05/25 18:49:52 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/05/31 17:37:58 $
*/
public class XSPRequestHelper extends XSPObjectHelper {
/**
@@ -94,7 +94,6 @@
*/
public static void getSitemapURI(Map objectModel, ContentHandler handler)
throws SAXException {
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
elementData(handler, "sitemap-uri", getSitemapURI(objectModel));
}
@@ -139,7 +138,6 @@
)
throws SAXException
{
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
@@ -236,7 +234,6 @@
)
throws SAXException
{
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
@@ -399,7 +396,6 @@
)
throws SAXException
{
- Request request = (Request)objectModel.get(Constants.REQUEST_OBJECT);
AttributesImpl attr = new AttributesImpl();
addAttribute(attr, "name", name);
1.2 +14 -12
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSPUtil.java 2001/05/09 20:49:53 1.1
+++ XSPUtil.java 2001/05/31 17:37:59 1.2
@@ -42,7 +42,7 @@
* The XSP <code>Utility</code> object helper
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version $Revision: 1.1 $ $Date: 2001/05/09 20:49:53 $
+ * @version $Revision: 1.2 $ $Date: 2001/05/31 17:37:59 $
*/
public class XSPUtil {
public static String pathComponent(String filename) {
@@ -254,21 +254,23 @@
}
// Counters
- private static int count = 0;
+ private static volatile int count = 0;
- public static synchronized int getCount() {
+ public static int getCount() {
return ++count;
}
- public static synchronized int getSessionCount(Session session) {
- Integer integer = (Integer)session.getAttribute("util.counter");
- if (integer == null) {
- integer = new Integer(0);
- }
- int cnt = integer.intValue() + 1;
- session.setAttribute("util.counter",
- new Integer(cnt));
- return cnt;
+ public static int getSessionCount(Session session) {
+ synchronized(session) {
+ Integer integer = (Integer)session.getAttribute("util.counter");
+ if (integer == null) {
+ integer = new Integer(0);
+ }
+ int cnt = integer.intValue() + 1;
+ session.setAttribute("util.counter",
+ new Integer(cnt));
+ return cnt;
+ }
}
public static Object getContextAttribute(Map objectModel, String name)
1.2 +3 -4
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JavaLanguage.java 2001/05/09 20:49:56 1.1
+++ JavaLanguage.java 2001/05/31 17:38:02 1.2
@@ -34,7 +34,7 @@
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:56 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:38:02 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe, Composable, Disposable {
@@ -144,9 +144,8 @@
try {
AbstractJavaCompiler compiler = (AbstractJavaCompiler)
this.compilerClass.newInstance();
- if (compiler instanceof Loggable) {
- ((Loggable) compiler).setLogger(getLogger());
- }
+ // AbstractJavaCompiler is Loggable
+ compiler.setLogger(getLogger());
int pos = name.lastIndexOf(File.separatorChar);
String filename = name.substring(pos + 1);
1.2 +1 -2
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Javac.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Javac.java 2001/05/09 20:49:57 1.1
+++ Javac.java 2001/05/31 17:38:03 1.2
@@ -26,7 +26,7 @@
* This class wraps the Sun's Javac Compiler.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.1 $ $Date: 2001/05/09 20:49:57 $
+ * @version $Revision: 1.2 $ $Date: 2001/05/31 17:38:03 $
* @since 2.0
*/
@@ -130,7 +130,6 @@
StringTokenizer tokens = new StringTokenizer(error, ":");
String file = tokens.nextToken();
if (file.length() == 1) file += ":" + tokens.nextToken();
- int line = Integer.parseInt(tokens.nextToken());
// FIXME (SM) finish writing a decent parser for modern errors
/*String message = tokens.nextToken();
1.5 +9 -9
xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java
Index: AbstractEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractEventPipeline.java 2001/05/28 12:07:55 1.4
+++ AbstractEventPipeline.java 2001/05/31 17:38:06 1.5
@@ -35,7 +35,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:cziegeler@Carsten Ziegeler">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.4 $ $Date: 2001/05/28 12:07:55 $
+ * @version CVS $Revision: 1.5 $ $Date: 2001/05/31 17:38:06 $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -211,15 +211,15 @@
connect.setup(environment,environment.getObjectModel(),null,null);
connect.setSitemap(this.sitemap);
this.connectors.add(connect);
- next = (XMLConsumer) connect;
+ next = connect;
prev.setConsumer(next);
- prev = (XMLProducer) connect;
+ prev = connect;
}
// Connect next component.
Transformer trans = (Transformer) itt.next();
- next = (XMLConsumer) trans;
+ next = trans;
prev.setConsumer(next);
- prev = (XMLProducer) trans;
+ prev = trans;
}
if (this.configuredSAXConnector == true) {
@@ -228,9 +228,9 @@
connect.setup(environment,environment.getObjectModel(),null,null);
connect.setSitemap(this.sitemap);
this.connectors.add(connect);
- next = (XMLConsumer) connect;
+ next = connect;
prev.setConsumer(next);
- prev = (XMLProducer) connect;
+ prev = connect;
}
// insert this consumer
prev.setConsumer(super.xmlConsumer);
@@ -255,9 +255,9 @@
public void dispose() {
if(generatorSelector != null)
- manager.release((Component)generatorSelector);
+ manager.release(generatorSelector);
if(transformerSelector != null)
- manager.release((Component)transformerSelector);
+ manager.release(transformerSelector);
}
public void recycle() {
1.3 +3 -4
xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractStreamPipeline.java
Index: AbstractStreamPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/AbstractStreamPipeline.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractStreamPipeline.java 2001/05/22 14:35:14 1.2
+++ AbstractStreamPipeline.java 2001/05/31 17:38:07 1.3
@@ -34,7 +34,7 @@
* resource
* </UL>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/22 14:35:14 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/31 17:38:07 $
*/
public abstract class AbstractStreamPipeline extends AbstractLoggable implements
StreamPipeline, Disposable {
protected EventPipeline eventPipeline;
@@ -215,7 +215,6 @@
*/
protected void connectPipeline() throws ProcessingException {
XMLProducer prev = (XMLProducer) this.eventPipeline;
- XMLConsumer next;
// connect serializer.
prev.setConsumer(this.serializer);
@@ -223,9 +222,9 @@
public void dispose() {
if(readerSelector != null)
- manager.release((Component)readerSelector);
+ manager.release(readerSelector);
if(serializerSelector != null)
- manager.release((Component)serializerSelector);
+ manager.release(serializerSelector);
}
public void recycle() {
1.7 +7 -9
xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java
Index: CachingEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/CachingEventPipeline.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CachingEventPipeline.java 2001/05/23 09:40:51 1.6
+++ CachingEventPipeline.java 2001/05/31 17:38:07 1.7
@@ -52,7 +52,7 @@
* does not cache! (If it would cache, the response would be cached twice!)
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/05/23 09:40:51 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/05/31 17:38:07 $
*/
public final class CachingEventPipeline
extends AbstractEventPipeline
@@ -331,17 +331,16 @@
connect.setup(environment,environment.getObjectModel(),null,null);
connect.setSitemap(this.sitemap);
this.connectors.add(connect);
- next = (XMLConsumer) connect;
+ next = connect;
prev.setConsumer(next);
- prev = (XMLProducer) connect;
+ prev = connect;
}
// Connect next component.
next = (XMLConsumer) itt.next();
if (xmlSerializer != null) {
if (cacheableTransformerCount == 0) {
- next = new XMLTeePipe(next,
- (XMLConsumer)xmlSerializer);
+ next = new XMLTeePipe(next, xmlSerializer);
xmlSerializer = null;
} else {
cacheableTransformerCount--;
@@ -357,16 +356,15 @@
connect.setup(environment,environment.getObjectModel(),null,null);
connect.setSitemap(this.sitemap);
this.connectors.add(connect);
- next = (XMLConsumer) connect;
+ next = connect;
prev.setConsumer(next);
- prev = (XMLProducer) connect;
+ prev = connect;
}
// insert this consumer
next = super.xmlConsumer;
if (xmlSerializer != null) {
- next = new XMLTeePipe(next,
- (XMLConsumer)xmlSerializer);
+ next = new XMLTeePipe(next, xmlSerializer);
xmlSerializer = null;
}
prev.setConsumer(next);
1.4 +3 -4
xml-cocoon2/src/org/apache/cocoon/components/saxconnector/CIncludeSAXConnector.java
Index: CIncludeSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/saxconnector/CIncludeSAXConnector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CIncludeSAXConnector.java 2001/05/22 14:37:21 1.3
+++ CIncludeSAXConnector.java 2001/05/31 17:38:10 1.4
@@ -40,7 +40,7 @@
/**
* Copy of code from CIncludeTransformer as a starting point for
CIncludeSAXConnector.
* @author <a href="[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/22 14:37:21 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:38:10 $
*/
public class CIncludeSAXConnector extends AbstractXMLPipe implements Composable,
Recyclable, SAXConnector {
@@ -104,7 +104,6 @@
private void startElem(String namespaceURI, String prefix, String name) throws
SAXException {
AttributesImpl attrs = new AttributesImpl();
- String qname = name;
if (!namespaceURI.equals("")) {
super.startPrefixMapping(prefix, namespaceURI);
}
@@ -160,9 +159,9 @@
getLogger().error("Error selecting sitemap",e);
} finally {
if(eventPipeline != null)
- this.manager.release((Component)eventPipeline);
+ this.manager.release(eventPipeline);
if(pipeline != null)
- this.manager.release((Component)pipeline);
+ this.manager.release(pipeline);
}
}
1.4 +3 -4
xml-cocoon2/src/org/apache/cocoon/components/saxconnector/XIncludeSAXConnector.java
Index: XIncludeSAXConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/saxconnector/XIncludeSAXConnector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XIncludeSAXConnector.java 2001/05/22 14:37:40 1.3
+++ XIncludeSAXConnector.java 2001/05/31 17:38:12 1.4
@@ -39,7 +39,7 @@
/**
* Copy of code from XIncludeTransformer as a starting point for
XIncludeSAXConnector.
* @author <a href="[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/22 14:37:40 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:38:12 $
*/
public class XIncludeSAXConnector extends AbstractXMLPipe implements Composable,
Recyclable, SAXConnector {
@@ -103,7 +103,6 @@
private void startElem(String namespaceURI, String prefix, String name) throws
SAXException {
AttributesImpl attrs = new AttributesImpl();
- String qname = name;
if (!namespaceURI.equals("")) {
super.startPrefixMapping(prefix, namespaceURI);
}
@@ -159,9 +158,9 @@
getLogger().error("Error selecting sitemap",e);
} finally {
if(eventPipeline != null)
- this.manager.release((Component)eventPipeline);
+ this.manager.release(eventPipeline);
if(pipeline != null)
- this.manager.release((Component)pipeline);
+ this.manager.release(pipeline);
}
}
1.2 +4 -2
xml-cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java
Index: MRUMemoryStore.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/store/MRUMemoryStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MRUMemoryStore.java 2001/05/09 20:50:01 1.1
+++ MRUMemoryStore.java 2001/05/31 17:38:16 1.2
@@ -202,8 +202,10 @@
/**
* Indicates if the given key is associated to a contained object.
*/
- public synchronized boolean containsKey(Object key) {
- return this.cache.containsKey(key);
+ public boolean containsKey(Object key) {
+ synchronized(this.cache) {
+ return this.cache.containsKey(key);
+ }
}
/**
1.6 +2 -2
xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java
Index: DirectoryGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/DirectoryGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DirectoryGenerator.java 2001/05/31 13:17:45 1.5
+++ DirectoryGenerator.java 2001/05/31 17:38:19 1.6
@@ -63,7 +63,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Conny Krappatsch</a>
* (SMB GmbH) for Virbus AG
- * @version CVS $Revision: 1.5 $ $Date: 2001/05/31 13:17:45 $ */
+ * @version CVS $Revision: 1.6 $ $Date: 2001/05/31 17:38:19 $ */
public class DirectoryGenerator extends ComposerGenerator implements Recyclable {
@@ -159,7 +159,7 @@
this.isRequestedDirectory = false;
/* Create a reusable attributes for creating nodes */
- AttributesImpl attributes = new AttributesImpl();
+ this.attributes = new AttributesImpl();
}
1.9 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/FileGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileGenerator.java 2001/05/31 13:17:47 1.8
+++ FileGenerator.java 2001/05/31 17:38:19 1.9
@@ -38,7 +38,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/05/31 13:17:47 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/05/31 17:38:19 $
*/
public class FileGenerator extends ComposerGenerator
implements Cacheable, Recyclable {
@@ -123,7 +123,7 @@
getLogger().error("Could not get parser", e);
throw new ProcessingException("Exception in
FileGenerator.generate()",e);
} finally {
- if (parser != null) this.manager.release((Component) parser);
+ if (parser != null) this.manager.release(parser);
}
}
}
1.6 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java
Index: JspGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/JspGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JspGenerator.java 2001/05/29 06:13:47 1.5
+++ JspGenerator.java 2001/05/31 17:38:21 1.6
@@ -48,7 +48,7 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/05/29 06:13:47 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/05/31 17:38:21 $
*/
public class JspGenerator extends ServletGenerator implements Recyclable {
@@ -99,7 +99,7 @@
getLogger().debug("JspGenerator.generate()", e);
throw new IOException(e.toString());
} finally {
- if (parser != null) this.manager.release((Component)parser);
+ if (parser != null) this.manager.release(parser);
}
}
1.6 +2 -2 xml-cocoon2/src/org/apache/cocoon/generation/PhpGenerator.java
Index: PhpGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/PhpGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PhpGenerator.java 2001/05/29 06:13:47 1.5
+++ PhpGenerator.java 2001/05/31 17:38:21 1.6
@@ -40,7 +40,7 @@
* results into SAX events.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sam Ruby</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/05/29 06:13:47 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/05/31 17:38:21 $
*/
public class PhpGenerator extends ServletGenerator implements Recyclable {
@@ -165,7 +165,7 @@
getLogger().debug("PhpGenerator.generate()", e);
throw new IOException(e.toString());
} finally {
- if (parser != null) this.manager.release((Component)parser);
+ if (parser != null) this.manager.release(parser);
}
}
}
1.7 +2 -2
xml-cocoon2/src/org/apache/cocoon/generation/ScriptGenerator.java
Index: ScriptGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ScriptGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ScriptGenerator.java 2001/05/29 06:13:47 1.6
+++ ScriptGenerator.java 2001/05/31 17:38:23 1.7
@@ -48,7 +48,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Foster</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/05/29 06:13:47 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/05/31 17:38:23 $
*/
public class ScriptGenerator extends ComposerGenerator implements Configurable,
Recyclable {
@@ -176,7 +176,7 @@
throw new ProcessingException(
"Exception in ScriptGenerator.generate()", e);
} finally {
- if (parser != null) this.manager.release((Component)parser);
+ if (parser != null) this.manager.release(parser);
}
}
}
1.4 +1 -2
xml-cocoon2/src/org/apache/cocoon/generation/StatusGenerator.java
Index: StatusGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/StatusGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StatusGenerator.java 2001/05/23 12:32:18 1.3
+++ StatusGenerator.java 2001/05/31 17:38:23 1.4
@@ -48,7 +48,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Paul Russell</a> (Luminas Limited)
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/23 12:32:18 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:38:23 $
*/
public class StatusGenerator extends ComposerGenerator implements Recyclable {
@@ -114,7 +114,6 @@
}
private void genVMStatus(ContentHandler ch) throws SAXException {
- String buf;
AttributesImpl atts = new AttributesImpl();
startGroup(ch, "vm");
1.4 +2 -2
xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java
Index: VelocityGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/VelocityGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VelocityGenerator.java 2001/05/29 06:13:47 1.3
+++ VelocityGenerator.java 2001/05/31 17:38:24 1.4
@@ -26,7 +26,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/29 06:13:47 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:38:24 $
*/
public class VelocityGenerator extends ServletGenerator implements Recyclable {
@@ -86,7 +86,7 @@
getLogger().error("Could not get parser", e);
throw new ProcessingException("Exception in
VelocityGenerator.generate()",e);
} finally {
- if (parser != null) this.manager.release((Component) parser);
+ if (parser != null) this.manager.release(parser);
}
}
}
1.3 +3 -2
xml-cocoon2/src/org/apache/cocoon/matching/RequestParamMatcher.java
Index: RequestParamMatcher.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/RequestParamMatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestParamMatcher.java 2001/05/18 14:16:34 1.2
+++ RequestParamMatcher.java 2001/05/31 17:38:32 1.3
@@ -14,7 +14,8 @@
/*
* Standard imports
*/
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.cocoon.matching.Matcher;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.Constants;
@@ -32,7 +33,7 @@
* </map:match>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Marcus Crafter</a>
- * @version CVS $Revision: 1.2 $
+ * @version CVS $Revision: 1.3 $
*/
public class RequestParamMatcher implements Matcher {
/**
1.2 +1 -3
xml-cocoon2/src/org/apache/cocoon/matching/WildcardURIMatcherFactory.java
Index: WildcardURIMatcherFactory.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/matching/WildcardURIMatcherFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WildcardURIMatcherFactory.java 2001/05/09 20:49:40 1.1
+++ WildcardURIMatcherFactory.java 2001/05/31 17:38:33 1.2
@@ -19,7 +19,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Berin Loritsch</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:40 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:38:33 $
*/
public class WildcardURIMatcherFactory extends AbstractLoggable implements
CodeFactory {
@@ -74,7 +74,6 @@
.append ("static int[] ").append(prefix).append("_expr = {");
int j = sourcePattern.length - 1;
- char c;
for (int i = 0; i < j; i++) {
result.append (sourcePattern[i])
.append (',');
@@ -160,7 +159,6 @@
slash = false;
// If the previous char was not '\' we have to do a bunch of checks
} else {
- int prev = (y - 1);
// If this char is '\' declare that and continue
if (buff[x] == '\\') {
slash = true;
1.3 +1 -2 xml-cocoon2/src/org/apache/cocoon/reading/ResourceReader.java
Index: ResourceReader.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/reading/ResourceReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResourceReader.java 2001/05/22 14:43:46 1.2
+++ ResourceReader.java 2001/05/31 17:38:37 1.3
@@ -43,7 +43,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/22 14:43:46 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/05/31 17:38:37 $
*
* The <code>ResourceReader</code> component is used to serve binary data
* in a sitemap pipeline. It makes use of HTTP Headers to determine if
@@ -120,7 +120,6 @@
* Generates the requested resource.
*/
public int generate() throws IOException, ProcessingException {
- Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
Response response = (Response) objectModel.get(Constants.RESPONSE_OBJECT);
long contentLength = this.inputSource.getContentLength();
1.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/serialization/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/serialization/AbstractTextSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractTextSerializer.java 2001/05/09 20:49:38 1.1
+++ AbstractTextSerializer.java 2001/05/31 17:38:41 1.2
@@ -32,7 +32,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:38 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:38:41 $
*/
public abstract class AbstractTextSerializer extends AbstractSerializer implements
Configurable, Cacheable, Poolable {
@@ -64,7 +64,7 @@
/**
* Helper for TransformerFactory.
*/
- protected synchronized SAXTransformerFactory getTransformerFactory()
+ protected SAXTransformerFactory getTransformerFactory()
{
if(tfactory == null) {
tfactory = (SAXTransformerFactory) TransformerFactory.newInstance();
1.11 +8 -8 xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/servlet/CocoonServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CocoonServlet.java 2001/05/30 08:48:52 1.10
+++ CocoonServlet.java 2001/05/31 17:38:46 1.11
@@ -58,7 +58,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.10 $ $Date: 2001/05/30 08:48:52 $
+ * @version CVS $Revision: 1.11 $ $Date: 2001/05/31 17:38:46 $
*/
public class CocoonServlet extends HttpServlet {
@@ -278,7 +278,7 @@
if (logDir == null) {
if(context.getRealPath("/") != null) {
logDir = context.getRealPath("/");
- if (logDir.endsWith(File.separator) == false) logDir = logDir +
File.separator;
+ if (logDir.endsWith(File.separator) == false) logDir +=
File.separator;
logDir = logDir + "WEB-INF"+File.separator+"logs"+File.separator;
} else
logDir =
"."+File.separator+"WEB-INF"+File.separator+"logs"+File.separator;
@@ -422,7 +422,7 @@
long start = new Date().getTime();
HttpServletRequest request = this.getServletRequest(req);
- Cocoon cocoon = getCocoon(request.getPathInfo(),
request.getParameter(Constants.RELOAD_PARAM));
+ this.cocoon = getCocoon(request.getPathInfo(),
request.getParameter(Constants.RELOAD_PARAM));
// Check if cocoon was initialized
if (this.cocoon == null) {
@@ -573,7 +573,7 @@
/**
* Creates the Cocoon object and handles exception handling.
*/
- private void createCocoon() {
+ private synchronized void createCocoon() {
try {
URL configFile = (URL)
this.appContext.get(Constants.CONTEXT_CONFIG_URL);
log.info("Reloading from: " + configFile.toExternalForm());
@@ -608,13 +608,13 @@
.append(" in ");
if (time > hour) {
- out.append((float) time / (float) hour);
+ out.append(time / hour);
out.append(" hours.");
} else if (time > minute) {
- out.append((float) time / (float) minute);
+ out.append(time / minute);
out.append(" minutes.");
} else if (time > second) {
- out.append((float) time / (float) second);
+ out.append(time / second);
out.append(" seconds.");
} else {
out.append(time);
@@ -630,7 +630,7 @@
*
* @returns Cocoon
*/
- private synchronized Cocoon getCocoon(final String pathInfo, final String
reloadParam) {
+ private Cocoon getCocoon(final String pathInfo, final String reloadParam) {
if (this.cocoon != null) {
if (this.cocoon.modifiedSince(this.creationTime)) {
log.info("Configuration changed reload attempt");
1.4 +1 -2 xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/AbstractSitemap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractSitemap.java 2001/05/31 10:54:14 1.3
+++ AbstractSitemap.java 2001/05/31 17:38:49 1.4
@@ -44,7 +44,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/05/31 10:54:14 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/05/31 17:38:49 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements Sitemap,
Disposable, ThreadSafe {
private Context context;
@@ -200,7 +200,6 @@
int k = 0;
int l = 0;
int m = 0;
- int n = 0;
int ii = 0;
int i = -1;
try {
1.5 +1 -2 xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java
Index: ContentAggregator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/ContentAggregator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContentAggregator.java 2001/05/25 16:13:39 1.4
+++ ContentAggregator.java 2001/05/31 17:38:51 1.5
@@ -42,7 +42,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: ContentAggregator.java,v 1.4 2001/05/25 16:13:39 giacomo Exp $
+ * @version CVS $Id: ContentAggregator.java,v 1.5 2001/05/31 17:38:51 bloritsch Exp
$
*/
public class ContentAggregator extends ContentHandlerWrapper
@@ -376,7 +376,6 @@
private void startElem(String namespaceURI, String prefix, String name) throws
SAXException {
this.pushNS(namespaceURI);
AttributesImpl attrs = new AttributesImpl();
- String qname = name;
if (!namespaceURI.equals("")) {
this.documentHandler.startPrefixMapping(prefix, namespaceURI);
}
1.7 +11 -10 xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Handler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Handler.java 2001/05/30 15:31:11 1.6
+++ Handler.java 2001/05/31 17:38:52 1.7
@@ -42,7 +42,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/05/30 15:31:11 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/05/31 17:38:52 $
*/
public class Handler extends AbstractLoggable
implements Runnable, Configurable, Composable, Contextualizable, Processor,
Disposable {
@@ -75,7 +75,7 @@
/** the regenerating thread */
private Thread regeneration;
- private boolean isRegenerationRunning = false;
+ private volatile boolean isRegenerationRunning = false;
private Environment environment;
/** the sitemaps base path */
@@ -124,9 +124,8 @@
return isRegenerationRunning;
}
- protected synchronized void regenerateAsynchronously (Environment environment)
+ protected void regenerateAsynchronously (Environment environment)
throws Exception {
- String s;
if (this.sourceFileName.charAt(this.sourceFileName.length() - 1) == '/') {
this.sourceFileName = this.sourceFileName + "sitemap.xmap";
}
@@ -140,7 +139,6 @@
if (!this.isRegenerationRunning) {
isRegenerationRunning = true;
regeneration = new Thread (this);
-
/* HACK for reducing class loader problems.
*/
/* example: xalan extensions fail if someone adds xalan jars in
tomcat3.2.1/lib */
try {
@@ -156,12 +154,15 @@
}
}
- protected synchronized void regenerate (Environment environment)
+ protected void regenerate (Environment environment)
throws Exception {
getLogger().debug("Beginning sitemap regeneration");
- regenerateAsynchronously(environment);
- if (regeneration != null)
- regeneration.join();
+
+ if (regeneration == null) {
+ this.regenerateAsynchronously(environment);
+ } else {
+ this.regeneration.join();
+ }
throwEventualException();
}
@@ -243,7 +244,7 @@
this.exception = (Exception) t;
}
} finally {
- if(programGenerator != null) this.manager.release((Component)
programGenerator);
+ if(programGenerator != null) this.manager.release(programGenerator);
this.regeneration = null;
this.environment = null;
this.isRegenerationRunning = false;
1.2 +1 -7 xml-cocoon2/src/org/apache/cocoon/sitemap/Manager.java
Index: Manager.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/sitemap/Manager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Manager.java 2001/05/09 20:49:36 1.1
+++ Manager.java 2001/05/31 17:38:54 1.2
@@ -37,7 +37,7 @@
* checking regeneration of the sub <code>Sitemap</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:36 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:38:54 $
*/
public class Manager extends AbstractLoggable implements Component, Configurable,
Composable, Contextualizable, ThreadSafe {
@@ -86,9 +86,6 @@
String source, boolean check_reload, boolean
reload_asynchron)
throws Exception {
- // make sure the uri_prefix ends with a slash
- String prefix = this.getPrefix(uri_prefix);
-
// get a sitemap handler
Handler sitemapHandler = getHandler(environment, source, check_reload,
reload_asynchron);
@@ -110,9 +107,6 @@
String source, boolean check_reload, boolean
reload_asynchron,
StreamPipeline pipeline, EventPipeline eventPipeline)
throws Exception {
-
- // make sure the uri_prefix ends with a slash
- String prefix = this.getPrefix(uri_prefix);
// get a sitemap handler
Handler sitemapHandler = getHandler(environment, source, check_reload,
reload_asynchron);
1.3 +1 -1
xml-cocoon2/src/org/apache/cocoon/transformation/AbstractDOMTransformer.java
Index: AbstractDOMTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/AbstractDOMTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractDOMTransformer.java 2001/05/22 14:47:08 1.2
+++ AbstractDOMTransformer.java 2001/05/31 17:38:58 1.3
@@ -73,7 +73,7 @@
try {
log.debug("Looking up " + Roles.PARSER);
Parser p = (Parser)manager.lookup(Roles.PARSER);
- super.factory = (DOMFactory)p;
+ super.factory = p;
} catch (Exception e) {
log.error("Could not find component", e);
}
1.8 +1 -1
xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- I18nTransformer.java 2001/05/31 13:05:31 1.7
+++ I18nTransformer.java 2001/05/31 17:38:59 1.8
@@ -352,7 +352,7 @@
getLogger().error("Error in initialiseDictionary", e);
throw new SAXException("ComponentException in initialiseDictionary");
} finally {
- if(parser != null) this.manager.release((Component) parser);
+ if(parser != null) this.manager.release(parser);
}
}
1.8 +1 -1
xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer2.java
Index: I18nTransformer2.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/I18nTransformer2.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- I18nTransformer2.java 2001/05/31 13:05:32 1.7
+++ I18nTransformer2.java 2001/05/31 17:39:00 1.8
@@ -536,7 +536,7 @@
getLogger().error("Error in initialiseDictionary", e);
throw new SAXException("ComponentException in initialiseDictionary");
} finally {
- if(parser != null) this.manager.release((Component) parser);
+ if(parser != null) this.manager.release(parser);
}
}
}
1.14 +4 -4
xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/TraxTransformer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TraxTransformer.java 2001/05/31 13:05:32 1.13
+++ TraxTransformer.java 2001/05/31 17:39:01 1.14
@@ -100,7 +100,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Davanum Srinivas</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: TraxTransformer.java,v 1.13 2001/05/31 13:05:32 dims Exp $
+ * @version CVS $Id: TraxTransformer.java,v 1.14 2001/05/31 17:39:01 bloritsch Exp $
*/
public class TraxTransformer extends ContentHandlerWrapper
implements Transformer, Composable, Recyclable, Configurable, Cacheable,
Disposable, URIResolver {
@@ -289,7 +289,7 @@
/**
* Helper for TransformerFactory.
*/
- private synchronized SAXTransformerFactory getTransformerFactory() {
+ private SAXTransformerFactory getTransformerFactory() {
if(tfactory == null) {
tfactory = (SAXTransformerFactory) TransformerFactory.newInstance();
tfactory.setErrorListener(new TraxErrorHandler(getLogger()));
@@ -438,8 +438,8 @@
if(transformerHandler instanceof Loggable) {
((Loggable)transformerHandler).setLogger(getLogger());
}
- if(transformerHandler instanceof org.xml.sax.ext.LexicalHandler)
-
this.setLexicalHandler((org.xml.sax.ext.LexicalHandler)transformerHandler);
+ // According to TrAX specs, all TransformerHandlers are LexicalHandlers
+ this.setLexicalHandler(transformerHandler);
this.setContentHandler(consumer);
}
1.6 +2 -2
xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XIncludeTransformer.java 2001/05/31 13:18:48 1.5
+++ XIncludeTransformer.java 2001/05/31 17:39:02 1.6
@@ -54,7 +54,7 @@
* by the SAX event FSM yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Donald Ball</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/05/31 13:18:48 $ $Author: dims $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/05/31 17:39:02 $ $Author: bloritsch $
*/
public class XIncludeTransformer extends AbstractTransformer implements Composable,
Recyclable, Disposable {
@@ -279,7 +279,7 @@
getLogger().error("Error in processXIncludeElement", e);
throw new SAXException("ComponentException in
processXIncludeElement");
} finally {
- if(parser != null) this.manager.release((Component) parser);
+ if(parser != null) this.manager.release(parser);
}
}
}
1.6 +3 -3 xml-cocoon2/src/org/apache/cocoon/util/ClassUtils.java
Index: ClassUtils.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/ClassUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClassUtils.java 2001/05/30 13:32:27 1.5
+++ ClassUtils.java 2001/05/31 17:39:07 1.6
@@ -18,7 +18,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/05/30 13:32:27 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/05/31 17:39:07 $
*/
public class ClassUtils {
@@ -136,10 +136,10 @@
classPath = "/" + classPath;
}
classPath = classPath.replace('.', '/');
- classPath = classPath + ".class";
+ classPath += ".class";
try {
- Class clazz = loadClass(className);
+ loadClass(className);
java.net.URL classUrl = getResource(classPath);
if(classUrl != null)
path = classUrl.toString();
1.4 +3 -3 xml-cocoon2/src/org/apache/cocoon/xml/IncludeXMLConsumer.java
Index: IncludeXMLConsumer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/IncludeXMLConsumer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IncludeXMLConsumer.java 2001/05/31 12:09:47 1.3
+++ IncludeXMLConsumer.java 2001/05/31 17:39:11 1.4
@@ -19,15 +19,15 @@
* </code>endDocument</code> messages.
*
* @author <a href="mailto:[EMAIL PROTECTED]>Berin Loritsch</a>
- * @version $Revision: 1.3 $ $Date: 2001/05/31 12:09:47 $
+ * @version $Revision: 1.4 $ $Date: 2001/05/31 17:39:11 $
*/
public class IncludeXMLConsumer extends AbstractXMLConsumer {
final private ContentHandler contentHandler;
final private LexicalHandler lexicalHandler;
public IncludeXMLConsumer (XMLConsumer consumer) {
- this.contentHandler = (ContentHandler)consumer;
- this.lexicalHandler = (LexicalHandler)consumer;
+ this.contentHandler = consumer;
+ this.lexicalHandler = consumer;
}
public IncludeXMLConsumer (ContentHandler contentHandler, LexicalHandler
lexicalHandler) {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
