From adffaces-commits-return-32-apmail-incubator-adffaces-commits-archive=incubator.apache.org@incubator.apache.org Fri May 26 18:34:03 2006 Return-Path: Delivered-To: apmail-incubator-adffaces-commits-archive@locus.apache.org Received: (qmail 10748 invoked from network); 26 May 2006 18:34:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 May 2006 18:34:03 -0000 Received: (qmail 91590 invoked by uid 500); 26 May 2006 18:34:03 -0000 Delivered-To: apmail-incubator-adffaces-commits-archive@incubator.apache.org Received: (qmail 91543 invoked by uid 500); 26 May 2006 18:34:03 -0000 Mailing-List: contact adffaces-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: adffaces-dev@incubator.apache.org Delivered-To: mailing list adffaces-commits@incubator.apache.org Received: (qmail 91534 invoked by uid 99); 26 May 2006 18:34:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 May 2006 11:34:03 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 May 2006 11:34:02 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6852A1A983A; Fri, 26 May 2006 11:33:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r409718 - /incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java Date: Fri, 26 May 2006 18:33:42 -0000 To: adffaces-commits@incubator.apache.org From: awiner@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060526183342.6852A1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: awiner Date: Fri May 26 11:33:41 2006 New Revision: 409718 URL: http://svn.apache.org/viewvc?rev=409718&view=rev Log: Remove references to ChangeManager implementations that don't exist in the Apache repos; support registering a ChanageManager by class name Modified: incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java Modified: incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java?rev=409718&r1=409717&r2=409718&view=diff ============================================================================== --- incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java (original) +++ incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java Fri May 26 11:33:41 2006 @@ -284,25 +284,16 @@ _CHANGE_PERSISTENCE_INIT_PARAM); if (changeManager != null) { + // Support the "session" token if ("session".equalsIgnoreCase(changeManager)) { _LOG.info("ADF Faces is using HTTPSession for change persistence"); return new SessionChangeManager(); } - else if ("mds".equalsIgnoreCase(changeManager)) - { - _LOG.info("ADF Faces is using MDS for change persistence"); - return _createChangeManager("org.apache.myfaces.adfinternal.change.MDSDocumentChangeManager"); - } - else if ("test".equalsIgnoreCase(changeManager)) - { - _LOG.info("ADF Faces is using TestDocumentChangeManager for change persistence"); - return _createChangeManager("org.apache.myfaces.adfinternal.change.TestDocumentChangeManager"); - } + // Otherwise, just assume its a class name. else { - _LOG.warning("Unknown value:{0} for web.xml init parameter:{1}", - new Object[] {changeManager, _CHANGE_PERSISTENCE_INIT_PARAM}); + return _createChangeManager(changeManager); } } return new NullChangeManager(); @@ -317,28 +308,17 @@ private ChangeManager _createChangeManager( String className) { - ChangeManager manager = null; - Throwable e = null; - try { Class managerClass = ClassLoaderUtils.loadClass(className); - manager = (ChangeManager)managerClass.newInstance(); + return (ChangeManager)managerClass.newInstance(); } catch (Throwable throwable) { - e = throwable; + _LOG.warning("Unable to create ChangeManager:" + className, + throwable); + return new NullChangeManager(); } - - // if loading the specified class failed, - if (manager == null) - { - _LOG.warning("Unable to create ChangeManager:" + className, e); // NOTRANS - - manager = new SessionChangeManager(); - } - - return manager; }