cziegeler 02/04/19 04:02:59
Modified: src/java/org/apache/cocoon Cocoon.java
src/java/org/apache/cocoon/caching SourceCacheValidity.java
src/java/org/apache/cocoon/components
CocoonComponentManager.java
src/java/org/apache/cocoon/components/source
AbstractStreamSource.java URLSource.java
src/java/org/apache/cocoon/environment
AbstractEnvironment.java Environment.java
SourceResolver.java URLFactorySourceResolver.java
src/java/org/apache/cocoon/sitemap Handler.java
src/java/org/apache/cocoon/transformation
AbstractSAXTransformer.java
src/java/org/apache/cocoon/transformation/helpers
ParametersRecorder.java
src/java/org/apache/cocoon/util NetUtils.java
src/java/org/apache/cocoon/webapps/authentication/acting
LoginAction.java
src/java/org/apache/cocoon/webapps/authentication/components
ApplicationHandler.java AuthenticationManager.java
Handler.java
src/java/org/apache/cocoon/webapps/authentication/context
SessionContextImpl.java
src/java/org/apache/cocoon/webapps/portal/components
Coplet.java CopletThread.java PortalManager.java
src/java/org/apache/cocoon/webapps/portal/context
SessionContextImpl.java
SessionContextProviderImpl.java
src/java/org/apache/cocoon/webapps/session/components
AbstractSessionComponent.java
src/java/org/apache/cocoon/webapps/session/connector
Resource.java ResourceConnector.java
ResourceConnectorImpl.java XMLLoader.java
XMLSaver.java
src/java/org/apache/cocoon/webapps/session/context
RequestSessionContext.java
ResponseSessionContext.java SessionContext.java
SimpleSessionContext.java
src/java/org/apache/cocoon/webapps/session/transformation
AbstractSessionTransformer.java
ConnectTransformer.java SessionPostTransformer.java
SessionPreTransformer.java
src/java/org/apache/cocoon/webapps/session/xml XMLUtil.java
src/java/org/apache/cocoon/xml/dom DOMUtil.java
src/webapp/WEB-INF cocoon.xconf
Added: lib/core avalon-excalibur-20020419.jar
avalon-excalibur-scratchpad-20020419.jar
Removed: lib/core avalon-excalibur-20020402.jar
avalon-excalibur-scratchpad-20020417.jar
Log:
Updated to latest excalibur source resolving
Revision Changes Path
1.1 xml-cocoon2/lib/core/avalon-excalibur-20020419.jar
<<Binary file>>
1.1 xml-cocoon2/lib/core/avalon-excalibur-scratchpad-20020419.jar
<<Binary file>>
1.23 +3 -3 xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Cocoon.java 8 Apr 2002 14:36:34 -0000 1.22
+++ Cocoon.java 19 Apr 2002 11:02:57 -0000 1.23
@@ -99,7 +99,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Pierpaolo Fumagalli</a> (Apache
Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leo Sutic</a>
- * @version CVS $Id: Cocoon.java,v 1.22 2002/04/08 14:36:34 cziegeler Exp $
+ * @version CVS $Id: Cocoon.java,v 1.23 2002/04/19 11:02:57 cziegeler Exp $
*/
public class Cocoon
extends AbstractLoggable
@@ -147,7 +147,7 @@
private Processor threadSafeProcessor = null;
/** The Source Resolver */
- private org.apache.avalon.excalibur.source.SourceResolver sourceResolver;
+ private org.apache.excalibur.source.SourceResolver sourceResolver;
/**
* Creates a new <code>Cocoon</code> instance.
@@ -287,7 +287,7 @@
this.componentManager.release(processor);
}
- this.sourceResolver =
(org.apache.avalon.excalibur.source.SourceResolver)this.componentManager.lookup(org.apache.avalon.excalibur.source.SourceResolver.ROLE);
+ this.sourceResolver =
(org.apache.excalibur.source.SourceResolver)this.componentManager.lookup(org.apache.excalibur.source.SourceResolver.ROLE);
}
/** Dump System Properties */
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/caching/SourceCacheValidity.java
Index: SourceCacheValidity.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/caching/SourceCacheValidity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SourceCacheValidity.java 9 Apr 2002 10:29:26 -0000 1.1
+++ SourceCacheValidity.java 19 Apr 2002 11:02:57 -0000 1.2
@@ -50,14 +50,14 @@
*/
package org.apache.cocoon.caching;
-import org.apache.avalon.excalibur.source.SourceValidity;
+import org.apache.excalibur.source.SourceValidity;
/**
* A CacheValidity object wrapping the Avalon Excalibur
* <code>SourceValidity</code> object.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SourceCacheValidity.java,v 1.1 2002/04/09 10:29:26 cziegeler
Exp $
+ * @version CVS $Id: SourceCacheValidity.java,v 1.2 2002/04/19 11:02:57 cziegeler
Exp $
*/
public final class SourceCacheValidity
implements CacheValidity {
1.14 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Index: CocoonComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CocoonComponentManager.java 8 Apr 2002 07:57:06 -0000 1.13
+++ CocoonComponentManager.java 19 Apr 2002 11:02:57 -0000 1.14
@@ -63,8 +63,8 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
import java.net.MalformedURLException;
-import org.apache.avalon.excalibur.source.Source;
-import org.apache.avalon.excalibur.source.SourceResolver;
+import org.apache.excalibur.source.Source;
+import org.apache.excalibur.source.SourceResolver;
import org.xml.sax.SAXException;
@@ -75,7 +75,7 @@
* and by handling the lookup of the <code>SourceResolver</code> (in development)
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: CocoonComponentManager.java,v 1.13 2002/04/08 07:57:06
cziegeler Exp $
+ * @version CVS $Id: CocoonComponentManager.java,v 1.14 2002/04/19 11:02:57
cziegeler Exp $
*/
public final class CocoonComponentManager
extends ExcaliburComponentManager
1.3 +9 -9
xml-cocoon2/src/java/org/apache/cocoon/components/source/AbstractStreamSource.java
Index: AbstractStreamSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/AbstractStreamSource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractStreamSource.java 14 Mar 2002 12:55:10 -0000 1.2
+++ AbstractStreamSource.java 19 Apr 2002 11:02:57 -0000 1.3
@@ -56,8 +56,8 @@
package org.apache.cocoon.components.source;
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.excalibur.source.SourceParameters;
-import org.apache.avalon.excalibur.source.SourceUtil;
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceUtil;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
@@ -100,7 +100,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version $Id: AbstractStreamSource.java,v 1.2 2002/03/14 12:55:10 sylvain Exp $
+ * @version $Id: AbstractStreamSource.java,v 1.3 2002/04/19 11:02:57 cziegeler Exp $
*/
public abstract class AbstractStreamSource extends AbstractLoggable
@@ -141,7 +141,7 @@
protected AbstractStreamSource(ComponentManager manager) {
this.manager = manager;
}
-
+
/**
* Does this source contain HTML ? If true, JTidy will be used (if available) to
* parse the input as XML.
@@ -157,7 +157,7 @@
* Return a new <code>InputSource</code> object
*/
public InputSource getInputSource() throws IOException, ProcessingException {
-
+
InputStream stream = this.getInputStream();
if (jtidyClass != null && isHTMLContent()) {
try {
@@ -214,7 +214,7 @@
if (parser != null) this.manager.release(parser);
}
}
-
+
/**
* Override this method to set the Content Length
*
@@ -230,7 +230,7 @@
public long getLastModified() {
return 0;
}
-
+
/**
* Returns <code>true</code> if <code>getInputStream()</code> succeeds.
* Subclasses can provide a more efficient implementation.
@@ -244,13 +244,13 @@
return false;
}
}
-
+
/**
* To be overriden in concrete subclasses if needed.
*/
public void recycle() {
}
-
+
/**
* To be overriden in concrete subclasses if needed.
*/
1.14 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/source/URLSource.java
Index: URLSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/URLSource.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- URLSource.java 7 Mar 2002 16:51:48 -0000 1.13
+++ URLSource.java 19 Apr 2002 11:02:57 -0000 1.14
@@ -51,8 +51,8 @@
package org.apache.cocoon.components.source;
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.excalibur.source.SourceParameters;
-import org.apache.avalon.excalibur.source.SourceUtil;
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceUtil;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
@@ -88,7 +88,7 @@
* Description of a source which is described by an URL.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: URLSource.java,v 1.13 2002/03/07 16:51:48 vgritsenko Exp $
+ * @version CVS $Id: URLSource.java,v 1.14 2002/04/19 11:02:57 cziegeler Exp $
*/
public class URLSource extends AbstractStreamSource {
1.13 +6 -6
xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractEnvironment.java 8 Apr 2002 14:36:34 -0000 1.12
+++ AbstractEnvironment.java 19 Apr 2002 11:02:57 -0000 1.13
@@ -70,7 +70,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: AbstractEnvironment.java,v 1.12 2002/04/08 14:36:34 cziegeler
Exp $
+ * @version CVS $Id: AbstractEnvironment.java,v 1.13 2002/04/19 11:02:57 cziegeler
Exp $
*/
public abstract class AbstractEnvironment extends AbstractLoggable implements
Environment {
@@ -99,7 +99,7 @@
protected SourceHandler sourceHandler;
/** The real source resolver */
- protected org.apache.avalon.excalibur.source.SourceResolver sourceResolver;
+ protected org.apache.excalibur.source.SourceResolver sourceResolver;
/** The attributes */
private Map attributes = new HashMap();
@@ -166,7 +166,7 @@
/**
* Set the <code>SourceResolver</code>
*/
- public void setSourceResolver(org.apache.avalon.excalibur.source.SourceResolver
resolver) {
+ public void setSourceResolver(org.apache.excalibur.source.SourceResolver
resolver) {
this.sourceResolver = resolver;
}
@@ -417,7 +417,7 @@
/**
* Get a <code>Source</code> object.
*/
- public org.apache.avalon.excalibur.source.Source resolveURI(final String
location)
+ public org.apache.excalibur.source.Source resolveURI(final String location)
throws MalformedURLException, IOException, ComponentException
{
return this.resolveURI(location, null, null);
@@ -426,7 +426,7 @@
/**
* Get a <code>Source</code> object.
*/
- public org.apache.avalon.excalibur.source.Source resolveURI(final String
location,
+ public org.apache.excalibur.source.Source resolveURI(final String location,
String baseURI,
final Map
parameters)
throws MalformedURLException, IOException, ComponentException {
@@ -436,7 +436,7 @@
/**
* Releases a resolved resource
*/
- public void release( final org.apache.avalon.excalibur.source.Source source ) {
+ public void release( final org.apache.excalibur.source.Source source ) {
this.sourceResolver.release( source );
}
1.7 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/environment/Environment.java
Index: Environment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/Environment.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Environment.java 8 Apr 2002 14:36:34 -0000 1.6
+++ Environment.java 19 Apr 2002 11:02:57 -0000 1.7
@@ -63,7 +63,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: Environment.java,v 1.6 2002/04/08 14:36:34 cziegeler Exp $
+ * @version CVS $Id: Environment.java,v 1.7 2002/04/19 11:02:57 cziegeler Exp $
*/
public interface Environment extends SourceResolver {
@@ -81,7 +81,7 @@
/**
* Set the <code>SourceResolver</code>
*/
- void setSourceResolver(org.apache.avalon.excalibur.source.SourceResolver
resolver);
+ void setSourceResolver(org.apache.excalibur.source.SourceResolver resolver);
/**
* Get the URI to process. The prefix is stripped off.
1.6 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/environment/SourceResolver.java
Index: SourceResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/SourceResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SourceResolver.java 8 Apr 2002 12:28:24 -0000 1.5
+++ SourceResolver.java 19 Apr 2002 11:02:57 -0000 1.6
@@ -58,11 +58,11 @@
* Base interface for resolving a source by system identifiers.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SourceResolver.java,v 1.5 2002/04/08 12:28:24 cziegeler Exp $
+ * @version CVS $Id: SourceResolver.java,v 1.6 2002/04/19 11:02:57 cziegeler Exp $
*/
public interface SourceResolver
-extends org.apache.avalon.excalibur.source.SourceResolver {
+extends org.apache.excalibur.source.SourceResolver {
/**
* Resolve the source.
1.6 +4 -4
xml-cocoon2/src/java/org/apache/cocoon/environment/URLFactorySourceResolver.java
Index: URLFactorySourceResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/URLFactorySourceResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- URLFactorySourceResolver.java 8 Apr 2002 12:28:24 -0000 1.5
+++ URLFactorySourceResolver.java 19 Apr 2002 11:02:57 -0000 1.6
@@ -66,7 +66,7 @@
* A <code>SourceResolver</code> based on a <code>URLFactory</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: URLFactorySourceResolver.java,v 1.5 2002/04/08 12:28:24
cziegeler Exp $
+ * @version CVS $Id: URLFactorySourceResolver.java,v 1.6 2002/04/19 11:02:57
cziegeler Exp $
*/
public class URLFactorySourceResolver implements SourceResolver {
@@ -112,7 +112,7 @@
/**
* Get a <code>Source</code> object.
*/
- public org.apache.avalon.excalibur.source.Source resolveURI(final String
location)
+ public org.apache.excalibur.source.Source resolveURI(final String location)
throws MalformedURLException, IOException, ComponentException
{
return this.resolveURI(location, null, null);
@@ -121,7 +121,7 @@
/**
* Get a <code>Source</code> object.
*/
- public org.apache.avalon.excalibur.source.Source resolveURI(final String
location,
+ public org.apache.excalibur.source.Source resolveURI(final String location,
String baseURI,
final Map
parameters)
throws MalformedURLException, IOException, ComponentException {
@@ -131,7 +131,7 @@
/**
* Releases a resolved resource
*/
- public void release( final org.apache.avalon.excalibur.source.Source source ) {
+ public void release( final org.apache.excalibur.source.Source source ) {
throw new RuntimeException("URLFactorySourceResolver.release() is not
implemented yet.");
}
1.15 +4 -4 xml-cocoon2/src/java/org/apache/cocoon/sitemap/Handler.java
Index: Handler.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/sitemap/Handler.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Handler.java 8 Apr 2002 12:28:24 -0000 1.14
+++ Handler.java 19 Apr 2002 11:02:57 -0000 1.15
@@ -86,7 +86,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Id: Handler.java,v 1.14 2002/04/08 12:28:24 cziegeler Exp $
+ * @version CVS $Id: Handler.java,v 1.15 2002/04/19 11:02:57 cziegeler Exp $
*/
public class Handler extends AbstractLoggable
implements Runnable, Contextualizable, Composable, Processor, Disposable,
SourceResolver {
@@ -357,7 +357,7 @@
/**
* Get a <code>Source</code> object.
*/
- public org.apache.avalon.excalibur.source.Source resolveURI(final String
location)
+ public org.apache.excalibur.source.Source resolveURI(final String location)
throws MalformedURLException, IOException, ComponentException
{
return this.resolveURI(location, null, null);
@@ -366,7 +366,7 @@
/**
* Get a <code>Source</code> object.
*/
- public org.apache.avalon.excalibur.source.Source resolveURI(final String
location,
+ public org.apache.excalibur.source.Source resolveURI(final String location,
String baseURI,
final Map
parameters)
throws MalformedURLException, IOException, ComponentException {
@@ -376,7 +376,7 @@
/**
* Releases a resolved resource
*/
- public void release( final org.apache.avalon.excalibur.source.Source source ) {
+ public void release( final org.apache.excalibur.source.Source source ) {
throw new RuntimeException("Handler.release() is not implemented yet.");
}
1.4 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
Index: AbstractSAXTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractSAXTransformer.java 17 Apr 2002 08:43:54 -0000 1.3
+++ AbstractSAXTransformer.java 19 Apr 2002 11:02:57 -0000 1.4
@@ -53,7 +53,7 @@
import java.io.*;
import java.util.*;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
@@ -124,7 +124,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: AbstractSAXTransformer.java,v 1.3 2002/04/17 08:43:54
cziegeler Exp $
+ * @version CVS $Id: AbstractSAXTransformer.java,v 1.4 2002/04/19 11:02:57
cziegeler Exp $
*/
public abstract class AbstractSAXTransformer
extends AbstractTransformer
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java
Index: ParametersRecorder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParametersRecorder.java 2 Apr 2002 14:13:34 -0000 1.1
+++ ParametersRecorder.java 19 Apr 2002 11:02:57 -0000 1.2
@@ -53,7 +53,7 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.parameters.Parameters;
import org.xml.sax.Attributes;
@@ -67,7 +67,7 @@
* <partwo>value_two<partwo>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: ParametersRecorder.java,v 1.1 2002/04/02 14:13:34 cziegeler
Exp $
+ * @version CVS $Id: ParametersRecorder.java,v 1.2 2002/04/19 11:02:57 cziegeler
Exp $
*/
public final class ParametersRecorder
extends NOPRecorder {
1.8 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/util/NetUtils.java
Index: NetUtils.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/util/NetUtils.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetUtils.java 15 Apr 2002 06:48:50 -0000 1.7
+++ NetUtils.java 19 Apr 2002 11:02:58 -0000 1.8
@@ -59,7 +59,7 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.cocoon.environment.Request;
/**
@@ -67,7 +67,7 @@
* utility methods
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version CVS $Id: NetUtils.java,v 1.7 2002/04/15 06:48:50 cziegeler Exp $
+ * @version CVS $Id: NetUtils.java,v 1.8 2002/04/19 11:02:58 cziegeler Exp $
*/
public class NetUtils {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java
Index: LoginAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoginAction.java 17 Apr 2002 10:04:52 -0000 1.1
+++ LoginAction.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -54,7 +54,7 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
@@ -74,7 +74,7 @@
* This action logs the current user into a given handler
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: LoginAction.java,v 1.1 2002/04/17 10:04:52 cziegeler Exp $
+ * @version CVS $Id: LoginAction.java,v 1.2 2002/04/19 11:02:58 cziegeler Exp $
*/
public final class LoginAction
extends ComposerAction
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/ApplicationHandler.java
Index: ApplicationHandler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/ApplicationHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplicationHandler.java 17 Apr 2002 10:04:52 -0000 1.1
+++ ApplicationHandler.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -52,7 +52,7 @@
import java.io.IOException;
import java.util.*;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -67,7 +67,7 @@
* inside a handler configuration.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: ApplicationHandler.java,v 1.1 2002/04/17 10:04:52 cziegeler
Exp $
+ * @version CVS $Id: ApplicationHandler.java,v 1.2 2002/04/19 11:02:58 cziegeler
Exp $
*/
public final class ApplicationHandler
implements java.io.Serializable {
1.3 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/AuthenticationManager.java
Index: AuthenticationManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/AuthenticationManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AuthenticationManager.java 17 Apr 2002 12:39:19 -0000 1.2
+++ AuthenticationManager.java 19 Apr 2002 11:02:58 -0000 1.3
@@ -53,8 +53,8 @@
import java.io.IOException;
import java.util.*;
-import org.apache.avalon.excalibur.source.SourceParameters;
-import org.apache.avalon.excalibur.source.SourceUtil;
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceUtil;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -97,7 +97,7 @@
* This is the basis authentication component.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: AuthenticationManager.java,v 1.2 2002/04/17 12:39:19 cziegeler
Exp $
+ * @version CVS $Id: AuthenticationManager.java,v 1.3 2002/04/19 11:02:58 cziegeler
Exp $
*/
public final class AuthenticationManager
extends AbstractSessionComponent
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/Handler.java
Index: Handler.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/Handler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Handler.java 17 Apr 2002 10:04:52 -0000 1.1
+++ Handler.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -53,7 +53,7 @@
import java.io.IOException;
import java.util.*;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -68,7 +68,7 @@
* The authentication Handler.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: Handler.java,v 1.1 2002/04/17 10:04:52 cziegeler Exp $
+ * @version CVS $Id: Handler.java,v 1.2 2002/04/19 11:02:58 cziegeler Exp $
*/
public final class Handler
implements java.io.Serializable {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/context/SessionContextImpl.java
Index: SessionContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/context/SessionContextImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionContextImpl.java 17 Apr 2002 10:04:52 -0000 1.1
+++ SessionContextImpl.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -61,7 +61,7 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
@@ -75,7 +75,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SessionContextImpl.java,v 1.1 2002/04/17 10:04:52 cziegeler
Exp $
+ * @version CVS $Id: SessionContextImpl.java,v 1.2 2002/04/19 11:02:58 cziegeler
Exp $
*/
public final class SessionContextImpl
implements SessionContext {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/components/Coplet.java
Index: Coplet.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/components/Coplet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Coplet.java 17 Apr 2002 12:39:19 -0000 1.1
+++ Coplet.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -55,14 +55,14 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.SAXException;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.cocoon.ProcessingException;
/**
* The coplet interface
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: Coplet.java,v 1.1 2002/04/17 12:39:19 cziegeler Exp $
+ * @version CVS $Id: Coplet.java,v 1.2 2002/04/19 11:02:58 cziegeler Exp $
*/
public interface Coplet {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/components/CopletThread.java
Index: CopletThread.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/components/CopletThread.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopletThread.java 17 Apr 2002 12:39:19 -0000 1.1
+++ CopletThread.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -60,7 +60,7 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentSelector;
@@ -87,7 +87,7 @@
* This is the thread for loading one coplet in the background.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: CopletThread.java,v 1.1 2002/04/17 12:39:19 cziegeler Exp $
+ * @version CVS $Id: CopletThread.java,v 1.2 2002/04/19 11:02:58 cziegeler Exp $
*/
public final class CopletThread implements Runnable {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/components/PortalManager.java
Index: PortalManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/components/PortalManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortalManager.java 17 Apr 2002 12:39:19 -0000 1.1
+++ PortalManager.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -58,7 +58,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.configuration.Configurable;
@@ -105,7 +105,7 @@
* This is the basis portal component
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: PortalManager.java,v 1.1 2002/04/17 12:39:19 cziegeler Exp $
+ * @version CVS $Id: PortalManager.java,v 1.2 2002/04/19 11:02:58 cziegeler Exp $
*/
public final class PortalManager
extends AbstractSessionComponent {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/context/SessionContextImpl.java
Index: SessionContextImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/context/SessionContextImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionContextImpl.java 17 Apr 2002 12:39:19 -0000 1.1
+++ SessionContextImpl.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -66,7 +66,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -101,7 +101,7 @@
* </configuration>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SessionContextImpl.java,v 1.1 2002/04/17 12:39:19 cziegeler
Exp $
+ * @version CVS $Id: SessionContextImpl.java,v 1.2 2002/04/19 11:02:58 cziegeler
Exp $
*/
public final class SessionContextImpl
implements SessionContext {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/context/SessionContextProviderImpl.java
Index: SessionContextProviderImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/portal/context/SessionContextProviderImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionContextProviderImpl.java 17 Apr 2002 12:39:19 -0000 1.1
+++ SessionContextProviderImpl.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -54,7 +54,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
@@ -75,7 +75,7 @@
* Context provider for the portal context
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SessionContextProviderImpl.java,v 1.1 2002/04/17 12:39:19
cziegeler Exp $
+ * @version CVS $Id: SessionContextProviderImpl.java,v 1.2 2002/04/19 11:02:58
cziegeler Exp $
*/
public final class SessionContextProviderImpl
implements SessionContextProvider {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/components/AbstractSessionComponent.java
Index: AbstractSessionComponent.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/components/AbstractSessionComponent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractSessionComponent.java 17 Apr 2002 08:43:55 -0000 1.1
+++ AbstractSessionComponent.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -51,7 +51,7 @@
package org.apache.cocoon.webapps.session.components;
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -77,7 +77,7 @@
* The base class for all components
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: AbstractSessionComponent.java,v 1.1 2002/04/17 08:43:55
cziegeler Exp $
+ * @version CVS $Id: AbstractSessionComponent.java,v 1.2 2002/04/19 11:02:58
cziegeler Exp $
*/
public abstract class AbstractSessionComponent
extends AbstractLoggable
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/Resource.java
Index: Resource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/Resource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Resource.java 17 Apr 2002 08:43:56 -0000 1.1
+++ Resource.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -52,7 +52,7 @@
import java.io.IOException;
import java.io.Serializable;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.environment.SourceResolver;
@@ -63,7 +63,7 @@
* parameters.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: Resource.java,v 1.1 2002/04/17 08:43:56 cziegeler Exp $
+ * @version CVS $Id: Resource.java,v 1.2 2002/04/19 11:02:58 cziegeler Exp $
*/
public final class Resource
implements Serializable {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/ResourceConnector.java
Index: ResourceConnector.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/ResourceConnector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceConnector.java 17 Apr 2002 08:43:56 -0000 1.1
+++ ResourceConnector.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -54,7 +54,7 @@
import org.w3c.dom.DocumentFragment;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
@@ -70,7 +70,7 @@
* identifies the resource itself (filename, http-address etc).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: ResourceConnector.java,v 1.1 2002/04/17 08:43:56 cziegeler Exp
$
+ * @version CVS $Id: ResourceConnector.java,v 1.2 2002/04/19 11:02:58 cziegeler Exp
$
*/
public interface ResourceConnector
extends Component {
1.2 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/ResourceConnectorImpl.java
Index: ResourceConnectorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/ResourceConnectorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResourceConnectorImpl.java 17 Apr 2002 08:43:56 -0000 1.1
+++ ResourceConnectorImpl.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -55,8 +55,8 @@
import java.util.*;
import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.excalibur.source.SourceParameters;
-import org.apache.avalon.excalibur.source.SourceUtil;
+import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceUtil;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
@@ -97,7 +97,7 @@
* The Component for loading and saving xml to external resource connectors.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: ResourceConnectorImpl.java,v 1.1 2002/04/17 08:43:56 cziegeler
Exp $
+ * @version CVS $Id: ResourceConnectorImpl.java,v 1.2 2002/04/19 11:02:58 cziegeler
Exp $
*/
public final class ResourceConnectorImpl
extends AbstractLoggable
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/XMLLoader.java
Index: XMLLoader.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/XMLLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLLoader.java 17 Apr 2002 08:43:56 -0000 1.1
+++ XMLLoader.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -51,7 +51,7 @@
package org.apache.cocoon.webapps.session.connector;
import java.util.Map;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.w3c.dom.DocumentFragment;
import org.apache.cocoon.ProcessingException;
@@ -60,7 +60,7 @@
* Interface for loading xml - NOT USED YET
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: XMLLoader.java,v 1.1 2002/04/17 08:43:56 cziegeler Exp $
+ * @version CVS $Id: XMLLoader.java,v 1.2 2002/04/19 11:02:58 cziegeler Exp $
*/
public interface XMLLoader {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/XMLSaver.java
Index: XMLSaver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/connector/XMLSaver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLSaver.java 17 Apr 2002 08:43:56 -0000 1.1
+++ XMLSaver.java 19 Apr 2002 11:02:58 -0000 1.2
@@ -52,7 +52,7 @@
import java.util.Map;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.w3c.dom.DocumentFragment;
import org.apache.cocoon.ProcessingException;
@@ -61,7 +61,7 @@
* Interface for saving xml - NOT USED YET
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: XMLSaver.java,v 1.1 2002/04/17 08:43:56 cziegeler Exp $
+ * @version CVS $Id: XMLSaver.java,v 1.2 2002/04/19 11:02:58 cziegeler Exp $
*/
public interface XMLSaver {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java
Index: RequestSessionContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestSessionContext.java 17 Apr 2002 08:43:57 -0000 1.1
+++ RequestSessionContext.java 19 Apr 2002 11:02:59 -0000 1.2
@@ -54,7 +54,7 @@
import java.util.*;
import org.apache.avalon.excalibur.xml.Parser;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.cocoon.ProcessingException;
@@ -145,7 +145,7 @@
* - getLocales()
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: RequestSessionContext.java,v 1.1 2002/04/17 08:43:57 cziegeler
Exp $
+ * @version CVS $Id: RequestSessionContext.java,v 1.2 2002/04/19 11:02:59 cziegeler
Exp $
*/
public final class RequestSessionContext
implements SessionContext {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/ResponseSessionContext.java
Index: ResponseSessionContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/ResponseSessionContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResponseSessionContext.java 17 Apr 2002 08:43:57 -0000 1.1
+++ ResponseSessionContext.java 19 Apr 2002 11:02:59 -0000 1.2
@@ -53,7 +53,7 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.ProcessingException;
@@ -92,7 +92,7 @@
* both have the same effect.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: ResponseSessionContext.java,v 1.1 2002/04/17 08:43:57
cziegeler Exp $
+ * @version CVS $Id: ResponseSessionContext.java,v 1.2 2002/04/19 11:02:59
cziegeler Exp $
*/
public final class ResponseSessionContext
implements SessionContext {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/SessionContext.java
Index: SessionContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/SessionContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionContext.java 17 Apr 2002 08:43:57 -0000 1.1
+++ SessionContext.java 19 Apr 2002 11:02:59 -0000 1.2
@@ -61,7 +61,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
@@ -78,7 +78,7 @@
* As this context is used in a web context, all methods must be synchronized.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SessionContext.java,v 1.1 2002/04/17 08:43:57 cziegeler Exp $
+ * @version CVS $Id: SessionContext.java,v 1.2 2002/04/19 11:02:59 cziegeler Exp $
*/
public interface SessionContext
extends Serializable {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java
Index: SimpleSessionContext.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleSessionContext.java 17 Apr 2002 08:43:57 -0000 1.1
+++ SimpleSessionContext.java 19 Apr 2002 11:02:59 -0000 1.2
@@ -69,7 +69,7 @@
import org.apache.xml.utils.PrefixResolverDefault;
import org.apache.xpath.objects.XObject;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
@@ -83,7 +83,7 @@
* This is a simple implementation of the session context.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SimpleSessionContext.java,v 1.1 2002/04/17 08:43:57 cziegeler
Exp $
+ * @version CVS $Id: SimpleSessionContext.java,v 1.2 2002/04/19 11:02:59 cziegeler
Exp $
*/
public final class SimpleSessionContext
implements SessionContext {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/AbstractSessionTransformer.java
Index: AbstractSessionTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/AbstractSessionTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractSessionTransformer.java 17 Apr 2002 08:43:57 -0000 1.1
+++ AbstractSessionTransformer.java 19 Apr 2002 11:02:59 -0000 1.2
@@ -53,7 +53,7 @@
import java.io.*;
import java.util.*;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
@@ -93,7 +93,7 @@
* This class is the basis for all session transformers.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: AbstractSessionTransformer.java,v 1.1 2002/04/17 08:43:57
cziegeler Exp $
+ * @version CVS $Id: AbstractSessionTransformer.java,v 1.2 2002/04/19 11:02:59
cziegeler Exp $
*/
public abstract class AbstractSessionTransformer
extends AbstractSAXTransformer {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/ConnectTransformer.java
Index: ConnectTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/ConnectTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConnectTransformer.java 17 Apr 2002 08:43:57 -0000 1.1
+++ ConnectTransformer.java 19 Apr 2002 11:02:59 -0000 1.2
@@ -54,7 +54,7 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.webapps.session.connector.*;
@@ -72,7 +72,7 @@
* this class.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: ConnectTransformer.java,v 1.1 2002/04/17 08:43:57 cziegeler
Exp $
+ * @version CVS $Id: ConnectTransformer.java,v 1.2 2002/04/19 11:02:59 cziegeler
Exp $
*/
public abstract class ConnectTransformer
extends AbstractSessionTransformer{
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java
Index: SessionPostTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionPostTransformer.java 17 Apr 2002 08:43:57 -0000 1.1
+++ SessionPostTransformer.java 19 Apr 2002 11:02:59 -0000 1.2
@@ -53,7 +53,7 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.webapps.session.SessionConstants;
@@ -74,7 +74,7 @@
* implementation of the SessionTransformer would be very unperformant.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SessionPostTransformer.java,v 1.1 2002/04/17 08:43:57
cziegeler Exp $
+ * @version CVS $Id: SessionPostTransformer.java,v 1.2 2002/04/19 11:02:59
cziegeler Exp $
*/
public class SessionPostTransformer
extends SessionPreTransformer {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java
Index: SessionPreTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionPreTransformer.java 17 Apr 2002 08:43:57 -0000 1.1
+++ SessionPreTransformer.java 19 Apr 2002 11:02:59 -0000 1.2
@@ -52,7 +52,7 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
@@ -73,7 +73,7 @@
* pipeline.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SessionPreTransformer.java,v 1.1 2002/04/17 08:43:57 cziegeler
Exp $
+ * @version CVS $Id: SessionPreTransformer.java,v 1.2 2002/04/19 11:02:59 cziegeler
Exp $
*/
public class SessionPreTransformer
extends ConnectTransformer {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/xml/XMLUtil.java
Index: XMLUtil.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/xml/XMLUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLUtil.java 17 Apr 2002 08:43:59 -0000 1.1
+++ XMLUtil.java 19 Apr 2002 11:02:59 -0000 1.2
@@ -57,7 +57,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.xml.dom.DOMBuilder;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.xpath.XPathAPI;
import org.w3c.dom.*;
import org.w3c.dom.traversal.NodeIterator;
@@ -95,7 +95,7 @@
* @deprecated Do not use this class! We will provide a better solution for most
methods soon.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: XMLUtil.java,v 1.1 2002/04/17 08:43:59 cziegeler Exp $
+ * @version CVS $Id: XMLUtil.java,v 1.2 2002/04/19 11:02:59 cziegeler Exp $
*/
public final class XMLUtil {
1.2 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMUtil.java
Index: DOMUtil.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMUtil.java 15 Apr 2002 14:03:20 -0000 1.1
+++ DOMUtil.java 19 Apr 2002 11:02:59 -0000 1.2
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.xml.dom;
-import org.apache.avalon.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.excalibur.xml.Parser;
import org.apache.avalon.excalibur.xml.xpath.XPathProcessor;
import org.apache.cocoon.ProcessingException;
@@ -67,7 +67,7 @@
* getting and setting values of nodes.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: DOMUtil.java,v 1.1 2002/04/15 14:03:20 cziegeler Exp $
+ * @version CVS $Id: DOMUtil.java,v 1.2 2002/04/19 11:02:59 cziegeler Exp $
*/
public final class DOMUtil {
1.6 +1 -1 xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cocoon.xconf 10 Apr 2002 06:57:27 -0000 1.5
+++ cocoon.xconf 19 Apr 2002 11:02:59 -0000 1.6
@@ -175,7 +175,7 @@
This will replace the source-handler and url-factory components.
-->
<source-factories>
- <component-instance
class="org.apache.avalon.excalibur.source.ResourceSourceFactory" name="resource"/>
+ <component-instance
class="org.apache.excalibur.source.impl.ResourceSourceFactory" name="resource"/>
</source-factories>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
