You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2001/03/12 05:39:18 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/util ComponentPoolController.java
bloritsch 01/03/11 20:39:18
Modified: src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java
CocoonComponentSelector.java CodeFactory.java
ComponentFactory.java DefaultComponentManager.java
src/org/apache/cocoon/acting Tag: xml-cocoon2
AbstractAction.java
AbstractComplimentaryConfigurableAction.java
AbstractDatabaseAction.java DatabaseAddAction.java
DatabaseDeleteAction.java DatabaseUpdateAction.java
HelloAction.java
src/org/apache/cocoon/components/language/generator Tag:
xml-cocoon2 ProgramGeneratorImpl.java
src/org/apache/cocoon/components/language/markup Tag:
xml-cocoon2 AbstractMarkupLanguage.java
src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: xml-cocoon2 sitemap.xsl
src/org/apache/cocoon/components/language/programming Tag:
xml-cocoon2 AbstractProgrammingLanguage.java
src/org/apache/cocoon/components/url Tag: xml-cocoon2
URLFactoryImpl.java
src/org/apache/cocoon/generation Tag: xml-cocoon2
FileGenerator.java ScriptGenerator.java
src/org/apache/cocoon/matching Tag: xml-cocoon2
BrowserMatcherFactory.java
RegexpTargetHostMatcherFactory.java
RegexpURIMatcherFactory.java
WildcardURIMatcherFactory.java
src/org/apache/cocoon/reading Tag: xml-cocoon2
DatabaseReader.java
src/org/apache/cocoon/selection Tag: xml-cocoon2
BrowserSelectorFactory.java
CodedSelectorFactory.java
src/org/apache/cocoon/serialization Tag: xml-cocoon2
AbstractTextSerializer.java HTMLSerializer.java
TextSerializer.java XMLSerializer.java
src/org/apache/cocoon/servlet Tag: xml-cocoon2
CocoonServlet.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
AbstractSitemap.java Handler.java Manager.java
ResourcePipeline.java Sitemap.java
SitemapComponentSelector.java
src/org/apache/cocoon/transformation Tag: xml-cocoon2
TraxTransformer.java
src/org/apache/cocoon/util Tag: xml-cocoon2
ComponentPoolController.java
Log:
Upgrade to the new Configuration interface. It is more typesafe, and
actually a bit easier to use...
Revision Changes Path
No revision
No revision
1.4.2.61 +5 -5 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.60
retrieving revision 1.4.2.61
diff -u -r1.4.2.60 -r1.4.2.61
--- Cocoon.java 2001/02/26 17:41:48 1.4.2.60
+++ Cocoon.java 2001/03/12 04:38:25 1.4.2.61
@@ -22,10 +22,10 @@
import org.apache.avalon.Context;
import org.apache.avalon.Contextualizable;
import org.apache.avalon.Modifiable;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.SAXConfigurationHandler;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.SAXConfigurationHandler;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Initializable;
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.components.store.FilesystemStore;
@@ -49,7 +49,7 @@
*
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a> (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4.2.60 $ $Date: 2001/02/26 17:41:48 $
+ * @version CVS $Revision: 1.4.2.61 $ $Date: 2001/03/12 04:38:25 $
*/
public class Cocoon extends AbstractLoggable implements Component, Initializable, Modifiable, Processor, Contextualizable {
/** The application context */
1.1.2.28 +9 -13 xml-cocoon/src/org/apache/cocoon/Attic/CocoonComponentSelector.java
Index: CocoonComponentSelector.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/CocoonComponentSelector.java,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- CocoonComponentSelector.java 2001/03/03 23:35:22 1.1.2.27
+++ CocoonComponentSelector.java 2001/03/12 04:38:25 1.1.2.28
@@ -22,17 +22,14 @@
import org.apache.avalon.Recyclable;
import org.apache.avalon.Context;
import org.apache.avalon.Contextualizable;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.SingleThreaded;
import org.apache.avalon.ThreadSafe;
import org.apache.avalon.Poolable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
import org.apache.avalon.Composer;
-import org.apache.avalon.ConfigurationException;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.ComponentPool;
@@ -44,7 +41,7 @@
/** Default component manager for Cocoon's non sitemap components.
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/03/03 23:35:22 $
+ * @version CVS $Revision: 1.1.2.28 $ $Date: 2001/03/12 04:38:25 $
*/
public class CocoonComponentSelector implements Contextualizable, ComponentSelector, Composer, Configurable, ThreadSafe, Loggable {
protected Logger log;
@@ -201,15 +198,14 @@
public void configure(Configuration conf) throws ConfigurationException {
log.debug("CocoonComponentSelector setting up with root element: " + conf.getName());
- Iterator instances = conf.getChildren("component-instance");
+ Configuration[] instances = conf.getChildren("component-instance");
- while (instances.hasNext()) {
- Configuration current = (Configuration) instances.next();
- Object hint = current.getAttribute("name");
- String className = (String) current.getAttribute("class");
+ for (int i = 0; i < instances.length; i++) {
+ Object hint = instances[i].getAttribute("name");
+ String className = (String) instances[i].getAttribute("class");
try {
- this.addComponent(hint, ClassUtils.loadClass(className), current);
+ this.addComponent(hint, ClassUtils.loadClass(className), instances[i]);
} catch (Exception e) {
log.error("CocoonComponentSelector The component instance for \"" + hint + "\" has an invalid class name.", e);
throw new ConfigurationException("The component instance for '" + hint + "' has an invalid class name.", e);
1.1.2.6 +2 -2 xml-cocoon/src/org/apache/cocoon/Attic/CodeFactory.java
Index: CodeFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/CodeFactory.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- CodeFactory.java 2001/02/20 13:50:16 1.1.2.5
+++ CodeFactory.java 2001/03/12 04:38:26 1.1.2.6
@@ -8,7 +8,7 @@
package org.apache.cocoon;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.ConfigurationException;
import org.w3c.dom.NodeList;
@@ -22,7 +22,7 @@
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/02/20 13:50:16 $
+ * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/03/12 04:38:26 $
*/
public interface CodeFactory {
1.1.2.12 +3 -3 xml-cocoon/src/org/apache/cocoon/Attic/ComponentFactory.java
Index: ComponentFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/ComponentFactory.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- ComponentFactory.java 2001/03/01 19:29:02 1.1.2.11
+++ ComponentFactory.java 2001/03/12 04:38:26 1.1.2.12
@@ -11,9 +11,9 @@
import org.apache.avalon.util.pool.ObjectFactory;
import org.apache.avalon.util.pool.Pool;
-import org.apache.avalon.Configuration;
+import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Configurable;
+import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.Composer;
import org.apache.avalon.ThreadSafe;
import org.apache.avalon.Contextualizable;
@@ -29,7 +29,7 @@
/** Factory for Cocoon components.
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/01 19:29:02 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/12 04:38:26 $
*/
public class ComponentFactory implements ObjectFactory, ThreadSafe, Loggable {
private Logger log;
1.1.2.25 +17 -17 xml-cocoon/src/org/apache/cocoon/Attic/DefaultComponentManager.java
Index: DefaultComponentManager.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/DefaultComponentManager.java,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- DefaultComponentManager.java 2001/03/03 23:35:23 1.1.2.24
+++ DefaultComponentManager.java 2001/03/12 04:38:26 1.1.2.25
@@ -25,11 +25,11 @@
import org.apache.avalon.Poolable;
import org.apache.avalon.Recyclable;
import org.apache.avalon.Disposable;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.Composer;
-import org.apache.avalon.ConfigurationException;
-import org.apache.avalon.DefaultConfiguration;
+import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.configuration.DefaultConfiguration;
import org.apache.cocoon.util.ClassUtils;
import org.apache.cocoon.util.RoleUtils;
@@ -42,7 +42,7 @@
/** Default component manager for Cocoon's non sitemap components.
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/03/03 23:35:23 $
+ * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/03/12 04:38:26 $
*/
public class DefaultComponentManager implements ComponentManager, Loggable, Configurable, Contextualizable {
@@ -184,12 +184,11 @@
public void configure(Configuration conf) throws ConfigurationException {
// Set components
- Iterator e = conf.getChildren("component");
- while (e.hasNext()) {
- Configuration co = (Configuration) e.next();
- String type = co.getAttribute("type", "");
- String role = co.getAttribute("role", "");
- String className = co.getAttribute("class", "");
+ Configuration[] e = conf.getChildren("component");
+ for (int i = 0; i < e.length; i++) {
+ String type = e[i].getAttribute("type", "");
+ String role = e[i].getAttribute("role", "");
+ String className = e[i].getAttribute("class", "");
if (! "".equals(type)) {
role = RoleUtils.lookup(type);
@@ -201,7 +200,7 @@
try {
log.debug("Adding component (" + role + " = " + className + ")");
- this.addComponent(role,ClassUtils.loadClass(className),co);
+ this.addComponent(role,ClassUtils.loadClass(className),e[i]);
} catch ( Exception ex ) {
log.error("Could not load class " + className, ex);
throw new ConfigurationException("Could not get class " + className
@@ -209,14 +208,15 @@
}
}
- e = RoleUtils.shorthandNames();
- while (e.hasNext()) {
- Configuration co = conf.getChild((String) e.next());
- if (! co.getLocation().equals("-")) {
+ Iterator r = RoleUtils.shorthandNames();
+ while (r.hasNext()) {
+ Configuration co = conf.getChild((String) r.next(), false);
+
+ if (co != null) {
String role = RoleUtils.lookup(co.getName());
String className = co.getAttribute("class", "");
- if (className.equals("")) {
+ if ("".equals(className)) {
className = RoleUtils.defaultClass(role);
}
No revision
No revision
1.1.2.5 +4 -4 xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractAction.java
Index: AbstractAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractAction.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- AbstractAction.java 2001/02/09 22:16:54 1.1.2.4
+++ AbstractAction.java 2001/03/12 04:38:30 1.1.2.5
@@ -7,9 +7,9 @@
*****************************************************************************/
package org.apache.cocoon.acting;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.AbstractLoggable;
import org.apache.log.Logger;
@@ -19,7 +19,7 @@
* Actions. In order to get at the Logger, use getLogger().
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/02/09 22:16:54 $
+ * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/03/12 04:38:30 $
*/
public abstract class AbstractAction extends AbstractLoggable
implements Action, Configurable {
1.1.2.2 +6 -6 xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractComplimentaryConfigurableAction.java
Index: AbstractComplimentaryConfigurableAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractComplimentaryConfigurableAction.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbstractComplimentaryConfigurableAction.java 2001/03/06 21:17:24 1.1.2.1
+++ AbstractComplimentaryConfigurableAction.java 2001/03/12 04:38:31 1.1.2.2
@@ -12,10 +12,10 @@
import java.net.URL;
import org.apache.avalon.Component;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationBuilder;
-import org.apache.avalon.ConfigurationException;
-import org.apache.avalon.SAXConfigurationHandler;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationBuilder;
+import org.apache.avalon.configuration.ConfigurationException;
+import org.apache.avalon.configuration.SAXConfigurationHandler;
import org.apache.cocoon.components.url.URLFactory;
import org.apache.cocoon.Roles;
@@ -31,7 +31,7 @@
* effective. The name of the root configuration element is irrelevant.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/03/06 21:17:24 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/03/12 04:38:31 $
*/
public abstract class AbstractComplimentaryConfigurableAction extends ComposerAction {
private static Map configurations = new HashMap();
@@ -93,4 +93,4 @@
AbstractComplimentaryConfigurableAction.configurations.put(descriptor, conf);
}
}
-}
\ No newline at end of file
+}
1.1.2.18 +6 -6 xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java
Index: AbstractDatabaseAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/AbstractDatabaseAction.java,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- AbstractDatabaseAction.java 2001/03/08 19:29:45 1.1.2.17
+++ AbstractDatabaseAction.java 2001/03/12 04:38:31 1.1.2.18
@@ -37,11 +37,11 @@
import org.apache.avalon.ComponentManager;
import org.apache.avalon.ComponentSelector;
import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Parameters;
-import org.apache.avalon.SAXConfigurationHandler;
+import org.apache.avalon.configuration.SAXConfigurationHandler;
import org.apache.avalon.util.datasource.DataSourceComponent;
import org.apache.cocoon.Roles;
@@ -171,7 +171,7 @@
* </table>
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.17 $ $Date: 2001/03/08 19:29:45 $
+ * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/03/12 04:38:31 $
*/
public abstract class AbstractDatabaseAction extends AbstractComplimentaryConfigurableAction implements Configurable {
protected Map files = new HashMap();
@@ -373,4 +373,4 @@
DateFormat formatter = new SimpleDateFormat(format);
return formatter.parse(value).getTime();
}
-}
\ No newline at end of file
+}
1.1.2.14 +22 -32 xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java
Index: DatabaseAddAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseAddAction.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- DatabaseAddAction.java 2001/03/09 17:00:08 1.1.2.13
+++ DatabaseAddAction.java 2001/03/12 04:38:31 1.1.2.14
@@ -23,9 +23,9 @@
import org.apache.avalon.Component;
import org.apache.avalon.ComponentSelector;
import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Parameters;
import org.apache.cocoon.Roles;
@@ -40,7 +40,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/09 17:00:08 $
+ * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/03/12 04:38:31 $
*/
public class DatabaseAddAction extends AbstractDatabaseAction {
private static final Map addStatements = new HashMap();
@@ -70,14 +70,13 @@
PreparedStatement statement = conn.prepareStatement(query);
- Iterator keys = conf.getChild("table").getChild("keys").getChildren("key");
- Iterator values = conf.getChild("table").getChild("values").getChildren("value");
+ Configuration[] keys = conf.getChild("table").getChild("keys").getChildren("key");
+ Configuration[] values = conf.getChild("table").getChild("values").getChildren("value");
currentIndex = 1;
- while (keys.hasNext()) {
- Configuration key = (Configuration) keys.next();
- if ("manual".equals(key.getAttribute("mode", "automatic"))) {
- String selectQuery = this.getSelectQuery(key);
+ for (int i = 0; i < keys.length; i++, currentIndex++) {
+ if ("manual".equals(keys[i].getAttribute("mode", "automatic"))) {
+ String selectQuery = this.getSelectQuery(keys[i]);
ResultSet set = conn.createStatement().executeQuery(selectQuery);
set.next();
@@ -87,14 +86,11 @@
set.close();
set.getStatement().close();
- currentIndex++;
}
}
- for (int i = currentIndex; values.hasNext(); i++) {
- Configuration itemConf = (Configuration) values.next();
- this.setColumn(statement, i, request, itemConf);
- currentIndex = i;
+ for (int i = 0; i < values.length; i++, currentIndex++) {
+ this.setColumn(statement, currentIndex, request, values[i]);
}
statement.execute();
@@ -138,41 +134,35 @@
if (query == null) {
Configuration table = conf.getChild("table");
- Iterator values = table.getChild("values").getChildren("value");
- Iterator keys = table.getChild("keys").getChildren("key");
+ Configuration[] values = table.getChild("values").getChildren("value");
+ Configuration[] keys = table.getChild("keys").getChildren("key");
StringBuffer queryBuffer = new StringBuffer("INSERT INTO ");
queryBuffer.append(table.getAttribute("name"));
queryBuffer.append(" (");
- boolean firstIteration = true;
int numKeys = 0;
- while (keys.hasNext()) {
- Configuration key = (Configuration) keys.next();
- if ("manual".equals(key.getAttribute("mode", "automatic"))) {
- if (firstIteration) {
- firstIteration = false;
- } else {
+ for (int i = 0; i < keys.length; i++) {
+ if ("manual".equals(keys[i].getAttribute("mode", "automatic"))) {
+ if (i > 0) {
queryBuffer.append(", ");
}
- queryBuffer.append(key.getAttribute("dbcol"));
- this.setSelectQuery(table.getAttribute("name"), key);
+ queryBuffer.append(keys[i].getAttribute("dbcol"));
+ this.setSelectQuery(table.getAttribute("name"), keys[i]);
numKeys++;
}
}
int numValues = 0;
- while (values.hasNext()) {
- if (firstIteration) {
- firstIteration = false;
- } else {
+ for (int i = 0; i < values.length; i++) {
+ if (i > 0) {
queryBuffer.append(", ");
}
- queryBuffer.append(((Configuration) values.next()).getAttribute("dbcol"));
+ queryBuffer.append(values[i].getAttribute("dbcol"));
numValues++;
}
@@ -216,4 +206,4 @@
private final synchronized String getSelectQuery(Configuration entry) throws ConfigurationException {
return (String) DatabaseAddAction.selectStatements.get(entry);
}
-}
\ No newline at end of file
+}
1.1.2.9 +12 -17 xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java
Index: DatabaseDeleteAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseDeleteAction.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- DatabaseDeleteAction.java 2001/03/09 16:10:27 1.1.2.8
+++ DatabaseDeleteAction.java 2001/03/12 04:38:32 1.1.2.9
@@ -23,9 +23,9 @@
import org.apache.avalon.Component;
import org.apache.avalon.ComponentSelector;
import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Parameters;
import org.apache.cocoon.Roles;
@@ -43,7 +43,7 @@
* the keys.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/03/09 16:10:27 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/03/12 04:38:32 $
*/
public final class DatabaseDeleteAction extends AbstractDatabaseAction {
private static final Map deleteStatements = new HashMap();
@@ -71,11 +71,10 @@
PreparedStatement statement = conn.prepareStatement(query);
- Iterator keys = conf.getChild("table").getChild("keys").getChildren("key");
+ Configuration[] keys = conf.getChild("table").getChild("keys").getChildren("key");
- for (currentIndex = 1; keys.hasNext(); currentIndex++) {
- Configuration itemConf = (Configuration) keys.next();
- this.setColumn(statement, currentIndex, request, itemConf);
+ for (int i = 0; i < keys.length; i++) {
+ this.setColumn(statement, i + 1, request, keys[i]);
}
statement.execute();
@@ -115,22 +114,18 @@
if (query == null) {
Configuration table = conf.getChild("table");
- Iterator keys = table.getChild("keys").getChildren("key");
+ Configuration[] keys = table.getChild("keys").getChildren("key");
StringBuffer queryBuffer = new StringBuffer("DELETE FROM ");
queryBuffer.append(table.getAttribute("name"));
queryBuffer.append(" WHERE ");
- boolean firstIteration = true;
-
- while (keys.hasNext()) {
- if (firstIteration) {
- firstIteration = false;
- } else {
+ for (int i = 0; i < keys.length; i++) {
+ if (i > 0) {
queryBuffer.append(" AND ");
}
- queryBuffer.append(((Configuration) keys.next()).getAttribute("dbcol"));
+ queryBuffer.append((keys[i]).getAttribute("dbcol"));
queryBuffer.append(" = ?");
}
@@ -142,4 +137,4 @@
return query;
}
-}
\ No newline at end of file
+}
1.1.2.13 +20 -31 xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java
Index: DatabaseUpdateAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DatabaseUpdateAction.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- DatabaseUpdateAction.java 2001/03/09 16:10:27 1.1.2.12
+++ DatabaseUpdateAction.java 2001/03/12 04:38:32 1.1.2.13
@@ -23,9 +23,9 @@
import org.apache.avalon.Component;
import org.apache.avalon.ComponentSelector;
import org.apache.avalon.ComponentManagerException;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Parameters;
import org.apache.cocoon.Roles;
@@ -40,7 +40,7 @@
* only one table at a time to update.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/09 16:10:27 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/12 04:38:32 $
*/
public class DatabaseUpdateAction extends AbstractDatabaseAction {
private static final Map updateStatements = new HashMap();
@@ -68,20 +68,16 @@
PreparedStatement statement = conn.prepareStatement(query);
- Iterator keys = conf.getChild("table").getChild("keys").getChildren("key");
- Iterator values = conf.getChild("table").getChild("values").getChildren("value");
+ Configuration[] keys = conf.getChild("table").getChild("keys").getChildren("key");
+ Configuration[] values = conf.getChild("table").getChild("values").getChildren("value");
currentIndex = 1;
- for (int i = currentIndex; values.hasNext(); i++) {
- Configuration itemConf = (Configuration) values.next();
- this.setColumn(statement, i, request, itemConf);
- currentIndex = i;
+ for (int i = 0; i < values.length; i++, currentIndex++) {
+ this.setColumn(statement, currentIndex, request, values[i]);
}
- for (int i = currentIndex + 1; keys.hasNext(); i++) {
- Configuration itemConf = (Configuration) keys.next();
- this.setColumn(statement, i, request, itemConf);
- currentIndex = i;
+ for (int i = 0; i < keys.length; i++, currentIndex++) {
+ this.setColumn(statement, currentIndex, request, keys[i]);
}
statement.execute();
@@ -121,37 +117,30 @@
if (query == null) {
Configuration table = conf.getChild("table");
- Iterator keys = table.getChild("keys").getChildren("key");
- Iterator values = table.getChild("values").getChildren("value");
+ Configuration[] keys = table.getChild("keys").getChildren("key");
+ Configuration[] values = table.getChild("values").getChildren("value");
StringBuffer queryBuffer = new StringBuffer("UPDATE ");
queryBuffer.append(table.getAttribute("name"));
queryBuffer.append(" SET ");
- boolean firstIteration = true;
-
- while (values.hasNext()) {
- if (firstIteration) {
- firstIteration = false;
- } else {
- queryBuffer.append(", ");
+ for (int i = 0; i < values.length; i++) {
+ if (i > 0) {
+ queryBuffer.append(", ");
}
- queryBuffer.append(((Configuration) values.next()).getAttribute("dbcol"));
+ queryBuffer.append(values[i].getAttribute("dbcol"));
queryBuffer.append(" = ?");
}
queryBuffer.append(" WHERE ");
- firstIteration = true;
- while (keys.hasNext()) {
- if (firstIteration) {
- firstIteration = false;
- } else {
+ for (int i = 0; i < keys.length; i++) {
+ if (i > 0) {
queryBuffer.append(" AND ");
}
- queryBuffer.append(((Configuration) keys.next()).getAttribute("dbcol"));
+ queryBuffer.append(keys[i].getAttribute("dbcol"));
queryBuffer.append(" = ?");
}
@@ -163,4 +152,4 @@
return query;
}
-}
\ No newline at end of file
+}
1.1.2.10 +3 -3 xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java
Index: HelloAction.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/HelloAction.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- HelloAction.java 2001/02/09 22:16:54 1.1.2.9
+++ HelloAction.java 2001/03/12 04:38:32 1.1.2.10
@@ -14,8 +14,8 @@
import javax.servlet.ServletContext;
import org.apache.avalon.Component;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Parameters;
import org.xml.sax.SAXException;
@@ -28,7 +28,7 @@
* has been created or not.
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/09 22:16:54 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/12 04:38:32 $
*/
public class HelloAction extends ComposerAction {
No revision
No revision
1.1.2.41 +4 -4 xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/generator/Attic/ProgramGeneratorImpl.java,v
retrieving revision 1.1.2.40
retrieving revision 1.1.2.41
diff -u -r1.1.2.40 -r1.1.2.41
--- ProgramGeneratorImpl.java 2001/03/02 12:42:59 1.1.2.40
+++ ProgramGeneratorImpl.java 2001/03/12 04:38:37 1.1.2.41
@@ -22,9 +22,9 @@
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.Context;
import org.apache.avalon.Contextualizable;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.ComponentSelector;
import org.apache.avalon.ThreadSafe;
import org.apache.avalon.Parameters;
@@ -46,7 +46,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.40 $ $Date: 2001/03/02 12:42:59 $
+ * @version CVS $Revision: 1.1.2.41 $ $Date: 2001/03/12 04:38:37 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable implements ProgramGenerator, Contextualizable, Composer, Configurable, ThreadSafe {
No revision
No revision
1.1.2.27 +11 -14 xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java
Index: AbstractMarkupLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/Attic/AbstractMarkupLanguage.java,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- AbstractMarkupLanguage.java 2001/02/22 19:07:48 1.1.2.26
+++ AbstractMarkupLanguage.java 2001/03/12 04:38:40 1.1.2.27
@@ -18,7 +18,6 @@
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Enumeration;
-import java.util.Iterator;
import org.xml.sax.InputSource;
import org.xml.sax.EntityResolver;
@@ -32,9 +31,9 @@
import org.apache.avalon.Composer;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Parameters;
import org.apache.avalon.AbstractLoggable;
@@ -48,7 +47,7 @@
* Base implementation of <code>MarkupLanguage</code>. This class uses
* logicsheets as the only means of code generation. Code generation should be decoupled from this context!!!
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/02/22 19:07:48 $
+ * @version CVS $Revision: 1.1.2.27 $ $Date: 2001/03/12 04:38:40 $
*/
public abstract class AbstractMarkupLanguage extends AbstractLoggable implements MarkupLanguage, Composer, Configurable {
/** The supported language table */
@@ -101,12 +100,11 @@
public void configure(Configuration conf) throws ConfigurationException {
try {
// Set up each target-language
- Iterator l = conf.getChildren("target-language");
- while (l.hasNext()) {
- Configuration lc = (Configuration)l.next();
+ Configuration[] l = conf.getChildren("target-language");
+ for (int i = 0; i < l.length; i++) {
LanguageDescriptor language = new LanguageDescriptor();
- language.setName(lc.getAttribute("name"));
- Parameters lcp = Parameters.fromConfiguration(lc);
+ language.setName(l[i].getAttribute("name"));
+ Parameters lcp = Parameters.fromConfiguration(l[i]);
// Create & Store the core logicsheet
CachedURL entry = createLogicsheet(lcp, false);
@@ -118,10 +116,9 @@
language.setLogicsheet(logicsheetName);
// Set up each built-in logicsheet
- Iterator n = lc.getChildren("builtin-logicsheet");
- while (n.hasNext()) {
- Configuration nc = (Configuration)n.next();
- Parameters ncp = Parameters.fromConfiguration(nc);
+ Configuration[] n = l[i].getChildren("builtin-logicsheet");
+ for (int j = 0; j < n.length; j++) {
+ Parameters ncp = Parameters.fromConfiguration(n[j]);
// Create & Store the named logicsheets
CachedURL namedEntry = createLogicsheet(ncp, true);
No revision
No revision
1.1.2.89 +5 -5 xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.1.2.88
retrieving revision 1.1.2.89
diff -u -r1.1.2.88 -r1.1.2.89
--- sitemap.xsl 2001/03/06 21:55:39 1.1.2.88
+++ sitemap.xsl 2001/03/12 04:38:43 1.1.2.89
@@ -67,10 +67,10 @@
import javax.servlet.http.HttpServletRequest;
- import org.apache.avalon.Configurable;
- import org.apache.avalon.Configuration;
- import org.apache.avalon.ConfigurationException;
- import org.apache.avalon.DefaultConfiguration;
+ import org.apache.avalon.configuration.Configurable;
+ import org.apache.avalon.configuration.Configuration;
+ import org.apache.avalon.configuration.ConfigurationException;
+ import org.apache.avalon.configuration.DefaultConfiguration;
import org.apache.avalon.Parameters;
import org.apache.regexp.RE;
@@ -94,7 +94,7 @@
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Id: sitemap.xsl,v 1.1.2.88 2001/03/06 21:55:39 bloritsch Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.1.2.89 2001/03/12 04:38:43 bloritsch Exp $
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemap {
static final String LOCATION = "<xsl:value-of select="translate(@file-path, '/', '.')"/>.<xsl:value-of select="@file-name"/>";
No revision
No revision
1.1.2.11 +4 -4 xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/AbstractProgrammingLanguage.java
Index: AbstractProgrammingLanguage.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/Attic/AbstractProgrammingLanguage.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- AbstractProgrammingLanguage.java 2001/01/22 21:56:37 1.1.2.10
+++ AbstractProgrammingLanguage.java 2001/03/12 04:38:50 1.1.2.11
@@ -9,9 +9,9 @@
import java.io.File;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Parameters;
@@ -27,7 +27,7 @@
* unloading.
*
* @author <a href="mailto:ricardo@apache.org">Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/01/22 21:56:37 $
+ * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/12 04:38:50 $
*/
public abstract class AbstractProgrammingLanguage
implements ProgrammingLanguage, Configurable, Loggable
No revision
No revision
1.1.2.6 +12 -14 xml-cocoon/src/org/apache/cocoon/components/url/Attic/URLFactoryImpl.java
Index: URLFactoryImpl.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/url/Attic/URLFactoryImpl.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- URLFactoryImpl.java 2001/02/19 16:58:52 1.1.2.5
+++ URLFactoryImpl.java 2001/03/12 04:38:50 1.1.2.6
@@ -15,9 +15,9 @@
import java.util.Map;
import org.apache.avalon.Component;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Context;
import org.apache.avalon.Contextualizable;
import org.apache.avalon.AbstractLoggable;
@@ -29,7 +29,7 @@
/**
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version $Id: URLFactoryImpl.java,v 1.1.2.5 2001/02/19 16:58:52 prussell Exp $
+ * @version $Id: URLFactoryImpl.java,v 1.1.2.6 2001/03/12 04:38:50 bloritsch Exp $
*/
public class URLFactoryImpl extends AbstractLoggable implements URLFactory, Component, Configurable, Contextualizable {
@@ -102,20 +102,18 @@
try {
getLogger().debug("Getting the URLFactories");
factories = new HashMap();
- Iterator iter = conf.getChildren("protocol");
- Configuration config = null;
+ Configuration[] configs = conf.getChildren("protocol");
URLFactory urlFactory = null;
String protocol = null;
- while (iter.hasNext()) {
- config = (Configuration)iter.next();
- protocol = config.getAttribute("name");
- getLogger().debug("\tfor protocol: " + protocol + " " + config.getAttribute("class"));
- urlFactory = (URLFactory) ClassUtils.newInstance(config.getAttribute("class"));
- if (urlFactory instanceof Loggable) {
- ((Loggable) urlFactory).setLogger(getLogger());
- }
+ for (int i = 0; i < configs.length; i++) {
+ protocol = configs[i].getAttribute("name");
+ getLogger().debug("\tfor protocol: " + protocol + " " + configs[i].getAttribute("class"));
+ urlFactory = (URLFactory) ClassUtils.newInstance(configs[i].getAttribute("class"));
if (urlFactory instanceof Contextualizable) {
((Contextualizable) urlFactory).contextualize (this.context);
+ }
+ if (urlFactory instanceof Loggable) {
+ ((Loggable) urlFactory).setLogger(getLogger());
}
factories.put(protocol, urlFactory);
}
No revision
No revision
1.1.2.24 +4 -4 xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java
Index: FileGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/FileGenerator.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- FileGenerator.java 2001/03/05 14:44:48 1.1.2.23
+++ FileGenerator.java 2001/03/12 04:38:52 1.1.2.24
@@ -27,9 +27,9 @@
import org.apache.avalon.ComponentManager;
import org.apache.avalon.ComponentNotFoundException;
import org.apache.avalon.ComponentNotAccessibleException;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Parameters;
import org.apache.avalon.Poolable;
import org.apache.avalon.Component;
@@ -59,7 +59,7 @@
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.23 $ $Date: 2001/03/05 14:44:48 $
+ * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/03/12 04:38:52 $
*/
public class FileGenerator extends ComposerGenerator implements Poolable, Configurable {
1.1.2.2 +4 -4 xml-cocoon/src/org/apache/cocoon/generation/Attic/ScriptGenerator.java
Index: ScriptGenerator.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/generation/Attic/ScriptGenerator.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ScriptGenerator.java 2001/03/08 15:24:39 1.1.2.1
+++ ScriptGenerator.java 2001/03/12 04:38:52 1.1.2.2
@@ -16,9 +16,9 @@
// Avalon imports
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
// Java runtime imports
@@ -43,7 +43,7 @@
* and additional interpreter (Rhino, Jython, etc.) as a Cocoon Generator
*
* @author <a href="mailto:jafoster@engmail.uwaterloo.ca">Jason Foster</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/03/08 15:24:39 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/03/12 04:38:52 $
*/
public class ScriptGenerator extends ComposerGenerator {
No revision
No revision
1.1.2.13 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/BrowserMatcherFactory.java
Index: BrowserMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/BrowserMatcherFactory.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- BrowserMatcherFactory.java 2001/02/20 13:50:20 1.1.2.12
+++ BrowserMatcherFactory.java 2001/03/12 04:38:55 1.1.2.13
@@ -13,7 +13,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.NamedNodeMap;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.xerces.dom.TreeWalkerImpl;
@@ -23,7 +23,7 @@
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/02/20 13:50:20 $
+ * @version CVS $Revision: 1.1.2.13 $ $Date: 2001/03/12 04:38:55 $
*/
public class BrowserMatcherFactory implements org.apache.cocoon.CodeFactory {
1.1.2.10 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java
Index: RegexpTargetHostMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpTargetHostMatcherFactory.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- RegexpTargetHostMatcherFactory.java 2001/02/23 15:08:10 1.1.2.9
+++ RegexpTargetHostMatcherFactory.java 2001/03/12 04:38:56 1.1.2.10
@@ -13,7 +13,7 @@
import org.apache.regexp.REProgram;
import org.apache.regexp.RESyntaxException;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.ConfigurationException;
import org.w3c.dom.NodeList;
@@ -27,7 +27,7 @@
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/23 15:08:10 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/12 04:38:56 $
*/
public class RegexpTargetHostMatcherFactory implements CodeFactory, Loggable {
1.1.2.22 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java
Index: RegexpURIMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/RegexpURIMatcherFactory.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- RegexpURIMatcherFactory.java 2001/02/20 13:50:22 1.1.2.21
+++ RegexpURIMatcherFactory.java 2001/03/12 04:38:56 1.1.2.22
@@ -13,7 +13,7 @@
import org.apache.regexp.REProgram;
import org.apache.regexp.RESyntaxException;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.ConfigurationException;
import org.w3c.dom.NodeList;
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/02/20 13:50:22 $
+ * @version CVS $Revision: 1.1.2.22 $ $Date: 2001/03/12 04:38:56 $
*/
public class RegexpURIMatcherFactory implements CodeFactory, Loggable {
1.1.2.30 +2 -2 xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java
Index: WildcardURIMatcherFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/matching/Attic/WildcardURIMatcherFactory.java,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- WildcardURIMatcherFactory.java 2001/02/20 13:50:22 1.1.2.29
+++ WildcardURIMatcherFactory.java 2001/03/12 04:38:56 1.1.2.30
@@ -10,7 +10,7 @@
import org.apache.cocoon.CodeFactory;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.ConfigurationException;
import org.w3c.dom.NodeList;
@@ -24,7 +24,7 @@
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.29 $ $Date: 2001/02/20 13:50:22 $
+ * @version CVS $Revision: 1.1.2.30 $ $Date: 2001/03/12 04:38:56 $
*/
public class WildcardURIMatcherFactory implements CodeFactory, Loggable {
No revision
No revision
1.1.2.5 +4 -4 xml-cocoon/src/org/apache/cocoon/reading/Attic/DatabaseReader.java
Index: DatabaseReader.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/reading/Attic/DatabaseReader.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- DatabaseReader.java 2001/03/09 16:11:22 1.1.2.4
+++ DatabaseReader.java 2001/03/12 04:38:58 1.1.2.5
@@ -13,9 +13,9 @@
import org.apache.avalon.ComponentManager;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.util.datasource.DataSourceComponent;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.cocoon.Roles;
import org.apache.cocoon.ProcessingException;
@@ -229,4 +229,4 @@
response.setHeader("Accept-Ranges", "bytes");
out.write(bytes);
}
-}
\ No newline at end of file
+}
No revision
No revision
1.1.2.15 +2 -2 xml-cocoon/src/org/apache/cocoon/selection/Attic/BrowserSelectorFactory.java
Index: BrowserSelectorFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/BrowserSelectorFactory.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- BrowserSelectorFactory.java 2001/02/20 13:50:26 1.1.2.14
+++ BrowserSelectorFactory.java 2001/03/12 04:38:59 1.1.2.15
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.selection;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.ConfigurationException;
import org.w3c.dom.NodeList;
import org.w3c.dom.traversal.TreeWalker;
@@ -26,7 +26,7 @@
* @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.2.14 $ $Date: 2001/02/20 13:50:26 $
+ * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/03/12 04:38:59 $
*/
1.1.2.9 +2 -2 xml-cocoon/src/org/apache/cocoon/selection/Attic/CodedSelectorFactory.java
Index: CodedSelectorFactory.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/selection/Attic/CodedSelectorFactory.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- CodedSelectorFactory.java 2001/02/20 13:50:27 1.1.2.8
+++ CodedSelectorFactory.java 2001/03/12 04:38:59 1.1.2.9
@@ -8,7 +8,7 @@
package org.apache.cocoon.selection;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.ConfigurationException;
import org.w3c.dom.NodeList;
import org.apache.cocoon.CodeFactory;
@@ -18,7 +18,7 @@
* embedded java code within the 'test' clause of the select.
*
* @author <a href="mailto:Marcus.Crafter@osa.de">Marcus Crafter</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/02/20 13:50:27 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/03/12 04:38:59 $
*/
public class CodedSelectorFactory extends java.lang.Object
implements CodeFactory {
No revision
No revision
1.1.2.8 +4 -4 xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/AbstractTextSerializer.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- AbstractTextSerializer.java 2001/02/20 21:06:45 1.1.2.7
+++ AbstractTextSerializer.java 2001/03/12 04:39:00 1.1.2.8
@@ -10,9 +10,9 @@
import java.util.Properties;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.OutputKeys;
@@ -22,7 +22,7 @@
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.7 $ $Date: 2001/02/20 21:06:45 $
+ * @version CVS $Revision: 1.1.2.8 $ $Date: 2001/03/12 04:39:00 $
*/
public abstract class AbstractTextSerializer extends AbstractSerializer implements Configurable {
1.1.2.16 +2 -2 xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java
Index: HTMLSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/HTMLSerializer.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- HTMLSerializer.java 2001/03/09 11:41:31 1.1.2.15
+++ HTMLSerializer.java 2001/03/12 04:39:01 1.1.2.16
@@ -11,7 +11,7 @@
import java.io.OutputStream;
import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Poolable;
import javax.xml.transform.sax.TransformerHandler;
@@ -20,7 +20,7 @@
/**
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/03/09 11:41:31 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/03/12 04:39:01 $
*/
public class HTMLSerializer extends AbstractTextSerializer implements Poolable {
1.1.2.12 +3 -3 xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java
Index: TextSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/TextSerializer.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- TextSerializer.java 2001/03/09 11:41:33 1.1.2.11
+++ TextSerializer.java 2001/03/12 04:39:01 1.1.2.12
@@ -14,13 +14,13 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.OutputKeys;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Poolable;
/**
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.11 $ $Date: 2001/03/09 11:41:33 $
+ * @version CVS $Revision: 1.1.2.12 $ $Date: 2001/03/12 04:39:01 $
*/
public class TextSerializer extends AbstractTextSerializer implements Poolable {
1.1.2.16 +3 -3 xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java
Index: XMLSerializer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/serialization/Attic/XMLSerializer.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- XMLSerializer.java 2001/03/09 11:41:34 1.1.2.15
+++ XMLSerializer.java 2001/03/12 04:39:02 1.1.2.16
@@ -14,13 +14,13 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.OutputKeys;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Poolable;
/**
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.15 $ $Date: 2001/03/09 11:41:34 $
+ * @version CVS $Revision: 1.1.2.16 $ $Date: 2001/03/12 04:39:02 $
*/
public class XMLSerializer extends AbstractTextSerializer implements Poolable {
No revision
No revision
1.1.4.70 +2 -2 xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java
Index: CocoonServlet.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/servlet/Attic/CocoonServlet.java,v
retrieving revision 1.1.4.69
retrieving revision 1.1.4.70
diff -u -r1.1.4.69 -r1.1.4.70
--- CocoonServlet.java 2001/03/07 15:53:50 1.1.4.69
+++ CocoonServlet.java 2001/03/12 04:39:04 1.1.4.70
@@ -30,7 +30,7 @@
import org.xml.sax.SAXException;
import org.apache.avalon.ComponentNotAccessibleException;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.DefaultContext;
import org.apache.cocoon.Cocoon;
@@ -62,7 +62,7 @@
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
* @author <a href="mailto:nicolaken@supereva.it">Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.1.4.69 $ $Date: 2001/03/07 15:53:50 $
+ * @version CVS $Revision: 1.1.4.70 $ $Date: 2001/03/12 04:39:04 $
*/
public class CocoonServlet extends HttpServlet {
No revision
No revision
1.1.2.25 +3 -3 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.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- AbstractSitemap.java 2001/02/22 17:10:51 1.1.2.24
+++ AbstractSitemap.java 2001/03/12 04:39:06 1.1.2.25
@@ -21,8 +21,8 @@
import org.apache.avalon.Context;
import org.apache.avalon.Component;
import org.apache.avalon.Composer;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentNotFoundException;
import org.apache.avalon.AbstractLoggable;
@@ -42,7 +42,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.24 $ $Date: 2001/02/22 17:10:51 $
+ * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/03/12 04:39:06 $
*/
public abstract class AbstractSitemap extends AbstractLoggable implements Sitemap {
private Context context;
1.1.2.19 +3 -3 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- Handler.java 2001/02/22 19:08:10 1.1.2.18
+++ Handler.java 2001/03/12 04:39:06 1.1.2.19
@@ -26,8 +26,8 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.Roles;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.Composer;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Contextualizable;
@@ -41,7 +41,7 @@
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.18 $ $Date: 2001/02/22 19:08:10 $
+ * @version CVS $Revision: 1.1.2.19 $ $Date: 2001/03/12 04:39:06 $
*/
public class Handler extends AbstractLoggable implements Runnable, Configurable, Composer, Contextualizable, Processor {
private Context context;
1.1.2.10 +3 -3 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java
Index: Manager.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Manager.java 2001/02/20 12:47:43 1.1.2.9
+++ Manager.java 2001/03/12 04:39:07 1.1.2.10
@@ -19,8 +19,8 @@
import org.apache.avalon.Context;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.Loggable;
import org.apache.avalon.AbstractLoggable;
@@ -37,7 +37,7 @@
* checking regeneration of the sub <code>Sitemap</code>
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/20 12:47:43 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/12 04:39:07 $
*/
public class Manager extends AbstractLoggable implements Configurable, Composer, Contextualizable {
1.1.2.26 +3 -3 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java
Index: ResourcePipeline.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/ResourcePipeline.java,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- ResourcePipeline.java 2001/03/03 16:04:58 1.1.2.25
+++ ResourcePipeline.java 2001/03/12 04:39:07 1.1.2.26
@@ -12,8 +12,8 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentSelector;
@@ -41,7 +41,7 @@
/**
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.25 $ $Date: 2001/03/03 16:04:58 $
+ * @version CVS $Revision: 1.1.2.26 $ $Date: 2001/03/12 04:39:07 $
*/
public class ResourcePipeline implements Composer {
private Generator generator;
1.1.4.15 +2 -2 xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Sitemap.java
Index: Sitemap.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Sitemap.java,v
retrieving revision 1.1.4.14
retrieving revision 1.1.4.15
diff -u -r1.1.4.14 -r1.1.4.15
--- Sitemap.java 2001/02/19 21:57:51 1.1.4.14
+++ Sitemap.java 2001/03/12 04:39:08 1.1.4.15
@@ -7,7 +7,7 @@
*****************************************************************************/
package org.apache.cocoon.sitemap;
-import org.apache.avalon.Configurable;
+import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Contextualizable;
@@ -18,7 +18,7 @@
* Base interface for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.4.14 $ $Date: 2001/02/19 21:57:51 $
+ * @version CVS $Revision: 1.1.4.15 $ $Date: 2001/03/12 04:39:08 $
*/
public interface Sitemap extends CompiledComponent, Configurable, Contextualizable, Processor {
int GENERATOR = 1;
1.1.2.3 +3 -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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SitemapComponentSelector.java 2001/02/19 21:57:52 1.1.2.2
+++ SitemapComponentSelector.java 2001/03/12 04:39:08 1.1.2.3
@@ -12,8 +12,8 @@
import org.apache.avalon.Composer;
import org.apache.avalon.ComponentManager;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManagerException;
import org.apache.avalon.ComponentNotFoundException;
@@ -23,7 +23,7 @@
/** Default component manager for Cocoon's sitemap components.
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Id: SitemapComponentSelector.java,v 1.1.2.2 2001/02/19 21:57:52 bloritsch Exp $
+ * @version CVS $Id: SitemapComponentSelector.java,v 1.1.2.3 2001/03/12 04:39:08 bloritsch Exp $
*/
public class SitemapComponentSelector extends CocoonComponentSelector {
HashMap mime_types;
No revision
No revision
1.1.2.10 +4 -4 xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java
Index: TraxTransformer.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/transformation/Attic/TraxTransformer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- TraxTransformer.java 2001/02/23 14:01:27 1.1.2.9
+++ TraxTransformer.java 2001/03/12 04:39:14 1.1.2.10
@@ -20,11 +20,11 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.avalon.Component;
-import org.apache.avalon.ConfigurationException;
+import org.apache.avalon.configuration.ConfigurationException;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
-import org.apache.avalon.Configurable;
-import org.apache.avalon.Configuration;
+import org.apache.avalon.configuration.Configurable;
+import org.apache.avalon.configuration.Configuration;
import org.apache.avalon.Poolable;
import org.apache.avalon.Recyclable;
import org.apache.avalon.Parameters;
@@ -58,7 +58,7 @@
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
* @author <a href="mailto:cziegeler@sundn.de">Carsten Ziegeler</a>
- * @version CVS $Revision: 1.1.2.9 $ $Date: 2001/02/23 14:01:27 $
+ * @version CVS $Revision: 1.1.2.10 $ $Date: 2001/03/12 04:39:14 $
*/
public class TraxTransformer extends ContentHandlerWrapper
implements Transformer, Composer, Poolable, Recyclable, Configurable {
No revision
No revision
1.1.2.4 +4 -4 xml-cocoon/src/org/apache/cocoon/util/Attic/ComponentPoolController.java
Index: ComponentPoolController.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/ComponentPoolController.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ComponentPoolController.java 2001/02/20 20:34:22 1.1.2.3
+++ ComponentPoolController.java 2001/03/12 04:39:17 1.1.2.4
@@ -11,8 +11,8 @@
import org.apache.avalon.Component;
import org.apache.avalon.ComponentManager;
import org.apache.avalon.Composer;
-import org.apache.avalon.Configuration;
-import org.apache.avalon.Configurable;
+import org.apache.avalon.configuration.Configuration;
+import org.apache.avalon.configuration.Configurable;
import org.apache.avalon.ThreadSafe;
import org.apache.avalon.util.pool.PoolController;
@@ -23,7 +23,7 @@
* a spezial behaviour or treatment.
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/02/20 20:34:22 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/03/12 04:39:17 $
*/
public class ComponentPoolController implements PoolController, ThreadSafe, Component {
@@ -68,4 +68,4 @@
*/
return amount;
}
-}
\ No newline at end of file
+}
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org