joerg 2003/09/23 11:41:39
Modified: src/blocks/slide/conf slide-repository.xconf
src/blocks/slide/java/org/apache/cocoon/generation
PrincipalListGenerator.java
Log:
ComposerGenerator => ServiceableGenerator
ComponentSelector => ServiceSelector
Revision Changes Path
1.3 +1 -1 cocoon-2.1/src/blocks/slide/conf/slide-repository.xconf
Index: slide-repository.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-repository.xconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slide-repository.xconf 28 Apr 2003 07:17:22 -0000 1.2
+++ slide-repository.xconf 23 Sep 2003 18:41:39 -0000 1.3
@@ -15,7 +15,7 @@
| user management.
+-->
<principal-provider
role="org.apache.cocoon.components.repository.PrincipalProviderSelector"
-
class="org.apache.cocoon.components.ExtendedComponentSelector"
+
class="org.apache.avalon.framework.service.DefaultServiceSelector"
logger="core.principalprovider" default="slide">
<!-- Default implementation via Jakarta Slide -->
1.4 +10 -10
cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/generation/PrincipalListGenerator.java
Index: PrincipalListGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/generation/PrincipalListGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PrincipalListGenerator.java 5 Sep 2003 07:31:46 -0000 1.3
+++ PrincipalListGenerator.java 23 Sep 2003 18:41:39 -0000 1.4
@@ -54,12 +54,12 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.excalibur.pool.Recyclable;
+
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
-
-import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.repository.Principal;
@@ -77,7 +77,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Stephan Michels</a>
* @version CVS $Id$
*/
-public class PrincipalListGenerator extends ComposerGenerator
+public class PrincipalListGenerator extends ServiceableGenerator
implements Recyclable {
/** Namespace of the generated list. */
@@ -115,10 +115,10 @@
*/
public void generate() throws IOException, SAXException,
ProcessingException {
- ComponentSelector principalproviders = null;
+ ServiceSelector principalproviders = null;
PrincipalProvider principalprovider = null;
try {
- principalproviders =
(ComponentSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
+ principalproviders =
(ServiceSelector)this.manager.lookup(PrincipalProvider.ROLE+"Selector");
principalprovider =
(PrincipalProvider)principalproviders.select(this.principalprovidername);
@@ -176,8 +176,8 @@
this.contentHandler.endPrefixMapping("");
this.contentHandler.endDocument();
- } catch (ComponentException ce) {
- getLogger().error("Could not lookup for component.", ce);
+ } catch (ServiceException se) {
+ getLogger().error("Could not lookup for component.", se);
} finally {
if (principalprovider!=null)
principalproviders.release(principalprovider);
