unico 2003/12/26 10:43:39
Modified: src/java/org/apache/cocoon/components/store/impl
FilesystemStore.java DefaultStore.java
src/java/org/apache/cocoon/components/source/impl
SitemapSourceFactory.java ContextSourceFactory.java
src/java/org/apache/cocoon/components/modules/input
PropertiesFileModule.java
src/java/org/apache/cocoon/components/flow/javascript
JavaScriptInterpreter.java
src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_JavaScriptInterpreter.java
src/java/org/apache/cocoon/components/flow
ContinuationsManagerImpl.java
src/java/org/apache/cocoon/components/crawler
SimpleCocoonCrawlerImpl.java
src/java/org/apache/cocoon/caching/impl CacheImpl.java
Log:
meta tags: fortress tools don't seem to handle quotes (") very well, have to
remove them in order to make it work
Revision Changes Path
1.3 +3 -2
cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/FilesystemStore.java
Index: FilesystemStore.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/FilesystemStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FilesystemStore.java 27 Oct 2003 02:30:44 -0000 1.2
+++ FilesystemStore.java 26 Dec 2003 18:43:39 -0000 1.3
@@ -50,6 +50,7 @@
*/
package org.apache.cocoon.components.store.impl;
+import org.apache.excalibur.store.Store;
import org.apache.excalibur.store.impl.AbstractFilesystemStore;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
@@ -76,7 +77,7 @@
*/
public final class FilesystemStore
extends AbstractFilesystemStore
-implements Contextualizable, Parameterizable {
+implements Store, Contextualizable, Parameterizable {
protected File workDir;
protected File cacheDir;
1.8 +3 -2
cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/DefaultStore.java
Index: DefaultStore.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/store/impl/DefaultStore.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultStore.java 27 Oct 2003 02:30:44 -0000 1.7
+++ DefaultStore.java 26 Dec 2003 18:43:39 -0000 1.8
@@ -66,6 +66,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.Constants;
import org.apache.cocoon.util.IOUtils;
+import org.apache.excalibur.store.Store;
import org.apache.excalibur.store.impl.AbstractJispFilesystemStore;
/**
@@ -83,7 +84,7 @@
* @x-avalon.info name="persistent-store"
*/
public class DefaultStore extends AbstractJispFilesystemStore
- implements org.apache.excalibur.store.Store,
+ implements Store,
Contextualizable,
Parameterizable,
Disposable {
1.5 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java
Index: SitemapSourceFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SitemapSourceFactory.java 27 Oct 2003 02:05:15 -0000 1.4
+++ SitemapSourceFactory.java 26 Dec 2003 18:43:39 -0000 1.5
@@ -74,9 +74,9 @@
* @version CVS $Id$
*
* @avalon.component
- * @avalon.service type="SourceFactory"
- * @x-avalon.lifestyle type="singleton"
- * @x-avalon.info name="cocoon"
+ * @avalon.service type=SourceFactory
+ * @x-avalon.lifestyle type=singleton
+ * @x-avalon.info name=cocoon-source
*/
public final class SitemapSourceFactory
extends AbstractLogEnabled
1.6 +10 -5
cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java
Index: ContextSourceFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContextSourceFactory.java 27 Oct 2003 02:05:15 -0000 1.5
+++ ContextSourceFactory.java 26 Dec 2003 18:43:39 -0000 1.6
@@ -56,7 +56,6 @@
import java.net.URL;
import java.util.Map;
-import org.apache.excalibur.source.*;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -66,6 +65,12 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Context;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.SourceFactory;
+import org.apache.excalibur.source.SourceResolver;
+import org.apache.excalibur.source.SourceUtil;
+import org.apache.excalibur.source.URIAbsolutizer;
/**
* A factory for the context protocol using the context of the servlet api.
It builds the
@@ -77,9 +82,9 @@
* @version CVS $Id$
*
* @avalon.component
- * @avalon.service type="SourceFactory"
- * @x-avalon.lifestyle type="singleton"
- * @x-avalon.info name="context"
+ * @avalon.service type=SourceFactory
+ * @x-avalon.info name=context-source
+ * @x-avalon.lifestyle type=singleton
*/
public class ContextSourceFactory
extends AbstractLogEnabled
1.3 +3 -3
cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java
Index: PropertiesFileModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/PropertiesFileModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PropertiesFileModule.java 31 Oct 2003 17:02:34 -0000 1.2
+++ PropertiesFileModule.java 26 Dec 2003 18:43:39 -0000 1.3
@@ -76,9 +76,9 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Unico Hommes</a>
*
* @avalon.component
- * @avalon.service type="InputModule"
- * @x-avalon.lifestyle type="singleton"
- * @x-avalon.info name="properties-file-module"
+ * @avalon.service type=InputModule
+ * @x-avalon.lifestyle type=singleton
+ * @x-avalon.info name=properties-file-module
*/
public class PropertiesFileModule extends AbstractJXPathModule
implements InputModule, Serviceable, Configurable, ThreadSafe {
1.23 +18 -2
cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java
Index: JavaScriptInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JavaScriptInterpreter.java 15 Oct 2003 17:04:50 -0000 1.22
+++ JavaScriptInterpreter.java 26 Dec 2003 18:43:39 -0000 1.23
@@ -72,7 +72,18 @@
import org.apache.commons.jxpath.JXPathIntrospector;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
import org.apache.excalibur.source.Source;
-import org.mozilla.javascript.*;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.EcmaError;
+import org.mozilla.javascript.EvaluatorException;
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.NativeArray;
+import org.mozilla.javascript.PropertyException;
+import org.mozilla.javascript.Script;
+import org.mozilla.javascript.ScriptRuntime;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.Wrapper;
import org.mozilla.javascript.tools.ToolErrorReporter;
/**
@@ -82,6 +93,11 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marcus Crafter</a>
* @since March 25, 2002
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type=Interpreter
+ * @x-avalon.lifestyle type=singleton
+ * @x-avalon.info name=javascript-interpreter
*/
public class JavaScriptInterpreter extends CompilingInterpreter
implements Configurable, Initializable
1.13 +16 -3
cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Index: FOM_JavaScriptInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FOM_JavaScriptInterpreter.java 28 Oct 2003 17:21:14 -0000 1.12
+++ FOM_JavaScriptInterpreter.java 26 Dec 2003 18:43:39 -0000 1.13
@@ -81,7 +81,15 @@
import org.apache.commons.jxpath.JXPathIntrospector;
import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl;
import org.apache.excalibur.source.Source;
-import org.mozilla.javascript.*;
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.EcmaError;
+import org.mozilla.javascript.EvaluatorException;
+import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.Script;
+import org.mozilla.javascript.ScriptRuntime;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.Wrapper;
import org.mozilla.javascript.continuations.Continuation;
import org.mozilla.javascript.tools.ToolErrorReporter;
import org.mozilla.javascript.tools.shell.Global;
@@ -93,9 +101,14 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Marcus Crafter</a>
* @since March 25, 2002
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type=Interpreter
+ * @x-avalon.lifestyle type=singleton
+ * @x-avalon.info name=fom-javascript-interpreter
*/
public class FOM_JavaScriptInterpreter extends CompilingInterpreter
- implements Configurable, Initializable
+ implements Interpreter, Configurable, Initializable
{
/**
1.9 +7 -3
cocoon-2.2/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Index: ContinuationsManagerImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ContinuationsManagerImpl.java 4 Sep 2003 13:20:27 -0000 1.8
+++ ContinuationsManagerImpl.java 26 Dec 2003 18:43:39 -0000 1.9
@@ -76,11 +76,15 @@
* @since March 19, 2002
* @see ContinuationsManager
* @version CVS $Id$
+ *
+ * @avalon.component
+ * @avalon.service type=ContinuationsManager
+ * @x-avalon.lifestyle type=singleton
+ * @x-avalon.info name=continuations-manager
*/
public class ContinuationsManagerImpl
extends AbstractLogEnabled
- implements ContinuationsManager, Component, Configurable,
- ThreadSafe, Contextualizable {
+ implements ContinuationsManager, Configurable, Contextualizable {
static final int CONTINUATION_ID_LENGTH = 20;
static final String EXPIRE_CONTINUATIONS = "expire-continuations";
1.5 +5 -5
cocoon-2.2/src/java/org/apache/cocoon/components/crawler/SimpleCocoonCrawlerImpl.java
Index: SimpleCocoonCrawlerImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/crawler/SimpleCocoonCrawlerImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SimpleCocoonCrawlerImpl.java 6 Dec 2003 21:22:09 -0000 1.4
+++ SimpleCocoonCrawlerImpl.java 26 Dec 2003 18:43:39 -0000 1.5
@@ -79,9 +79,9 @@
* @version CVS $Id$
*
* @avalon.component
- * @avalon.service type="CocoonCrawler"
- * @x-avalon.lifestyle type="pooled"
- * @x-avalon.info name="cocoon-crawler"
+ * @avalon.service type=CocoonCrawler
+ * @x-avalon.lifestyle type=pooled
+ * @x-avalon.info name=cocoon-crawler
*/
public class SimpleCocoonCrawlerImpl extends AbstractLogEnabled
implements CocoonCrawler, Configurable, Disposable, Recyclable {
1.10 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/caching/impl/CacheImpl.java
Index: CacheImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/caching/impl/CacheImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CacheImpl.java 27 Oct 2003 02:35:53 -0000 1.9
+++ CacheImpl.java 26 Dec 2003 18:43:39 -0000 1.10
@@ -78,9 +78,9 @@
* @version CVS $Id$
*
* @avalon.component
- * @avalon.service type="Cache"
- * @x-avalon.lifestyle type="singleton"
- * @x-avalon.info name="cache"
+ * @avalon.service type=Cache
+ * @x-avalon.lifestyle type=singleton
+ * @x-avalon.info name=cache
*
*/
public class CacheImpl
