You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2004/02/07 00:34:33 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/language/programming LanguageCompiler.java ProgrammingLanguage.java
joerg 2004/02/06 15:34:33
Modified: src/java/org/apache/cocoon/transformation
SimpleFormTransformer.java
src/java/org/apache/cocoon/sitemap
SitemapOutputComponent.java
SitemapModelComponent.java
src/java/org/apache/cocoon/components/language/markup
MarkupLanguage.java
src/java/org/apache/cocoon/components/modules/output
OutputModule.java
src/java/org/apache/cocoon/components/xscript
XScriptManagerImpl.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPUtil.java SOAPHelper.java
src/java/org/apache/cocoon/i18n Bundle.java
XMLResourceBundle.java
XMLResourceBundleFactory.java
src/java/org/apache/cocoon/transformation/helpers
DefaultIncludeCacheManager.java
src/java/org/apache/cocoon/components/modules/input
InputModule.java
src/java/org/apache/cocoon/components/language/programming
LanguageCompiler.java ProgrammingLanguage.java
Log:
kick (almost) all the rest of the component stuff;
remaining:
- deprecated/**/*Composer*.java
- testcases depending on ExcaliburTestCase (ECM bound)
- CocoonServlet has a reference to ComponentManager
- XSP
Revision Changes Path
1.9 +9 -9 cocoon-2.2/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
Index: SimpleFormTransformer.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SimpleFormTransformer.java 6 Dec 2003 21:22:07 -0000 1.8
+++ SimpleFormTransformer.java 6 Feb 2004 23:34:32 -0000 1.9
@@ -51,10 +51,10 @@
package org.apache.cocoon.transformation;
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.component.ComponentSelector;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.ProcessingException;
@@ -289,7 +289,7 @@
private Configuration defaultInputConf = null;
private Configuration inputConf = null;
private InputModule input = null;
- private ComponentSelector inputSelector = null;
+ private ServiceSelector inputSelector = null;
private String inputName = null;
/** Skip element's content only. Otherwise skip also surrounding element. */
@@ -452,10 +452,10 @@
try {
// obtain input module
- this.inputSelector = (ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR);
+ this.inputSelector = (ServiceSelector) this.manager.lookup(INPUT_MODULE_SELECTOR);
if (this.inputName != null
&& this.inputSelector != null
- && this.inputSelector.hasComponent(this.inputName)) {
+ && this.inputSelector.isSelectable(this.inputName)) {
this.input = (InputModule) this.inputSelector.select(this.inputName);
if (!(this.input instanceof ThreadSafe
&& this.inputSelector instanceof ThreadSafe)) {
@@ -474,7 +474,7 @@
+ (this.inputSelector != null ? "not " : "")
+ "null, Component is "
+ (this.inputSelector != null
- && this.inputSelector.hasComponent(this.inputName)
+ && this.inputSelector.isSelectable(this.inputName)
? "known"
: "unknown"));
}
@@ -1093,7 +1093,7 @@
*/
private Object[] getValues(String name) {
Object[] values = null;
- ComponentSelector iputSelector = null;
+ ServiceSelector iputSelector = null;
InputModule iput = null;
try {
if (this.input != null) {
@@ -1111,10 +1111,10 @@
} else {
// input was not thread safe
// so acquire it again
- iputSelector = (ComponentSelector) this.manager.lookup(INPUT_MODULE_SELECTOR);
+ iputSelector = (ServiceSelector) this.manager.lookup(INPUT_MODULE_SELECTOR);
if (this.inputName != null
&& iputSelector != null
- && iputSelector.hasComponent(this.inputName)) {
+ && iputSelector.isSelectable(this.inputName)) {
iput = (InputModule) iputSelector.select(this.inputName);
}
1.3 +3 -3 cocoon-2.2/src/java/org/apache/cocoon/sitemap/SitemapOutputComponent.java
Index: SitemapOutputComponent.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/SitemapOutputComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SitemapOutputComponent.java 5 Sep 2003 11:40:41 -0000 1.2
+++ SitemapOutputComponent.java 6 Feb 2004 23:34:32 -0000 1.3
@@ -50,10 +50,10 @@
*/
package org.apache.cocoon.sitemap;
-import org.apache.avalon.framework.component.Component;
-
import java.io.IOException;
import java.io.OutputStream;
+
+import org.apache.avalon.framework.component.Component;
/**
* This interface marks a component as a sitemap component that produces
1.3 +2 -3 cocoon-2.2/src/java/org/apache/cocoon/sitemap/SitemapModelComponent.java
Index: SitemapModelComponent.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/SitemapModelComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SitemapModelComponent.java 5 Sep 2003 11:40:41 -0000 1.2
+++ SitemapModelComponent.java 6 Feb 2004 23:34:32 -0000 1.3
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.sitemap;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
@@ -68,7 +67,7 @@
* (Apache Software Foundation)
* @version CVS $Id$
*/
-public interface SitemapModelComponent extends Component {
+public interface SitemapModelComponent {
/**
* Set the <code>SourceResolver</code>, objectModel <code>Map</code>,
* the source and sitemap <code>Parameters</code> used to process the request.
1.3 +2 -3 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/MarkupLanguage.java
Index: MarkupLanguage.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/MarkupLanguage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MarkupLanguage.java 22 May 2003 13:02:47 -0000 1.2
+++ MarkupLanguage.java 6 Feb 2004 23:34:32 -0000 1.3
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.components.language.markup;
-import org.apache.avalon.framework.component.Component;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.excalibur.source.Source;
@@ -63,7 +62,7 @@
* @author <a href="mailto:vgritsenko@apache.org">Vadim Gritsenko</a>
* @version CVS $Id$
*/
-public interface MarkupLanguage extends Component {
+public interface MarkupLanguage {
String ROLE = MarkupLanguage.class.getName();
1.2 +2 -3 cocoon-2.2/src/java/org/apache/cocoon/components/modules/output/OutputModule.java
Index: OutputModule.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/modules/output/OutputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OutputModule.java 9 Mar 2003 00:09:05 -0000 1.1
+++ OutputModule.java 6 Feb 2004 23:34:32 -0000 1.2
@@ -53,7 +53,6 @@
import java.util.Map;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
/**
@@ -66,7 +65,7 @@
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
* @version CVS $Id$
*/
-public interface OutputModule extends Component {
+public interface OutputModule {
String ROLE = OutputModule.class.getName();
1.3 +2 -3 cocoon-2.2/src/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java
Index: XScriptManagerImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/xscript/XScriptManagerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XScriptManagerImpl.java 6 Feb 2004 22:24:40 -0000 1.2
+++ XScriptManagerImpl.java 6 Feb 2004 23:34:32 -0000 1.3
@@ -50,7 +50,6 @@
*/
package org.apache.cocoon.components.xscript;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
@@ -79,7 +78,7 @@
*/
public class XScriptManagerImpl
extends AbstractLogEnabled
- implements XScriptManager, Serviceable, Component, Parameterizable, Contextualizable, ThreadSafe
+ implements XScriptManager, Serviceable, Parameterizable, Contextualizable, ThreadSafe
{
public static final String CONTEXT = "org.apache.cocoon.components.xscript.scope";
1.8 +6 -7 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java
Index: XSPUtil.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPUtil.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSPUtil.java 23 Sep 2003 22:46:44 -0000 1.7
+++ XSPUtil.java 6 Feb 2004 23:34:32 -0000 1.8
@@ -51,8 +51,7 @@
package org.apache.cocoon.components.language.markup.xsp;
import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -308,13 +307,13 @@
}
}
- public static void includeString(String string, ComponentManager manager, ContentHandler contentHandler)
+ public static void includeString(String string, ServiceManager manager, ContentHandler contentHandler)
throws RuntimeException {
XSPUtil.includeInputSource(new InputSource(new StringReader(String.valueOf(string))), manager,
contentHandler);
}
- public static void includeFile(String name, ComponentManager manager, ContentHandler contentHandler, Map objectModel)
+ public static void includeFile(String name, ServiceManager manager, ContentHandler contentHandler, Map objectModel)
throws RuntimeException {
try {
XSPUtil.includeInputSource(new InputSource(new FileReader(XSPUtil.relativeFilename(name, objectModel))),
@@ -324,7 +323,7 @@
}
}
- public static void includeInputSource(InputSource source, ComponentManager manager, ContentHandler contentHandler)
+ public static void includeInputSource(InputSource source, ServiceManager manager, ContentHandler contentHandler)
throws RuntimeException {
SAXParser parser = null;
try {
@@ -335,7 +334,7 @@
throw new CascadingRuntimeException("Could not include page", e);
} finally {
if (parser != null) {
- manager.release((Component)parser);
+ manager.release(parser);
}
}
}
1.3 +5 -5 cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java
Index: SOAPHelper.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/markup/xsp/SOAPHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SOAPHelper.java 5 Jul 2003 04:28:54 -0000 1.2
+++ SOAPHelper.java 6 Feb 2004 23:34:32 -0000 1.3
@@ -50,8 +50,8 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.xscript.XScriptManager;
import org.apache.cocoon.components.xscript.XScriptObject;
@@ -81,9 +81,9 @@
String action = "";
XScriptObject xscriptObject;
- public SOAPHelper(ComponentManager manager, String urlContext, String url,
+ public SOAPHelper(ServiceManager manager, String urlContext, String url,
String action, XScriptObject xscriptObject)
- throws MalformedURLException, ComponentException
+ throws MalformedURLException, ServiceException
{
this.xscriptManager = (XScriptManager) manager.lookup(XScriptManager.ROLE);
URL context = new URL(urlContext);
1.4 +2 -4 cocoon-2.2/src/java/org/apache/cocoon/i18n/Bundle.java
Index: Bundle.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/i18n/Bundle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bundle.java 27 Nov 2003 02:18:38 -0000 1.3
+++ Bundle.java 6 Feb 2004 23:34:32 -0000 1.4
@@ -52,8 +52,6 @@
import java.util.MissingResourceException;
-import org.apache.avalon.framework.component.Component;
-
/**
* Resource bundle component interface.
* Provide the minimal number of methods to be used for i18n.
@@ -61,7 +59,7 @@
* @author <a href="mailto:kpiroumian@apache.org">Konstantin Piroumian</a>
* @version CVS $Id$
*/
-public interface Bundle extends Component {
+public interface Bundle {
String ROLE = Bundle.class.getName();
1.5 +2 -2 cocoon-2.2/src/java/org/apache/cocoon/i18n/XMLResourceBundle.java
Index: XMLResourceBundle.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/i18n/XMLResourceBundle.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLResourceBundle.java 25 Dec 2003 13:53:53 -0000 1.4
+++ XMLResourceBundle.java 6 Feb 2004 23:34:32 -0000 1.5
@@ -123,7 +123,7 @@
* Compose this instance
*
* @param manager The <code>ComponentManager</code> instance
- * @throws ComponentException if XPath processor is not found
+ * @throws ServiceException if XPath processor is not found
*/
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
1.8 +5 -5 cocoon-2.2/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java
Index: XMLResourceBundleFactory.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/i18n/XMLResourceBundleFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLResourceBundleFactory.java 25 Dec 2003 13:53:53 -0000 1.7
+++ XMLResourceBundleFactory.java 6 Feb 2004 23:34:32 -0000 1.8
@@ -179,7 +179,7 @@
* @param name bundle name
* @param locale locale name
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception ServiceException if a bundle is not found
*/
public Bundle select(String name, String locale) throws ServiceException {
return select(getDirectory(), name, locale);
@@ -191,7 +191,7 @@
* @param name bundle name
* @param locale locale
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception ServiceException if a bundle is not found
*/
public Bundle select(String name, Locale locale) throws ServiceException {
return select(getDirectory(), name, locale);
@@ -205,7 +205,7 @@
* @param name bundle name
* @param locale locale name
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception ServiceException if a bundle is not found
*/
public Bundle select(String directory, String name, String localeName) throws ServiceException {
return select(directory, name, new Locale(localeName, localeName));
@@ -219,7 +219,7 @@
* @param name bundle name
* @param locale locale
* @return the bundle
- * @exception ComponentException if a bundle is not found
+ * @exception ServiceException if a bundle is not found
*/
public Bundle select(String directory, String name, Locale locale) throws ServiceException {
Bundle bundle = _select(directory, name, locale, this.cacheAtStartup);
1.8 +2 -4 cocoon-2.2/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java
Index: DefaultIncludeCacheManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultIncludeCacheManager.java 23 Oct 2003 08:27:46 -0000 1.7
+++ DefaultIncludeCacheManager.java 6 Feb 2004 23:34:33 -0000 1.8
@@ -54,7 +54,6 @@
import java.net.URL;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable;
@@ -104,8 +103,7 @@
ThreadSafe,
Serviceable,
Disposable,
- Parameterizable,
- Component {
+ Parameterizable {
private ServiceManager manager;
1.2 +2 -3 cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/InputModule.java
Index: InputModule.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/modules/input/InputModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InputModule.java 9 Mar 2003 00:09:03 -0000 1.1
+++ InputModule.java 6 Feb 2004 23:34:33 -0000 1.2
@@ -51,7 +51,6 @@
package org.apache.cocoon.components.modules.input;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -66,7 +65,7 @@
* @author <a href="mailto:haul@apache.org">Christian Haul</a>
* @version CVS $Id$
*/
-public interface InputModule extends Component {
+public interface InputModule {
String ROLE = InputModule.class.getName();
1.3 +2 -4 cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/LanguageCompiler.java
Index: LanguageCompiler.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/LanguageCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LanguageCompiler.java 11 Mar 2003 16:01:48 -0000 1.2
+++ LanguageCompiler.java 6 Feb 2004 23:34:33 -0000 1.3
@@ -50,8 +50,6 @@
*/
package org.apache.cocoon.components.language.programming;
-import org.apache.avalon.framework.component.Component;
-
import java.io.IOException;
import java.util.List;
@@ -63,7 +61,7 @@
* @version CVS $Id$
* @since 2.0
*/
-public interface LanguageCompiler extends Component {
+public interface LanguageCompiler {
/**
* Set the name of the file containing the source program
1.2 +2 -4 cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/ProgrammingLanguage.java
Index: ProgrammingLanguage.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/language/programming/ProgrammingLanguage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProgrammingLanguage.java 9 Mar 2003 00:09:00 -0000 1.1
+++ ProgrammingLanguage.java 6 Feb 2004 23:34:33 -0000 1.2
@@ -50,8 +50,6 @@
*/
package org.apache.cocoon.components.language.programming;
-import org.apache.avalon.framework.component.Component;
-
import org.apache.cocoon.components.language.LanguageException;
import org.apache.cocoon.components.language.generator.CompiledComponent;
@@ -63,7 +61,7 @@
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
* @version CVS $Id$
*/
-public interface ProgrammingLanguage extends Component {
+public interface ProgrammingLanguage {
String ROLE = ProgrammingLanguage.class.getName();