You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/06/16 15:37:09 UTC
svn commit: r414824 - in /cocoon/trunk/blocks:
cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/
cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps...
Author: cziegeler
Date: Fri Jun 16 06:37:07 2006
New Revision: 414824
URL: http://svn.apache.org/viewvc?rev=414824&view=rev
Log:
Deprecate session-fw and auth-fw block
Removed:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/authenticationfw/
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/conf/auth-authfw.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap-auth.xmap
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/xml/XMLUtil.java
Modified:
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/AuthenticationConstants.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/AuthenticationManager.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/AuthAction.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LoggedInAction.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LogoutAction.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/Authenticator.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultHandlerManager.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/PipelineAuthenticator.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/ServletAuthenticator.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/configuration/ApplicationConfiguration.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/configuration/HandlerConfiguration.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContext.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContextProvider.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/generation/ConfigurationGenerator.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/generation/JaasSecurityGenerator.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/RequestState.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/UserHandler.java
cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/UserState.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/ContextManager.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/FormManager.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/MediaManager.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/SessionConstants.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/SessionManager.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/TransactionManager.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/FormManagerAction.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/SessionAction.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/ContextInputModule.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultFormManager.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultMediaManager.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SessionContext.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SessionContextProvider.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/selection/MediaSelector.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/AbstractSessionTransformer.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java
cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionTransformer.java
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/AuthenticationConstants.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/AuthenticationConstants.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/AuthenticationConstants.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/AuthenticationConstants.java Fri Jun 16 06:37:07 2006
@@ -19,6 +19,7 @@
* The <code>Constants</code> used throughout the core of the authentication
* framework.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface AuthenticationConstants {
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/AuthenticationManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/AuthenticationManager.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/AuthenticationManager.java Fri Jun 16 06:37:07 2006
@@ -30,6 +30,7 @@
* component should not be used from custom code. The provided
* actions perform all required tasks.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface AuthenticationManager {
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/AuthAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/AuthAction.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/AuthAction.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/AuthAction.java Fri Jun 16 06:37:07 2006
@@ -33,6 +33,7 @@
* The main task of this action is to check if the user is authenticated
* using a handler. If not a redirect takes place.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class AuthAction
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LoggedInAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LoggedInAction.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LoggedInAction.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LoggedInAction.java Fri Jun 16 06:37:07 2006
@@ -28,6 +28,7 @@
/**
* This action tests if the user is logged in for a given handler.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class LoggedInAction
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LoginAction.java Fri Jun 16 06:37:07 2006
@@ -34,6 +34,7 @@
* If the authentication is not successful, the error information is stored
* into the temporary context.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class LoginAction extends ServiceableAction
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LogoutAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LogoutAction.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LogoutAction.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/acting/LogoutAction.java Fri Jun 16 06:37:07 2006
@@ -30,6 +30,7 @@
/**
* This action logs the current user out of a given handler
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class LogoutAction
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/Authenticator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/Authenticator.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/Authenticator.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/Authenticator.java Fri Jun 16 06:37:07 2006
@@ -27,6 +27,7 @@
* and gets the information set.
* An authenticator must be implemented in a thread safe manner!
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface Authenticator {
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java Fri Jun 16 06:37:07 2006
@@ -40,6 +40,7 @@
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.util.ClassUtils;
+import org.apache.cocoon.util.Deprecation;
import org.apache.cocoon.webapps.authentication.AuthenticationConstants;
import org.apache.cocoon.webapps.authentication.AuthenticationManager;
import org.apache.cocoon.webapps.authentication.configuration.ApplicationConfiguration;
@@ -63,6 +64,7 @@
/**
* This is the basis authentication component.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public class DefaultAuthenticationManager
@@ -102,6 +104,7 @@
* @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
*/
public void configure(Configuration config) throws ConfigurationException {
+ Deprecation.logger.warn("The authentication-fw block is deprecated. Please use the auth block instead.");
this.handlerConfigs = DefaultHandlerManager.prepareHandlerConfiguration(ContextHelper.getObjectModel(this.context), config);
}
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultHandlerManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultHandlerManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultHandlerManager.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/DefaultHandlerManager.java Fri Jun 16 06:37:07 2006
@@ -29,6 +29,7 @@
/**
* This is a utility class managing the authentication handlers.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class DefaultHandlerManager {
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/PipelineAuthenticator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/PipelineAuthenticator.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/PipelineAuthenticator.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/PipelineAuthenticator.java Fri Jun 16 06:37:07 2006
@@ -44,6 +44,7 @@
/**
* Verify if a user can be authenticated.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public class PipelineAuthenticator
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/ServletAuthenticator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/ServletAuthenticator.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/ServletAuthenticator.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/components/ServletAuthenticator.java Fri Jun 16 06:37:07 2006
@@ -39,6 +39,7 @@
* This is a very simple authenticator that checks if the user is authenticated
* using the servlet authentication mechanisms.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id: PipelineAuthenticator.java 30932 2004-07-29 17:35:38Z vgritsenko $
*/
public class ServletAuthenticator
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/configuration/ApplicationConfiguration.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/configuration/ApplicationConfiguration.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/configuration/ApplicationConfiguration.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/configuration/ApplicationConfiguration.java Fri Jun 16 06:37:07 2006
@@ -27,6 +27,7 @@
* This object stores information about an application configuration
* inside a handler configuration.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class ApplicationConfiguration
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/configuration/HandlerConfiguration.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/configuration/HandlerConfiguration.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/configuration/HandlerConfiguration.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/configuration/HandlerConfiguration.java Fri Jun 16 06:37:07 2006
@@ -29,6 +29,7 @@
/**
* The authentication Handler.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class HandlerConfiguration
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContext.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContext.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContext.java Fri Jun 16 06:37:07 2006
@@ -54,6 +54,7 @@
/**
* This is the implementation for the authentication context
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public class AuthenticationContext implements SessionContext {
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContextProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContextProvider.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContextProvider.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/context/AuthenticationContextProvider.java Fri Jun 16 06:37:07 2006
@@ -32,6 +32,7 @@
/**
* Context provider for the authentication context
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class AuthenticationContextProvider
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/generation/ConfigurationGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/generation/ConfigurationGenerator.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/generation/ConfigurationGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/generation/ConfigurationGenerator.java Fri Jun 16 06:37:07 2006
@@ -54,6 +54,7 @@
/**
* This is the authentication Configuration Generator.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class ConfigurationGenerator extends ServiceableGenerator {
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/generation/JaasSecurityGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/generation/JaasSecurityGenerator.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/generation/JaasSecurityGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/generation/JaasSecurityGenerator.java Fri Jun 16 06:37:07 2006
@@ -45,6 +45,7 @@
* <li><b>username</b> - The username of the user</li>
* <li><b>password</b> - The password of the user</li></ul>
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id: PortalJaasSecurityGenerator.java 96 2004-08-28 21:30:23Z kulawik $
*/
public class JaasSecurityGenerator extends ServiceableGenerator {
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/RequestState.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/RequestState.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/RequestState.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/RequestState.java Fri Jun 16 06:37:07 2006
@@ -26,6 +26,7 @@
* This object holds the information which handler and application
* is currently used for this request.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class RequestState
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/UserHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/UserHandler.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/UserHandler.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/UserHandler.java Fri Jun 16 06:37:07 2006
@@ -26,6 +26,7 @@
/**
* The authentication Handler.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class UserHandler
Modified: cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/UserState.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/UserState.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/UserState.java (original)
+++ cocoon/trunk/blocks/cocoon-authentication-fw/cocoon-authentication-fw-impl/src/main/java/org/apache/cocoon/webapps/authentication/user/UserState.java Fri Jun 16 06:37:07 2006
@@ -23,6 +23,7 @@
* This object holds all authentication handlers ({@link UserHandler}
* the user is currently logged-in to.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class UserState
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml Fri Jun 16 06:37:07 2006
@@ -42,11 +42,6 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-authentication-fw-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-forms-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/ContextManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/ContextManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/ContextManager.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/ContextManager.java Fri Jun 16 06:37:07 2006
@@ -30,6 +30,7 @@
* The contained information can either be an XML tree or custom
* objects.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface ContextManager {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/FormManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/FormManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/FormManager.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/FormManager.java Fri Jun 16 06:37:07 2006
@@ -21,6 +21,7 @@
/**
* Form manager
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface FormManager {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/MediaManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/MediaManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/MediaManager.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/MediaManager.java Fri Jun 16 06:37:07 2006
@@ -19,6 +19,7 @@
* This is the media manager.
* It provides simple support for developing multi-channel applications
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface MediaManager {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/SessionConstants.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/SessionConstants.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/SessionConstants.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/SessionConstants.java Fri Jun 16 06:37:07 2006
@@ -18,6 +18,7 @@
/**
* The <code>Constants</code> used throughout the core of the session management.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface SessionConstants {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/SessionManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/SessionManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/SessionManager.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/SessionManager.java Fri Jun 16 06:37:07 2006
@@ -27,6 +27,7 @@
*
* The main purpose of this component is creating and termination sessions
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface SessionManager {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/TransactionManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/TransactionManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/TransactionManager.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/TransactionManager.java Fri Jun 16 06:37:07 2006
@@ -26,6 +26,7 @@
* We distingish between reading and writing. Usually parallel reading is
* allowed but if one thread wants to write, no other can read or write.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface TransactionManager {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/FormManagerAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/FormManagerAction.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/FormManagerAction.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/FormManagerAction.java Fri Jun 16 06:37:07 2006
@@ -29,6 +29,7 @@
/**
* This action invokes the form manager to process incomming form values
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class FormManagerAction
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/SessionAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/SessionAction.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/SessionAction.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/SessionAction.java Fri Jun 16 06:37:07 2006
@@ -38,6 +38,7 @@
* any own session context and must not be authenticated anymore using
* the uthentication framework.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class SessionAction
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/acting/SessionFormAction.java Fri Jun 16 06:37:07 2006
@@ -90,6 +90,7 @@
* @see org.apache.cocoon.acting.FormValidatorAction
* @see org.apache.cocoon.acting.AbstractValidatorAction
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public class SessionFormAction extends FormValidatorAction {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/ContextInputModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/ContextInputModule.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/ContextInputModule.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/ContextInputModule.java Fri Jun 16 06:37:07 2006
@@ -43,6 +43,7 @@
* <session:getxml context="authentication" path="/authentication/ID"/>
* using the session transformer.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public class ContextInputModule
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java Fri Jun 16 06:37:07 2006
@@ -33,6 +33,7 @@
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.util.Deprecation;
import org.apache.cocoon.webapps.session.ContextManager;
import org.apache.cocoon.webapps.session.context.SessionContext;
import org.apache.cocoon.webapps.session.context.SessionContextProvider;
@@ -44,6 +45,7 @@
/**
* Context manager
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class DefaultContextManager
@@ -77,6 +79,7 @@
this.contextSelector = (ServiceSelector)this.manager.lookup(SessionContextProvider.ROLE+"Selector");
this.xpathProcessor = (XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
this.resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
+ Deprecation.logger.warn("The session-fw block is deprecated. Please use the provided alternatives instead.");
}
/**
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultFormManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultFormManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultFormManager.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultFormManager.java Fri Jun 16 06:37:07 2006
@@ -42,6 +42,7 @@
/**
* Form handling
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class DefaultFormManager
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultMediaManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultMediaManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultMediaManager.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultMediaManager.java Fri Jun 16 06:37:07 2006
@@ -30,6 +30,7 @@
/**
* This is the default implementation for the media manager
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class DefaultMediaManager
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java Fri Jun 16 06:37:07 2006
@@ -44,6 +44,7 @@
/**
* This is the default implementation of the session manager
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class DefaultSessionManager
@@ -60,16 +61,16 @@
private ContextManager contextManager;
/**
- * Avalon Serviceable Interface
- */
- public void service(ServiceManager manager)
- throws ServiceException {
- this.manager = manager;
- this.contextManager = (ContextManager)this.manager.lookup(ContextManager.ROLE);
- }
+ * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
+ */
+ public void service(ServiceManager manager)
+ throws ServiceException {
+ this.manager = manager;
+ this.contextManager = (ContextManager)this.manager.lookup(ContextManager.ROLE);
+ }
/**
- * Avalon Disposable Interface
+ * @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
public void dispose() {
if (this.manager != null ) {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java Fri Jun 16 06:37:07 2006
@@ -33,6 +33,7 @@
/**
* This is the default implementation for the transaction manager.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class DefaultTransactionManager
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/RequestSessionContext.java Fri Jun 16 06:37:07 2006
@@ -113,6 +113,7 @@
* - getLocales()
* - getAuthType()
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class RequestSessionContext
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SessionContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SessionContext.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SessionContext.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SessionContext.java Fri Jun 16 06:37:07 2006
@@ -38,6 +38,7 @@
* is build in the DOM model.
* As this context is used in a web context, all methods must be synchronized.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface SessionContext
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SessionContextProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SessionContextProvider.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SessionContextProvider.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SessionContextProvider.java Fri Jun 16 06:37:07 2006
@@ -24,6 +24,7 @@
* correctly: for example a request context object should only created once
* per request, an authentication context once per session etc.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public interface SessionContextProvider {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/SimpleSessionContext.java Fri Jun 16 06:37:07 2006
@@ -41,6 +41,7 @@
/**
* This is a simple implementation of the session context.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class SimpleSessionContext
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/context/StandardSessionContextProvider.java Fri Jun 16 06:37:07 2006
@@ -37,6 +37,7 @@
* Context provider for the temporarily context, the request and the
* response context.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class StandardSessionContextProvider
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/selection/MediaSelector.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/selection/MediaSelector.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/selection/MediaSelector.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/selection/MediaSelector.java Fri Jun 16 06:37:07 2006
@@ -28,6 +28,7 @@
/**
* This selector uses the media management.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public final class MediaSelector
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/AbstractSessionTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/AbstractSessionTransformer.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/AbstractSessionTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/AbstractSessionTransformer.java Fri Jun 16 06:37:07 2006
@@ -26,6 +26,7 @@
/**
* This class is the basis for all session transformers.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public abstract class AbstractSessionTransformer extends AbstractSAXTransformer {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.java Fri Jun 16 06:37:07 2006
@@ -49,6 +49,7 @@
* the SessionPreTransformer, although this is not needed (but then the
* implementation of the SessionTransformer would be very unperformant).
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public class SessionPostTransformer extends SessionPreTransformer {
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.java Fri Jun 16 06:37:07 2006
@@ -31,6 +31,7 @@
* and creation commands. This transformer should be the first in the
* pipeline.
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public class SessionPreTransformer
Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionTransformer.java?rev=414824&r1=414823&r2=414824&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/src/main/java/org/apache/cocoon/webapps/session/transformation/SessionTransformer.java Fri Jun 16 06:37:07 2006
@@ -21,6 +21,7 @@
* the SessionPostTransformer whicb inherits from the SessionPreTransformer.
* So those three do all the work
*
+ * @deprecated This block is deprecated and will be removed in future versions.
* @version $Id$
*/
public class SessionTransformer