cziegeler 2002/12/15 04:18:57
Modified: sourceresolve/src/java/org/apache/excalibur/source
Source.java
sourceresolve/src/java/org/apache/excalibur/source/impl
AbstractSource.java URLSource.java
Added: sourceresolve/src/java/org/apache/excalibur/source
ModifiableSource.java
Log:
Adding mechanism to query content of a directory
Adding first version of a modifiable source
Revision Changes Path
1.9 +13 -1
jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/Source.java
Index: Source.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/Source.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Source.java 15 Dec 2002 11:56:48 -0000 1.8
+++ Source.java 15 Dec 2002 12:18:57 -0000 1.9
@@ -175,4 +175,16 @@
* source implementation, like an expires date, HTTP headers etc.
*/
Iterator getParameterNames();
+
+ /**
+ * Does this source point to a directory?
+ */
+ boolean isDirectory();
+
+ /**
+ * Return the URIs of the children
+ * The returned URIs are relative to the URI of the parent
+ * (this object)
+ */
+ Iterator getChildrenLocations();
}
1.1
jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/ModifiableSource.java
Index: ModifiableSource.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, 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 "Jakarta", "Avalon", 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 (INCLUDING, 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. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.excalibur.source;
import java.io.OutputStream;
/**
/**
* Description of a modifiable source. This interface provides a
* simple interface for manipulation data.
* for accessing a source of data.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @version CVS $Revision: 1.8 $ $Date: 2002/12/15 11:56:48 $
*/
public interface ModifiableSource
extends Source
{
/**
* Return an [EMAIL PROTECTED] OutputStream} to write to.
*/
OutputStream getOutputStream();
/**
* Delete the source
* @return true if the source could be deleted
*/
boolean delete();
}
1.6 +19 -1
jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/AbstractSource.java
Index: AbstractSource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/AbstractSource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractSource.java 15 Dec 2002 11:56:48 -0000 1.5
+++ AbstractSource.java 15 Dec 2002 12:18:57 -0000 1.6
@@ -211,4 +211,22 @@
checkInfos();
return Collections.EMPTY_LIST.iterator();
}
+
+ /**
+ * Does this source point to a directory?
+ */
+ public boolean isDirectory()
+ {
+ return false;
+ }
+
+ /**
+ * Return the URIs of the children
+ * The returned URIs are relative to the URI of the parent
+ * (this object)
+ */
+ public Iterator getChildrenLocations()
+ {
+ return Collections.EMPTY_LIST.iterator();
+ }
}
1.15 +30 -1
jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/URLSource.java
Index: URLSource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/sourceresolve/src/java/org/apache/excalibur/source/impl/URLSource.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- URLSource.java 15 Dec 2002 11:56:48 -0000 1.14
+++ URLSource.java 15 Dec 2002 12:18:57 -0000 1.15
@@ -63,6 +63,8 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
@@ -395,5 +397,32 @@
// reset connection
this.connection = null;
super.discardValidity();
+ }
+
+ /**
+ * Does this source point to a directory?
+ */
+ public boolean isDirectory()
+ {
+ if ( null != this.file )
+ {
+ return this.file.isDirectory();
+ }
+ return false;
+ }
+
+ /**
+ * Return the URIs of the children
+ * The returned URIs are relative to the URI of the parent
+ * (this object)
+ */
+ public Iterator getChildrenLocations()
+ {
+ if ( null != this.file && this.file.isDirectory() )
+ {
+ final String[] files = this.file.list();
+ return Arrays.asList(files).iterator();
+ }
+ return Collections.EMPTY_LIST.iterator();
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
