Return-Path: Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 13188 invoked by uid 500); 4 Aug 2003 03:19:04 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 13177 invoked by uid 500); 4 Aug 2003 03:19:04 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 13174 invoked from network); 4 Aug 2003 03:19:04 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 4 Aug 2003 03:19:04 -0000 Received: (qmail 91086 invoked by uid 1672); 4 Aug 2003 03:19:22 -0000 Date: 4 Aug 2003 03:19:22 -0000 Message-ID: <20030804031922.91085.qmail@minotaur.apache.org> From: joerg@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap PreparableMatchNode.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N joerg 2003/08/03 20:19:22 Modified: src/java/org/apache/cocoon/components ExtendedComponentSelector.java CocoonComponentManager.java src/java/org/apache/cocoon/components/language/generator GeneratorSelector.java src/blocks/web3/java/org/apache/cocoon/components/web3/impl Web3DataSourceSelectorImpl.java src/java/org/apache/cocoon/components/treeprocessor/sitemap PreparableMatchNode.java Log: replaced deprecated ComponentException constuctor Revision Changes Path 1.3 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/ExtendedComponentSelector.java Index: ExtendedComponentSelector.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/ExtendedComponentSelector.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ExtendedComponentSelector.java 18 Jun 2003 11:06:31 -0000 1.2 +++ ExtendedComponentSelector.java 4 Aug 2003 03:19:22 -0000 1.3 @@ -335,7 +335,7 @@ public void setParentLocator(ComponentLocator locator) throws ComponentException { if (this.parentSelector != null) { - throw new ComponentException("Parent selector is already set"); + throw new ComponentException(null, "Parent selector is already set"); } this.parentLocator = locator; this.parentSelector = (ComponentSelector) locator.lookup(); 1.16 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/CocoonComponentManager.java Index: CocoonComponentManager.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- CocoonComponentManager.java 11 Jul 2003 14:17:44 -0000 1.15 +++ CocoonComponentManager.java 4 Aug 2003 03:19:22 -0000 1.16 @@ -529,7 +529,7 @@ { super.initialize(); if (parentAwareComponents == null) { - throw new ComponentException("CocoonComponentManager already initialized"); + throw new ComponentException(null, "CocoonComponentManager already initialized"); } // Set parents for parentAware components Iterator iter = parentAwareComponents.iterator(); 1.2 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java Index: GeneratorSelector.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GeneratorSelector.java 9 Mar 2003 00:08:52 -0000 1.1 +++ GeneratorSelector.java 4 Aug 2003 03:19:22 -0000 1.2 @@ -138,7 +138,7 @@ try { this.classManager = (ClassLoaderManager) manager.lookup(ClassLoaderManager.ROLE); } catch (ComponentException cme) { - throw new ComponentException("GeneratorSelector", cme); + throw new ComponentException(ClassLoaderManager.ROLE, "GeneratorSelector", cme); } try { 1.5 +5 -8 cocoon-2.1/src/blocks/web3/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java Index: Web3DataSourceSelectorImpl.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/blocks/web3/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Web3DataSourceSelectorImpl.java 10 Jul 2003 22:14:32 -0000 1.4 +++ Web3DataSourceSelectorImpl.java 4 Aug 2003 03:19:22 -0000 1.5 @@ -118,13 +118,10 @@ Web3DataSourceSelectorImpl.lock.acquire(); if (null != obj) { if (Web3DataSourceSelectorImpl.pools.containsKey(obj)) { - pool = - (Web3DataSource) Web3DataSourceSelectorImpl.pools.get( - obj); + pool = (Web3DataSource)Web3DataSourceSelectorImpl.pools.get(obj); } else { - Configuration a[] = - this.configuration.getChildren("backend"), - c = null; + Configuration a[] = this.configuration.getChildren("backend"); + Configuration c = null; if (null != a) for (int i = 0; i < a.length; i++) { @@ -162,7 +159,7 @@ } } catch (Exception ex) { getLogger().error(ex.getMessage(), ex); - throw new ComponentException(ex.getMessage()); + throw new ComponentException(null, ex.getMessage()); } finally { Web3DataSourceSelectorImpl.lock.release(); } 1.3 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java Index: PreparableMatchNode.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PreparableMatchNode.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PreparableMatchNode.java 11 May 2003 01:49:54 -0000 1.2 +++ PreparableMatchNode.java 4 Aug 2003 03:19:22 -0000 1.3 @@ -117,7 +117,7 @@ } catch(PatternException pe) { String msg = "Invalid pattern '" + this.pattern + "' for matcher at " + this.getLocation(); - throw new ComponentException(msg, pe); + throw new ComponentException(null, msg, pe); } finally { if (this.threadSafeMatcher == null) {