Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 10236 invoked from network); 24 Oct 2003 13:45:11 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 24 Oct 2003 13:45:11 -0000 Received: (qmail 80291 invoked by uid 500); 24 Oct 2003 13:45:07 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 80234 invoked by uid 500); 24 Oct 2003 13:45:07 -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 80223 invoked by uid 500); 24 Oct 2003 13:45:06 -0000 Delivered-To: apmail-cocoon-2.2-cvs@apache.org Received: (qmail 80220 invoked from network); 24 Oct 2003 13:45:06 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 24 Oct 2003 13:45:06 -0000 Received: (qmail 10212 invoked by uid 1342); 24 Oct 2003 13:45:10 -0000 Date: 24 Oct 2003 13:45:10 -0000 Message-ID: <20031024134510.10211.qmail@minotaur.apache.org> From: vgritsenko@apache.org To: cocoon-2.2-cvs@apache.org Subject: cvs commit: cocoon-2.2/src/java/org/apache/cocoon/sitemap ContentAggregator.java SitemapRedirector.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N vgritsenko 2003/10/24 06:45:10 Modified: src/java/org/apache/cocoon/sitemap ContentAggregator.java SitemapRedirector.java src/java/org/apache/cocoon/sitemap ContentAggregator.java SitemapRedirector.java Log: Log messages cleanup Revision Changes Path 1.5 +16 -17 cocoon-2.1/src/java/org/apache/cocoon/sitemap/ContentAggregator.java Index: ContentAggregator.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/sitemap/ContentAggregator.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ContentAggregator.java 5 Sep 2003 11:40:41 -0000 1.4 +++ ContentAggregator.java 24 Oct 2003 13:45:10 -0000 1.5 @@ -139,8 +139,8 @@ */ public void generate() throws IOException, SAXException, ProcessingException { - if (this.getLogger().isDebugEnabled()) { - getLogger().debug("ContentAggregator: generating aggregated content"); + if (getLogger().isDebugEnabled()) { + getLogger().debug("Generating aggregated content"); } this.contentHandler.startDocument(); this.startElem(this.rootElement); @@ -167,7 +167,7 @@ this.endElem(this.rootElement); this.contentHandler.endDocument(); } - getLogger().debug("ContentAggregator: finished aggregating content"); + getLogger().debug("Finished aggregating content"); } /** @@ -202,7 +202,7 @@ } return buffer.toString(); } catch (Exception e) { - getLogger().error("ContentAggregator: could not generateKey", e); + getLogger().error("Could not generateKey", e); return null; } } @@ -228,7 +228,7 @@ } return v; } catch (Exception e) { - getLogger().error("ContentAggregator: could not generateKey", e); + getLogger().error("Could not getValidity", e); return null; } } @@ -240,9 +240,9 @@ this.rootElement = new Element(element, namespace, prefix); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug("ContentAggregator: root element='" + element + - "' ns='" + namespace + "' prefix='" + prefix + "'"); + if (getLogger().isDebugEnabled()) { + getLogger().debug("Root element='" + element + + "' ns='" + namespace + "' prefix='" + prefix + "'"); } } @@ -269,10 +269,10 @@ this.parts.add(new Part(uri, elem, stripRootElement)); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug("ContentAggregator: part uri='" + uri + - "' element='" + element + "' ns='" + namespace + - "' stripRootElement='" + stripRootElement + "' prefix='" + prefix + "'"); + if (getLogger().isDebugEnabled()) { + getLogger().debug("Part uri='" + uri + + "' element='" + element + "' ns='" + namespace + + "' stripRootElement='" + stripRootElement + "' prefix='" + prefix + "'"); } } @@ -297,7 +297,7 @@ final Part current = (Part)this.parts.get(i); if (current.source != null) { if (getLogger().isDebugEnabled()) { - getLogger().debug("releasing " + String.valueOf(current.source)); + getLogger().debug("Releasing " + String.valueOf(current.source)); } this.resolver.release(current.source); } @@ -369,7 +369,7 @@ throws SAXException { this.rootElementIndex++; if (this.rootElementIndex == 0) { - getLogger().debug("ContentAggregator: skipping root element start event."); + getLogger().debug("Skipping root element start event."); return; } if (namespaceURI == null || namespaceURI.equals("")) { @@ -386,7 +386,7 @@ public void endElement(String namespaceURI, String localName, String raw) throws SAXException { this.rootElementIndex--; if (this.rootElementIndex == -1) { - getLogger().debug("ContentAggregator: skipping root element end event."); + getLogger().debug("Skipping root element end event."); return; } if (namespaceURI == null || namespaceURI.equals("")) { @@ -403,5 +403,4 @@ public void service(ServiceManager manager) throws ServiceException { this.manager = manager; } - } 1.3 +4 -5 cocoon-2.1/src/java/org/apache/cocoon/sitemap/SitemapRedirector.java Index: SitemapRedirector.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/sitemap/SitemapRedirector.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SitemapRedirector.java 5 Sep 2003 11:40:41 -0000 1.2 +++ SitemapRedirector.java 24 Oct 2003 13:45:10 -0000 1.3 @@ -83,10 +83,9 @@ public void globalRedirect(boolean sessionMode, String url) throws IOException { if (e instanceof EnvironmentWrapper) { - ((EnvironmentWrapper)e).globalRedirect(sessionMode,url); - } - else { - e.redirect(sessionMode, url); + ((EnvironmentWrapper)e).globalRedirect(sessionMode,url); + } else { + e.redirect(sessionMode, url); } this.hasRedirected = true; } 1.6 +16 -17 cocoon-2.2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java Index: ContentAggregator.java =================================================================== RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/ContentAggregator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ContentAggregator.java 22 Oct 2003 18:08:10 -0000 1.5 +++ ContentAggregator.java 24 Oct 2003 13:45:10 -0000 1.6 @@ -139,8 +139,8 @@ */ public void generate() throws IOException, SAXException, ProcessingException { - if (this.getLogger().isDebugEnabled()) { - getLogger().debug("ContentAggregator: generating aggregated content"); + if (getLogger().isDebugEnabled()) { + getLogger().debug("Generating aggregated content"); } this.contentHandler.startDocument(); this.startElem(this.rootElement); @@ -167,7 +167,7 @@ this.endElem(this.rootElement); this.contentHandler.endDocument(); } - getLogger().debug("ContentAggregator: finished aggregating content"); + getLogger().debug("Finished aggregating content"); } /** @@ -202,7 +202,7 @@ } return buffer.toString(); } catch (Exception e) { - getLogger().error("ContentAggregator: could not generateKey", e); + getLogger().error("Could not generateKey", e); return null; } } @@ -228,7 +228,7 @@ } return v; } catch (Exception e) { - getLogger().error("ContentAggregator: could not generateKey", e); + getLogger().error("Could not getValidity", e); return null; } } @@ -240,9 +240,9 @@ this.rootElement = new Element(element, namespace, prefix); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug("ContentAggregator: root element='" + element + - "' ns='" + namespace + "' prefix='" + prefix + "'"); + if (getLogger().isDebugEnabled()) { + getLogger().debug("Root element='" + element + + "' ns='" + namespace + "' prefix='" + prefix + "'"); } } @@ -269,10 +269,10 @@ this.parts.add(new Part(uri, elem, stripRootElement)); - if (this.getLogger().isDebugEnabled()) { - this.getLogger().debug("ContentAggregator: part uri='" + uri + - "' element='" + element + "' ns='" + namespace + - "' stripRootElement='" + stripRootElement + "' prefix='" + prefix + "'"); + if (getLogger().isDebugEnabled()) { + getLogger().debug("Part uri='" + uri + + "' element='" + element + "' ns='" + namespace + + "' stripRootElement='" + stripRootElement + "' prefix='" + prefix + "'"); } } @@ -297,7 +297,7 @@ final Part current = (Part)this.parts.get(i); if (current.source != null) { if (getLogger().isDebugEnabled()) { - getLogger().debug("releasing " + String.valueOf(current.source)); + getLogger().debug("Releasing " + String.valueOf(current.source)); } this.resolver.release(current.source); } @@ -369,7 +369,7 @@ throws SAXException { this.rootElementIndex++; if (this.rootElementIndex == 0) { - getLogger().debug("ContentAggregator: skipping root element start event."); + getLogger().debug("Skipping root element start event."); return; } if (namespaceURI == null || namespaceURI.equals("")) { @@ -386,7 +386,7 @@ public void endElement(String namespaceURI, String localName, String raw) throws SAXException { this.rootElementIndex--; if (this.rootElementIndex == -1) { - getLogger().debug("ContentAggregator: skipping root element end event."); + getLogger().debug("Skipping root element end event."); return; } if (namespaceURI == null || namespaceURI.equals("")) { @@ -403,5 +403,4 @@ public void service(ServiceManager manager) throws ServiceException { this.manager = manager; } - } 1.3 +4 -5 cocoon-2.2/src/java/org/apache/cocoon/sitemap/SitemapRedirector.java Index: SitemapRedirector.java =================================================================== RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/sitemap/SitemapRedirector.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SitemapRedirector.java 5 Sep 2003 11:40:41 -0000 1.2 +++ SitemapRedirector.java 24 Oct 2003 13:45:10 -0000 1.3 @@ -83,10 +83,9 @@ public void globalRedirect(boolean sessionMode, String url) throws IOException { if (e instanceof EnvironmentWrapper) { - ((EnvironmentWrapper)e).globalRedirect(sessionMode,url); - } - else { - e.redirect(sessionMode, url); + ((EnvironmentWrapper)e).globalRedirect(sessionMode,url); + } else { + e.redirect(sessionMode, url); } this.hasRedirected = true; }