cziegeler 02/02/04 01:31:03 Modified: src/java/org/apache/cocoon/caching AggregatedCacheValidity.java CacheValidity.java Cacheable.java CachedEventObject.java CachedStreamObject.java CachingOutputStream.java ComponentCacheKey.java CompositeCacheValidity.java DeltaTimeCacheValidity.java IncludeCacheValidity.java NOPCacheValidity.java ParametersCacheValidity.java PipelineCacheKey.java TimeStampCacheValidity.java src/java/org/apache/cocoon/components/browser Browser.java src/java/org/apache/cocoon/components/classloader ClassLoaderManager.java ClassLoaderManagerImpl.java RepositoryClassLoader.java Log: Damn! Who put the Axis licence in our source code? So I learned another lession: before using copy paste on hundreds of files, check what you copy! Revision Changes Path 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/AggregatedCacheValidity.java Index: AggregatedCacheValidity.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/AggregatedCacheValidity.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AggregatedCacheValidity.java 4 Feb 2002 09:12:49 -0000 1.2 +++ AggregatedCacheValidity.java 4 Feb 2002 09:31:02 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -63,7 +63,7 @@ * A validation object using a List. * * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:02 $ */ public final class AggregatedCacheValidity implements CacheValidity { 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/CacheValidity.java Index: CacheValidity.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/CacheValidity.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CacheValidity.java 4 Feb 2002 09:12:49 -0000 1.2 +++ CacheValidity.java 4 Feb 2002 09:31:02 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -62,7 +62,7 @@ * xml file in this container. * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:02 $ */ public interface CacheValidity extends java.io.Serializable { 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/Cacheable.java Index: Cacheable.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/Cacheable.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Cacheable.java 4 Feb 2002 09:12:49 -0000 1.2 +++ Cacheable.java 4 Feb 2002 09:31:02 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -60,7 +60,7 @@ * * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:02 $ */ public interface Cacheable { 1.4 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/CachedEventObject.java Index: CachedEventObject.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/CachedEventObject.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CachedEventObject.java 4 Feb 2002 09:12:49 -0000 1.3 +++ CachedEventObject.java 4 Feb 2002 09:31:02 -0000 1.4 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -61,7 +61,7 @@ * This is an cached object as it is stored in the <code>EventCache</code> * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.4 $ $Date: 2002/02/04 09:31:02 $ */ public final class CachedEventObject implements java.io.Serializable { 1.4 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/CachedStreamObject.java Index: CachedStreamObject.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/CachedStreamObject.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CachedStreamObject.java 4 Feb 2002 09:12:49 -0000 1.3 +++ CachedStreamObject.java 4 Feb 2002 09:31:02 -0000 1.4 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -61,7 +61,7 @@ * This is an cached object as it is stored in the <code>StreamCache</code> * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.4 $ $Date: 2002/02/04 09:31:02 $ */ public final class CachedStreamObject implements java.io.Serializable { 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/CachingOutputStream.java Index: CachingOutputStream.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/CachingOutputStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CachingOutputStream.java 4 Feb 2002 09:12:49 -0000 1.2 +++ CachingOutputStream.java 4 Feb 2002 09:31:02 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -64,7 +64,7 @@ * TeeOutputStream. * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:02 $ */ public final class CachingOutputStream 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/ComponentCacheKey.java Index: ComponentCacheKey.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/ComponentCacheKey.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ComponentCacheKey.java 4 Feb 2002 09:12:49 -0000 1.2 +++ ComponentCacheKey.java 4 Feb 2002 09:31:02 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -64,7 +64,7 @@ * is unique inside the component space. * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:02 $ */ public final class ComponentCacheKey implements java.io.Serializable { 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/CompositeCacheValidity.java Index: CompositeCacheValidity.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/CompositeCacheValidity.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CompositeCacheValidity.java 4 Feb 2002 09:12:49 -0000 1.2 +++ CompositeCacheValidity.java 4 Feb 2002 09:31:02 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -61,7 +61,7 @@ * A validation object using a Hashmap. * * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:02 $ */ public final class CompositeCacheValidity implements CacheValidity { 1.4 +1 -1 xml-cocoon2/src/java/org/apache/cocoon/caching/DeltaTimeCacheValidity.java Index: DeltaTimeCacheValidity.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/DeltaTimeCacheValidity.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DeltaTimeCacheValidity.java 4 Feb 2002 09:12:49 -0000 1.3 +++ DeltaTimeCacheValidity.java 4 Feb 2002 09:31:02 -0000 1.4 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] 1.4 +1 -1 xml-cocoon2/src/java/org/apache/cocoon/caching/IncludeCacheValidity.java Index: IncludeCacheValidity.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/IncludeCacheValidity.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- IncludeCacheValidity.java 4 Feb 2002 09:12:49 -0000 1.3 +++ IncludeCacheValidity.java 4 Feb 2002 09:31:02 -0000 1.4 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] 1.4 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/NOPCacheValidity.java Index: NOPCacheValidity.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/NOPCacheValidity.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- NOPCacheValidity.java 4 Feb 2002 09:12:49 -0000 1.3 +++ NOPCacheValidity.java 4 Feb 2002 09:31:02 -0000 1.4 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -60,7 +60,7 @@ * This might be the most used CacheValidity object for serializers. * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.4 $ $Date: 2002/02/04 09:31:02 $ */ public final class NOPCacheValidity implements CacheValidity { 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/ParametersCacheValidity.java Index: ParametersCacheValidity.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/ParametersCacheValidity.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ParametersCacheValidity.java 4 Feb 2002 09:12:49 -0000 1.2 +++ ParametersCacheValidity.java 4 Feb 2002 09:31:02 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -61,7 +61,7 @@ * A validation object using a Hashmap. * * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:02 $ */ public final class ParametersCacheValidity implements CacheValidity { 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/PipelineCacheKey.java Index: PipelineCacheKey.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/PipelineCacheKey.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PipelineCacheKey.java 4 Feb 2002 09:12:49 -0000 1.2 +++ PipelineCacheKey.java 4 Feb 2002 09:31:03 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -63,7 +63,7 @@ * or more <code>ComponentCacheKey</code> objects. * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:03 $ */ public final class PipelineCacheKey { 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/caching/TimeStampCacheValidity.java Index: TimeStampCacheValidity.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/TimeStampCacheValidity.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TimeStampCacheValidity.java 4 Feb 2002 09:12:49 -0000 1.2 +++ TimeStampCacheValidity.java 4 Feb 2002 09:31:03 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -60,7 +60,7 @@ * This is might be the most used CacheValidity object. * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:12:49 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:03 $ */ public final class TimeStampCacheValidity implements CacheValidity { 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/components/browser/Browser.java Index: Browser.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/browser/Browser.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Browser.java 4 Feb 2002 09:16:55 -0000 1.2 +++ Browser.java 4 Feb 2002 09:31:03 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -63,7 +63,7 @@ /** * * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:16:55 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:03 $ */ public interface Browser extends Component { 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/components/classloader/ClassLoaderManager.java Index: ClassLoaderManager.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/classloader/ClassLoaderManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ClassLoaderManager.java 4 Feb 2002 09:16:55 -0000 1.2 +++ ClassLoaderManager.java 4 Feb 2002 09:31:03 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -67,7 +67,7 @@ * that it can be safely reinstantiated for dynamic class reloading * * @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:16:55 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:03 $ */ public interface ClassLoaderManager extends Component { 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java Index: ClassLoaderManagerImpl.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/classloader/ClassLoaderManagerImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ClassLoaderManagerImpl.java 4 Feb 2002 09:16:55 -0000 1.2 +++ ClassLoaderManagerImpl.java 4 Feb 2002 09:31:03 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -68,7 +68,7 @@ * A singleton-like implementation of <code>ClassLoaderManager</code> * * @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:16:55 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:03 $ */ public class ClassLoaderManagerImpl implements ClassLoaderManager, ThreadSafe { /** 1.3 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/components/classloader/RepositoryClassLoader.java Index: RepositoryClassLoader.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/classloader/RepositoryClassLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RepositoryClassLoader.java 4 Feb 2002 09:16:55 -0000 1.2 +++ RepositoryClassLoader.java 4 Feb 2002 09:31:03 -0000 1.3 @@ -24,7 +24,7 @@ * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * - * 4. The names "Axis" and "Apache Software Foundation" must + * 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] @@ -75,7 +75,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a> * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a> - * @version CVS $Revision: 1.2 $ $Date: 2002/02/04 09:16:55 $ + * @version CVS $Revision: 1.3 $ $Date: 2002/02/04 09:31:03 $ */ public class RepositoryClassLoader extends URLClassLoader implements Loggable {
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]