bloritsch 01/03/11 21:18:10
Modified: src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 GeneratorSelector.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
AbstractSitemap.java SitemapComponentSelector.java
src/org/apache/cocoon/util Tag: xml-cocoon2 RoleUtils.java
webapp Tag: xml-cocoon2 cocoon.xconf
Added: src/org/apache/cocoon/components Tag: xml-cocoon2
CocoonComponentManager.java
CocoonComponentSelector.java ComponentFactory.java
ComponentPool.java ComponentPoolController.java
Removed: src/org/apache/cocoon Tag: xml-cocoon2
CocoonComponentSelector.java ComponentFactory.java
DefaultComponentManager.java
src/org/apache/cocoon/util Tag: xml-cocoon2
ComponentPool.java ComponentPoolController.java
Log:
Move all component management code into one location. Prepare
for a simpler implementation that is more extensible and easier to
maintain--but just as functional.
Revision Changes Path
No revision
No revision
1.4.2.62 +4 -4 xml-cocoon/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.4.2.61
retrieving revision 1.4.2.62
diff -u -r1.4.2.61 -r1.4.2.62
--- Cocoon.java 2001/03/12 04:38:25 1.4.2.61
+++ Cocoon.java 2001/03/12 05:17:59 1.4.2.62
@@ -35,7 +35,7 @@
import org.apache.cocoon.sitemap.Manager;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.NetUtils;
-import org.apache.cocoon.DefaultComponentManager;
+import org.apache.cocoon.components.CocoonComponentManager;
import org.apache.avalon.AbstractLoggable;
import org.xml.sax.SAXException;
import org.xml.sax.InputSource;
@@ -49,7 +49,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.4.2.61 $ $Date: 2001/03/12 04:38:25 $
+ * @version CVS $Revision: 1.4.2.62 $ $Date: 2001/03/12 05:17:59 $
*/
public class Cocoon extends AbstractLoggable implements Component,
Initializable, Modifiable, Processor, Contextualizable {
/** The application context */
@@ -80,7 +80,7 @@
private File workDir;
/** The component manager. */
- private DefaultComponentManager componentManager;
+ private CocoonComponentManager componentManager;
/** Create a new <code>Cocoon</code> instance. */
public Cocoon() throws ConfigurationException {
@@ -98,7 +98,7 @@
}
public void init() throws Exception {
- this.componentManager = new DefaultComponentManager();
+ this.componentManager = new CocoonComponentManager();
this.componentManager.contextualize(this.context);
this.componentManager.setLogger(getLogger());
No revision
No revision
1.1.2.1 +376 -0
xml-cocoon/src/org/apache/cocoon/components/Attic/CocoonComponentManager.java
1.1.2.1 +336 -0
xml-cocoon/src/org/apache/cocoon/components/Attic/CocoonComponentSelector.java
1.1.2.1 +119 -0
xml-cocoon/src/org/apache/cocoon/components/Attic/ComponentFactory.java
1.1.2.1 +286 -0
xml-cocoon/src/org/apache/cocoon/components/Attic/ComponentPool.java
1.1.2.1 +71 -0
xml-cocoon/src/org/apache/cocoon/components/Attic/ComponentPoolController.java
No revision
No revision
1.1.2.4 +3 -3
xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/GeneratorSelector.java
Index: GeneratorSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/GeneratorSelector.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- GeneratorSelector.java 2001/02/21 16:11:51 1.1.2.3
+++ GeneratorSelector.java 2001/03/12 05:18:06 1.1.2.4
@@ -17,7 +17,7 @@
import org.apache.cocoon.components.classloader.ClassLoaderManager;
import org.apache.cocoon.Roles;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.CocoonComponentSelector;
+import org.apache.cocoon.components.CocoonComponentSelector;
import org.apache.cocoon.util.ClassUtils;
/**
@@ -25,7 +25,7 @@
* includes Sitemaps and XSP Pages
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/02/21 16:11:51 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/03/12 05:18:06 $
*/
public class GeneratorSelector extends CocoonComponentSelector {
private ClassLoaderManager classManager;
@@ -67,4 +67,4 @@
public void addGenerator(Object hint, Class generator) {
this.components.put(hint, generator);
}
-}
\ No newline at end of file
+}
No revision
No revision
1.1.2.26 +2 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- AbstractSitemap.java 2001/03/12 04:39:06 1.1.2.25
+++ AbstractSitemap.java 2001/03/12 05:18:07 1.1.2.26
@@ -27,7 +27,7 @@
import org.apache.avalon.ComponentNotFoundException;
import org.apache.avalon.AbstractLoggable;
-import org.apache.cocoon.CocoonComponentSelector;
+import org.apache.cocoon.components.CocoonComponentSelector;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.Processor;
import org.apache.cocoon.Roles;
@@ -42,7 +42,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/03/12 04:39:06 $
+ * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/03/12 05:18:07 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements
Sitemap {
private Context context;
1.1.2.4 +4 -3
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapComponentSelector.java
Index: SitemapComponentSelector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/SitemapComponentSelector.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SitemapComponentSelector.java 2001/03/12 04:39:08 1.1.2.3
+++ SitemapComponentSelector.java 2001/03/12 05:18:07 1.1.2.4
@@ -17,18 +17,19 @@
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentNotFoundException;
-import org.apache.cocoon.CocoonComponentSelector;
+import org.apache.cocoon.components.CocoonComponentSelector;
import org.apache.cocoon.components.url.URLFactory;
/** Default component manager for Cocoon's sitemap components.
+ * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Id: SitemapComponentSelector.java,v 1.1.2.3 2001/03/12
04:39:08 bloritsch Exp $
+ * @version CVS $Id: SitemapComponentSelector.java,v 1.1.2.4 2001/03/12
05:18:07 bloritsch Exp $
*/
public class SitemapComponentSelector extends CocoonComponentSelector {
HashMap mime_types;
- /** The conctructors (same as the Avalon DefaultComponentManager)
+ /** The conctructors (same as the Avalon CocoonComponentManager)
*/
public SitemapComponentSelector () {
super();
No revision
No revision
1.1.2.13 +10 -10
xml-cocoon/src/org/apache/cocoon/util/Attic/RoleUtils.java
Index: RoleUtils.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/RoleUtils.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- RoleUtils.java 2001/03/05 20:29:00 1.1.2.12
+++ RoleUtils.java 2001/03/12 05:18:09 1.1.2.13
@@ -19,7 +19,7 @@
* role aliases and the real Avalon role names.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/05 20:29:00 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/12 05:18:09 $
*/
public class RoleUtils {
@@ -52,19 +52,19 @@
setup.put(Roles.STORE,
"org.apache.cocoon.components.store.MemoryStore");
setup.put(Roles.REPOSITORY,
"org.apache.cocoon.components.store.FilesystemStore");
setup.put(Roles.SERVERPAGES,
"org.apache.cocoon.components.language.generator.GeneratorSelector");
- setup.put(Roles.PROGRAMMING_LANGUAGE,
"org.apache.cocoon.CocoonComponentSelector");
- setup.put(Roles.MARKUP_LANGUAGE,
"org.apache.cocoon.CocoonComponentSelector");
+ setup.put(Roles.PROGRAMMING_LANGUAGE,
"org.apache.cocoon.components.CocoonComponentSelector");
+ setup.put(Roles.MARKUP_LANGUAGE,
"org.apache.cocoon.components.CocoonComponentSelector");
setup.put(Roles.CLASS_LOADER,
"org.apache.cocoon.components.classloader.ClassLoaderManagerImpl");
setup.put(Roles.PROGRAM_GENERATOR,
"org.apache.cocoon.components.language.generator.ProgramGeneratorImpl");
- setup.put(Roles.DB_CONNECTION,
"org.apache.cocoon.CocoonComponentSelector");
- setup.put(Roles.POOL_CONTROLLER,
"org.apache.cocoon.util.ComponentPoolController");
+ setup.put(Roles.DB_CONNECTION,
"org.apache.cocoon.components.CocoonComponentSelector");
+ setup.put(Roles.POOL_CONTROLLER,
"org.apache.cocoon.components.ComponentPoolController");
setup.put(Roles.SAX_CONNECTOR,
"org.apache.cocoon.components.saxconnector.NullSAXConnector");
setup.put(Roles.URL_FACTORY,
"org.apache.cocoon.components.url.URLFactoryImpl");
- setup.put(Roles.ACTIONS,
"org.apache.cocoon.CocoonComponentSelector");
- setup.put(Roles.MATCHERS,
"org.apache.cocoon.CocoonComponentSelector");
- setup.put(Roles.SELECTORS,
"org.apache.cocoon.CocoonComponentSelector");
- setup.put(Roles.GENERATORS,
"org.apache.cocoon.CocoonComponentSelector");
- setup.put(Roles.TRANSFORMERS,
"org.apache.cocoon.CocoonComponentSelector");
+ setup.put(Roles.ACTIONS,
"org.apache.cocoon.components.CocoonComponentSelector");
+ setup.put(Roles.MATCHERS,
"org.apache.cocoon.components.CocoonComponentSelector");
+ setup.put(Roles.SELECTORS,
"org.apache.cocoon.components.CocoonComponentSelector");
+ setup.put(Roles.GENERATORS,
"org.apache.cocoon.components.CocoonComponentSelector");
+ setup.put(Roles.TRANSFORMERS,
"org.apache.cocoon.components.CocoonComponentSelector");
setup.put(Roles.SERIALIZERS,
"org.apache.cocoon.sitemap.SitemapComponentSelector");
setup.put(Roles.READERS,
"org.apache.cocoon.sitemap.SitemapComponentSelector");
No revision
No revision
1.1.2.26 +1 -1 xml-cocoon/webapp/Attic/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/Attic/cocoon.xconf,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- cocoon.xconf 2001/03/03 15:58:43 1.1.2.25
+++ cocoon.xconf 2001/03/12 05:18:10 1.1.2.26
@@ -86,7 +86,7 @@
</datasources>
<!-- these components is used as a PoolController for the sitemap
component pools -->
- <pool-controller class="org.apache.cocoon.util.ComponentPoolController"/>
+ <pool-controller
class="org.apache.cocoon.components.ComponentPoolController"/>
<sax-connector
class="org.apache.cocoon.components.saxconnector.NullSAXConnector"/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
