cziegeler 2002/07/12 04:25:59
Modified: src/java/org/apache/cocoon/webapps/authentication/components
ApplicationHandler.java Handler.java
HandlerManager.java
src/java/org/apache/cocoon/webapps/authentication/context
SessionContextImpl.java
SessionContextProviderImpl.java
src/java/org/apache/cocoon/webapps/portal/context
SessionContextImpl.java
SessionContextProviderImpl.java
src/java/org/apache/cocoon/webapps/session/connector
Resource.java
src/java/org/apache/cocoon/webapps/session/context
RequestSessionContext.java
ResponseSessionContext.java SessionContext.java
SessionContextProvider.java
SimpleSessionContext.java
StandardSessionContextProvider.java
Log:
Changed use of SourceResolver to the more general component (where possible)
Revision Changes Path
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApplicationHandler.java 3 Jun 2002 10:02:01 -0000 1.4
+++ ApplicationHandler.java 12 Jul 2002 11:25:58 -0000 1.5
@@ -57,7 +57,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.session.context.SessionContext;
import org.apache.cocoon.webapps.session.connector.*;
import org.xml.sax.SAXException;
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Handler.java 3 Jun 2002 10:02:01 -0000 1.5
+++ Handler.java 12 Jul 2002 11:25:58 -0000 1.6
@@ -59,7 +59,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.session.context.SessionContext;
import org.apache.cocoon.webapps.session.connector.*;
import org.xml.sax.SAXException;
1.7 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/HandlerManager.java
Index: HandlerManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/components/HandlerManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HandlerManager.java 3 Jun 2002 10:36:01 -0000 1.6
+++ HandlerManager.java 12 Jul 2002 11:25:58 -0000 1.7
@@ -55,7 +55,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.authentication.AuthenticationConstants;
import java.util.*;
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionContextImpl.java 19 Apr 2002 11:02:58 -0000 1.2
+++ SessionContextImpl.java 12 Jul 2002 11:25:58 -0000 1.3
@@ -65,7 +65,7 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.session.context.SessionContext;
import org.apache.cocoon.webapps.session.connector.ResourceConnector;
import org.apache.cocoon.webapps.session.connector.Resource;
1.3 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/context/SessionContextProviderImpl.java
Index: SessionContextProviderImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/authentication/context/SessionContextProviderImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionContextProviderImpl.java 6 Jun 2002 14:43:41 -0000 1.2
+++ SessionContextProviderImpl.java 12 Jul 2002 11:25:58 -0000 1.3
@@ -56,7 +56,7 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.authentication.AuthenticationConstants;
import org.apache.cocoon.webapps.session.context.SessionContext;
import org.apache.cocoon.webapps.session.context.SessionContextProvider;
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionContextImpl.java 19 Apr 2002 11:02:58 -0000 1.2
+++ SessionContextImpl.java 12 Jul 2002 11:25:58 -0000 1.3
@@ -71,7 +71,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.authentication.components.AuthenticationManager;
import org.apache.cocoon.webapps.portal.PortalConstants;
import org.apache.cocoon.webapps.portal.components.PortalManager;
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionContextProviderImpl.java 6 Jun 2002 14:43:41 -0000 1.3
+++ SessionContextProviderImpl.java 12 Jul 2002 11:25:58 -0000 1.4
@@ -61,7 +61,7 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.authentication.components.AuthenticationManager;
import org.apache.cocoon.webapps.portal.PortalConstants;
import org.apache.cocoon.webapps.portal.components.PortalManager;
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Resource.java 4 Jun 2002 07:31:53 -0000 1.5
+++ Resource.java 12 Jul 2002 11:25:58 -0000 1.6
@@ -55,9 +55,9 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceParameters;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceUtil;
-import org.apache.cocoon.environment.SourceResolver;
import org.xml.sax.SAXException;
/**
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestSessionContext.java 19 Apr 2002 11:02:59 -0000 1.2
+++ RequestSessionContext.java 12 Jul 2002 11:25:58 -0000 1.3
@@ -61,7 +61,7 @@
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.environment.http.HttpRequest;
import org.apache.cocoon.webapps.session.SessionConstants;
import org.apache.cocoon.webapps.session.connector.Resource;
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResponseSessionContext.java 19 Apr 2002 11:02:59 -0000 1.2
+++ ResponseSessionContext.java 12 Jul 2002 11:25:58 -0000 1.3
@@ -59,7 +59,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Cookie;
import org.apache.cocoon.environment.Response;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.session.connector.Resource;
import org.apache.cocoon.webapps.session.xml.XMLUtil;
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionContext.java 19 Apr 2002 11:02:59 -0000 1.2
+++ SessionContext.java 12 Jul 2002 11:25:58 -0000 1.3
@@ -64,7 +64,7 @@
import org.apache.excalibur.source.SourceParameters;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.session.connector.Resource;
/**
1.4 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/SessionContextProvider.java
Index: SessionContextProvider.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/SessionContextProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SessionContextProvider.java 6 Jun 2002 14:43:41 -0000 1.3
+++ SessionContextProvider.java 12 Jul 2002 11:25:58 -0000 1.4
@@ -54,7 +54,7 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
/**
* Interface for a context provider.
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleSessionContext.java 19 Apr 2002 11:02:59 -0000 1.2
+++ SimpleSessionContext.java 12 Jul 2002 11:25:58 -0000 1.3
@@ -73,7 +73,7 @@
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.session.connector.ResourceConnector;
import org.apache.cocoon.webapps.session.connector.Resource;
import org.apache.cocoon.webapps.session.xml.*;
1.3 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java
Index: StandardSessionContextProvider.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardSessionContextProvider.java 6 Jun 2002 14:43:41 -0000 1.2
+++ StandardSessionContextProvider.java 12 Jul 2002 11:25:58 -0000 1.3
@@ -54,7 +54,7 @@
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.environment.SourceResolver;
+import org.apache.excalibur.source.SourceResolver;
import org.apache.cocoon.webapps.session.SessionConstants;
/**
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
