unico 2003/10/28 07:04:00
Added:
src/blocks/repository/java/org/apache/cocoon/components/source/impl
RepositorySourceFactory.java RepositorySource.java
src/blocks/repository/conf repository-source.xconf
Log:
source wrapper for extending existing source implementations with
inspectability
Revision Changes Path
1.1
cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySourceFactory.java
Index: RepositorySourceFactory.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.cocoon.components.source.impl;
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.Map;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.excalibur.source.ModifiableTraversableSource;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceFactory;
import org.apache.excalibur.source.SourceResolver;
/**
* Creates RepositorySources.
*
* @author <a href="[EMAIL PROTECTED]">Unico Hommes</a>
*/
public class RepositorySourceFactory extends AbstractLogEnabled
implements SourceFactory, Serviceable, Configurable, ThreadSafe {
private ServiceManager m_manager;
private SourceResolver m_resolver;
private String m_name;
/**
* Read the <code>name</code> attribute.
*/
public void configure(final Configuration configuration)
throws ConfigurationException {
m_name = configuration.getAttribute("name");
}
public void service(final ServiceManager manager) throws ServiceException
{
m_manager = manager;
}
public Source getSource(String location, Map parameters)
throws IOException, MalformedURLException {
if (m_resolver == null) {
try {
m_resolver = (SourceResolver)
m_manager.lookup(SourceResolver.ROLE);
}
catch (ServiceException e) {
throw new IOException("Resolver service is not available: " +
e.toString());
}
}
// assert location.startsWith(m_name)
location = location.substring(m_name.length()+1);
Source source = m_resolver.resolveURI(location);
if (!(source instanceof ModifiableTraversableSource)) {
final String message = "Delegate should be a
ModifiableTraversableSource";
throw new SourceException(message);
}
return new RepositorySource(
(ModifiableTraversableSource) source,
m_manager,
getLogger());
}
public void release(final Source source) {
((RepositorySource) source).recycle();
}
}
1.1
cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/impl/RepositorySource.java
Index: RepositorySource.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.cocoon.components.source.impl;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.components.source.InspectableSource;
import org.apache.cocoon.components.source.SourceDescriptor;
import org.apache.cocoon.components.source.helpers.SourceProperty;
import org.apache.excalibur.source.ModifiableTraversableSource;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceNotFoundException;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.AggregatedValidity;
/**
* Source wrapper that enhances the wrapped sources with additional
capabilities.
*
* <p>
* Currently the extra functionality this Source adds is
* inspectability through the InspectableSource interface.
* The implementation accomplishes this by delegating the
* inspectable calls to the SourceDescriptor service.
* </p>
*
* <p>
* Wrapped sources must implement ModifiableTraversableSource.
* </p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Unico Hommes</a>
*/
public class RepositorySource extends AbstractLogEnabled
implements Source, ModifiableTraversableSource, InspectableSource, Recyclable
{
// the wrapped source
private final ModifiableTraversableSource m_delegate;
private final ServiceManager m_manager;
private final SourceDescriptor m_descriptor;
// ---------------------------------------------------- Lifecycle
public RepositorySource(
final ModifiableTraversableSource delegate,
final ServiceManager manager,
final Logger logger) throws SourceException {
m_delegate = delegate;
m_manager = manager;
enableLogging(logger);
try {
m_descriptor = (SourceDescriptor)
manager.lookup(SourceDescriptorManager.ROLE);
} catch (ServiceException e) {
throw new SourceException("Missing service",e);
}
}
public void recycle() {
if (m_delegate instanceof Recyclable) {
((Recyclable) m_delegate).recycle();
}
}
// ---------------------------------------------------- InspectableSource
implementation
/**
* Get all source properties that are defined on the wrapped source.
* If the wrapped source is itself an InspectableSource the implementation
* will return the aggregate set that results from combining the
properties
* returned from a delegate call to the wrapped source with the
* properties returned by the source descriptor.
*/
public SourceProperty[] getSourceProperties() throws SourceException {
final List properties = new ArrayList();
if (m_delegate instanceof InspectableSource) {
properties.addAll(Arrays.asList(((InspectableSource)
m_delegate).getSourceProperties()));
}
properties.addAll(Arrays.asList(m_descriptor.getSourceProperties(m_delegate)));
return (SourceProperty[]) properties.toArray(new
SourceProperty[properties.size()]);
}
/**
* Get the source property on the wrapped source. If the wrapped source
implements
* InspectableSource the implementation will first try to get it from
there.
* If it doesn't exist on the delegate it will try to find it using the
source descriptor.
*/
public SourceProperty getSourceProperty(String uri, String name) throws
SourceException {
SourceProperty property = null;
if (m_delegate instanceof InspectableSource) {
property = ((InspectableSource)
m_delegate).getSourceProperty(uri,name);
}
if (property == null) {
property = m_descriptor.getSourceProperty(m_delegate,uri,name);
}
return property;
}
/**
* Remove the source property on the wrapped source. If the wrapped
source implements
* InspectableSource the implementation will try to remove the property
on both
* the wrapped source directly and on the source descriptor.
*/
public void removeSourceProperty(String uri, String name) throws
SourceException {
if (m_delegate instanceof InspectableSource) {
((InspectableSource) m_delegate).removeSourceProperty(uri,name);
}
m_descriptor.removeSourceProperty(m_delegate,uri,name);
}
/**
* Set the source property on the wrapped source. If the wrapped source
implements
* InspectableSource set the property directly on the wrapped source.
Otherwise
* set it on the SourceDescriptor.
*/
public void setSourceProperty(SourceProperty property) throws
SourceException {
if (m_delegate instanceof InspectableSource) {
((InspectableSource) m_delegate).setSourceProperty(property);
} else {
m_descriptor.setSourceProperty(m_delegate, property);
}
}
// ---------------------------------------------------- Source
implementation
public boolean exists() {
return m_delegate.exists();
}
public long getContentLength() {
return m_delegate.getContentLength();
}
public InputStream getInputStream()
throws IOException, SourceNotFoundException {
return m_delegate.getInputStream();
}
public long getLastModified() {
return m_delegate.getLastModified();
}
public String getMimeType() {
return m_delegate.getMimeType();
}
public String getScheme() {
return m_delegate.getScheme();
}
public String getURI() {
return m_delegate.getURI();
}
public SourceValidity getValidity() {
SourceValidity val1 = m_delegate.getValidity();
if (val1 != null) {
SourceValidity val2 = m_descriptor.getValidity(m_delegate);
if (val2 != null) {
AggregatedValidity result = new AggregatedValidity();
result.add(val1);
result.add(val2);
return result;
}
}
return null;
}
public void refresh() {
m_delegate.refresh();
}
// ----------------------------------------------------
ModifiableTraversableSource
public Source getChild(String name) throws SourceException {
return m_delegate.getChild(name);
}
public Collection getChildren() throws SourceException {
return m_delegate.getChildren();
}
public String getName() {
return m_delegate.getName();
}
public Source getParent() throws SourceException {
return m_delegate.getParent();
}
public boolean isCollection() {
return m_delegate.isCollection();
}
public void makeCollection() throws SourceException {
m_delegate.makeCollection();
}
public boolean canCancel(OutputStream out) {
return m_delegate.canCancel(out);
}
public void cancel(OutputStream out) throws IOException {
m_delegate.cancel(out);
}
public void delete() throws SourceException {
m_delegate.delete();
}
public OutputStream getOutputStream() throws IOException {
return m_delegate.getOutputStream();
}
// ---------------------------------------------------- LockableSource
implementation
// public void addSourceLocks(SourceLock lock) throws SourceException {
// if (m_delegate instanceof LockableSource) {
// ((LockableSource) m_delegate).addSourceLocks(lock);
// }
// }
//
// public Enumeration getSourceLocks() throws SourceException {
// if (m_delegate instanceof LockableSource) {
// return ((LockableSource) m_delegate).getSourceLocks();
// }
// return null;
// }
// ---------------------------------------------------- VersionableSource
implementation
// public String getLatestSourceRevision() throws SourceException {
// if (m_delegate instanceof VersionableSource) {
// return ((VersionableSource)
m_delegate).getLatestSourceRevision();
// }
// return null;
// }
//
// public String getSourceRevision() throws SourceException {
// if (m_delegate instanceof VersionableSource) {
// return ((VersionableSource) m_delegate).getSourceRevision();
// }
// return null;
// }
//
// public String getSourceRevisionBranch() throws SourceException {
// if (m_delegate instanceof VersionableSource) {
// return ((VersionableSource)
m_delegate).getSourceRevisionBranch();
// }
// return null;
// }
//
// public boolean isVersioned() throws SourceException {
// if (m_delegate instanceof VersionableSource) {
// return ((VersionableSource) m_delegate).isVersioned();
// }
// return false;
// }
//
// public void setSourceRevision(String revision) throws SourceException {
// if (m_delegate instanceof VersionableSource) {
// ((VersionableSource) m_delegate).setSourceRevision(revision);
// }
// }
//
// public void setSourceRevisionBranch(String branch) throws
SourceException {
// if (m_delegate instanceof VersionableSource) {
// ((VersionableSource)
m_delegate).setSourceRevisionBranch(branch);
// }
// }
// ----------------------------------------------------
RestrictableSource implementation
// public void addSourcePermission(SourcePermission permission)
// throws SourceException {
//
// if (m_delegate instanceof RestrictableSource) {
// ((RestrictableSource)
m_delegate).addSourcePermission(permission);
// }
// }
//
// public SourceCredential getSourceCredential() throws SourceException {
// if (m_delegate instanceof RestrictableSource) {
// return ((RestrictableSource) m_delegate).getSourceCredential();
// }
// return null;
// }
//
// public SourcePermission[] getSourcePermissions() throws SourceException
{
// if (m_delegate instanceof RestrictableSource) {
// return ((RestrictableSource) m_delegate).getSourcePermissions();
// }
// return null;
// }
//
// public void removeSourcePermission(SourcePermission permission)
// throws SourceException {
//
// if (m_delegate instanceof RestrictableSource) {
// ((RestrictableSource)
m_delegate).removeSourcePermission(permission);
// }
// }
//
// public void setSourceCredential(SourceCredential credential)
// throws SourceException {
//
// if (m_delegate instanceof RestrictableSource) {
// ((RestrictableSource)
m_delegate).setSourceCredential(credential);
// }
// }
}
1.1
cocoon-2.1/src/blocks/repository/conf/repository-source.xconf
Index: repository-source.xconf
===================================================================
<?xml version="1.0"?>
<xconf xpath="/cocoon/source-factories" unless="[EMAIL
PROTECTED]'repository']">
<!-- pseudo protocol for the repository source wrapper -->
<component-instance
name="repository"
class="org.apache.cocoon.components.source.impl.RepositorySourceFactory"
/>
</xconf>
