vgritsenko 2002/05/31 07:22:38
Modified: . Tag: cocoon_2_0_3_branch changes.xml
. changes.xml
src/java/org/apache/cocoon/components/url
URLFactoryImpl.java
Log:
Fix bug #8639: Respect Parameterizable interface on URLFactories
Revision Changes Path
No revision
No revision
1.138.2.16 +4 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.138.2.15
retrieving revision 1.138.2.16
diff -u -r1.138.2.15 -r1.138.2.16
--- changes.xml 23 May 2002 15:15:01 -0000 1.138.2.15
+++ changes.xml 31 May 2002 14:22:38 -0000 1.138.2.16
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.138.2.15 2002/05/23 15:15:01 froehlich Exp $
+ $Id: changes.xml,v 1.138.2.16 2002/05/31 14:22:38 vgritsenko Exp $
-->
<changes title="History of Changes">
@@ -37,6 +37,9 @@
<release version="@version@" date="@date@">
+ <action dev="VG" type="fix" fixes-bug="8639">
+ Support Parameterizable URLFactories.
+ </action>
<action dev="GF" type="fix" fixes-bug="9064" due-to="Jeroen ter Voorde"
due-to-email=" [EMAIL PROTECTED]">
Fixed multipart request problems with IE6.
</action>
1.178 +5 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- changes.xml 29 May 2002 12:50:20 -0000 1.177
+++ changes.xml 31 May 2002 14:22:38 -0000 1.178
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.177 2002/05/29 12:50:20 cziegeler Exp $
+ $Id: changes.xml,v 1.178 2002/05/31 14:22:38 vgritsenko Exp $
-->
<changes title="History of Changes">
@@ -38,6 +38,9 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="VG" type="fix" fixes-bug="8639">
+ Support Parameterizable URLFactories.
+ </action>
<action dev="CZ" type="add">
Added custom component configuration to map:pipelines section.
</action>
@@ -90,6 +93,7 @@
<action dev="NKB" type="add" due-to="Stephan Michels"
due-to-email="[EMAIL PROTECTED]">
Added Jakarta Slide Source components and examples in scratchpad.
</action>
+>>>>>>> 1.177
<action dev="VG" type="fix" fixes-bug="3372">
Added ability to run Cocoon on Novell OS.
</action>
1.7 +8 -3
xml-cocoon2/src/java/org/apache/cocoon/components/url/URLFactoryImpl.java
Index: URLFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/url/URLFactoryImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- URLFactoryImpl.java 26 Apr 2002 11:01:33 -0000 1.6
+++ URLFactoryImpl.java 31 May 2002 14:22:38 -0000 1.7
@@ -63,6 +63,9 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.Constants;
import org.apache.cocoon.util.ClassUtils;
@@ -79,7 +82,7 @@
* @deprecated by the new source resolving of avalon excalibur
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version $Id: URLFactoryImpl.java,v 1.6 2002/04/26 11:01:33 cziegeler Exp $
+ * @version $Id: URLFactoryImpl.java,v 1.7 2002/05/31 14:22:38 vgritsenko Exp $
*/
public class URLFactoryImpl
extends AbstractLoggable
@@ -225,7 +228,7 @@
* Init a url factory
*/
private void init(URLFactory factory, Configuration config)
- throws ContextException, ComponentException, ConfigurationException {
+ throws ContextException, ComponentException, ConfigurationException,
ParameterException {
if (factory instanceof Loggable) {
((Loggable) factory).setLogger(getLogger());
}
@@ -238,6 +241,9 @@
if (config != null && factory instanceof Configurable) {
((Configurable) factory).configure(config);
}
+ if (config != null && factory instanceof Parameterizable) {
+ ((Parameterizable)
factory).parameterize(Parameters.fromConfiguration(config));
+ }
}
/**
@@ -248,5 +254,4 @@
((Disposable) factory).dispose();
}
}
-
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
