Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 45741 invoked by uid 500); 21 Aug 2002 06:15:33 -0000 Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: cocoon-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cocoon-cvs@xml.apache.org Received: (qmail 45732 invoked by uid 500); 21 Aug 2002 06:15:33 -0000 Delivered-To: apmail-xml-cocoon2-cvs@apache.org Date: 21 Aug 2002 06:15:32 -0000 Message-ID: <20020821061532.9361.qmail@icarus.apache.org> From: stephan@apache.org To: xml-cocoon2-cvs@apache.org Subject: cvs commit: xml-cocoon2/src/webapp/WEB-INF cocoon.xconf X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N stephan 2002/08/20 23:15:32 Modified: src/java/org/apache/cocoon cocoon.roles src/java/org/apache/cocoon/generation velocity.xmap src/java/org/apache/cocoon/serialization fop.xmap svg.xmap src/webapp sitemap.xmap src/webapp/WEB-INF cocoon.xconf Added: src/java/org/apache/cocoon/components/deli deli.xroles src/java/org/apache/cocoon/components/flow flow.xroles src/java/org/apache/cocoon/components/hsqldb hsqldb.xroles src/java/org/apache/cocoon/components/modules modules.xroles src/java/org/apache/cocoon/components/profiler profiler.xconf profiler.xmap profiler.xroles src/java/org/apache/cocoon/components/sax serializer.xconf serializer.xroles src/java/org/apache/cocoon/components/search lucene.xroles src/java/org/apache/cocoon/components/store store.xroles src/java/org/apache/cocoon/generation ProfilerGenerator.java chaperon.xmap profiler.xmap src/java/org/apache/cocoon/transformation chaperon.xmap Removed: src/java/org/apache/cocoon/components/profiler ProfilerGenerator.java Log: Move some entries of cocoon.roles, sitemap.xmap and cocoon.xconf into separate files. Prepare the speparation of the 'modules'. Revision Changes Path 1.35 +0 -55 xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles Index: cocoon.roles =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/cocoon.roles,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- cocoon.roles 13 Aug 2002 08:30:19 -0000 1.34 +++ cocoon.roles 21 Aug 2002 06:15:30 -0000 1.35 @@ -52,9 +52,6 @@ shorthand="browser" default-class="org.apache.cocoon.components.browser.BrowserImpl"/> - - @@ -123,14 +120,6 @@ shorthand="xml-deserializer" default-class="org.apache.cocoon.components.sax.XMLByteStreamInterpreter"/> - - - - @@ -139,23 +128,6 @@ shorthand="cache" default-class="org.apache.cocoon.caching.impl.CacheImpl"/> - - - - - - - - - - - - - - - - - - - - - - - - 1.1 xml-cocoon2/src/java/org/apache/cocoon/components/flow/flow.xroles Index: flow.xroles =================================================================== 1.1 xml-cocoon2/src/java/org/apache/cocoon/components/hsqldb/hsqldb.xroles Index: hsqldb.xroles =================================================================== 1.1 xml-cocoon2/src/java/org/apache/cocoon/components/modules/modules.xroles Index: modules.xroles =================================================================== 1.1 xml-cocoon2/src/java/org/apache/cocoon/components/profiler/profiler.xconf Index: profiler.xconf =================================================================== 1.1 xml-cocoon2/src/java/org/apache/cocoon/components/profiler/profiler.xmap Index: profiler.xmap =================================================================== 1.1 xml-cocoon2/src/java/org/apache/cocoon/components/profiler/profiler.xroles Index: profiler.xroles =================================================================== 1.1 xml-cocoon2/src/java/org/apache/cocoon/components/sax/serializer.xconf Index: serializer.xconf ===================================================================

1.1 xml-cocoon2/src/java/org/apache/cocoon/components/sax/serializer.xroles Index: serializer.xroles =================================================================== 1.1 xml-cocoon2/src/java/org/apache/cocoon/components/search/lucene.xroles Index: lucene.xroles =================================================================== 1.1 xml-cocoon2/src/java/org/apache/cocoon/components/store/store.xroles Index: store.xroles =================================================================== 1.2 +2 -6 xml-cocoon2/src/java/org/apache/cocoon/generation/velocity.xmap Index: velocity.xmap =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/velocity.xmap,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- velocity.xmap 9 Mar 2002 06:27:15 -0000 1.1 +++ velocity.xmap 21 Aug 2002 06:15:31 -0000 1.2 @@ -1,8 +1,4 @@ - - - + + 1.1 xml-cocoon2/src/java/org/apache/cocoon/generation/ProfilerGenerator.java Index: ProfilerGenerator.java =================================================================== /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact apache@apache.org. 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi . For more information on the Apache Software Foundation, please see . */ package org.apache.cocoon.generation; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.cocoon.components.profiler.Profiler; import org.apache.cocoon.components.profiler.ProfilerResult; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; import java.text.DateFormat; import java.util.Collection; import java.util.Date; import java.util.Iterator; /** * Generates an XML representation of the current status of Profiler. * * @author Vadim Gritsenko * @author Stephan Michels * @version CVS $Id: ProfilerGenerator.java,v 1.1 2002/08/21 06:15:31 stephan Exp $ */ public class ProfilerGenerator extends ComposerGenerator { /** * The XML namespace for the output document. */ protected static final String namespace = "http://apache.org/cocoon/profiler/1.0"; private Profiler profiler; /** * Composable */ public void compose(ComponentManager manager) throws ComponentException { super.compose(manager); this.profiler = (Profiler)super.manager.lookup(Profiler.ROLE); } /** * Disposable */ public void dispose() { if (this.profiler != null){ super.manager.release(this.profiler); this.profiler = null; } super.dispose(); } /** * Generate the status information in XML format. * @throws SAXException * when there is a problem creating the output SAX events. */ public void generate() throws SAXException { // Start the document and set the namespace. this.contentHandler.startDocument(); this.contentHandler.startPrefixMapping("", namespace); generate(this.contentHandler); // End the document. this.contentHandler.endPrefixMapping(""); this.contentHandler.endDocument(); } /** Generate the main status document. */ private void generate(ContentHandler ch) throws SAXException { // Root element. // The current date and time. String dateTime = DateFormat.getDateTimeInstance().format(new Date()); AttributesImpl atts = new AttributesImpl(); atts.addAttribute(namespace, "date", "date", "CDATA", dateTime); ch.startElement(namespace, "profilerinfo", "profilerinfo", atts); Collection results = profiler.getResults(); for(Iterator i = results.iterator(); i.hasNext();) generateResult(ch, (ProfilerResult)i.next()); // End root element. ch.endElement(namespace, "profilerinfo", "profilerinfo"); } private void generateResult(ContentHandler ch, ProfilerResult result) throws SAXException { AttributesImpl atts = new AttributesImpl(); int count = result.getCount(); String[] roles = result.getRoles(); // Roles of the components String[] source = result.getSources(); // Source of the components long[] totalTime = result.getTotalTime(); // Total time of the requests long totalTimeSum = 0; // Total time of all requests for(int i=0; i < count; i++) totalTimeSum += totalTime[i]; atts.addAttribute(namespace, "uri", "uri", "CDATA", result.getURI()); atts.addAttribute(namespace, "count", "count", "CDATA", Integer.toString(result.getCount())); atts.addAttribute(namespace, "time", "time", "CDATA", Long.toString(totalTimeSum)); ch.startElement(namespace, "pipeline", "pipeline", atts); atts.clear(); if(count > 0){ atts.addAttribute(namespace, "time", "time", "CDATA", Long.toString(totalTimeSum / count)); ch.startElement(namespace, "average", "average", atts); atts.clear(); long[][] timeOfComponents = result.getLastTimes(); // Time of each component long[] totalTimeOfComponents = new long[roles.length]; // Time of each component for all requests for(int j=0; j 1.1 xml-cocoon2/src/java/org/apache/cocoon/generation/profiler.xmap Index: profiler.xmap =================================================================== 1.2 +5 -5 xml-cocoon2/src/java/org/apache/cocoon/serialization/fop.xmap Index: fop.xmap =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/fop.xmap,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fop.xmap 9 Mar 2002 06:28:26 -0000 1.1 +++ fop.xmap 21 Aug 2002 06:15:31 -0000 1.2 @@ -1,8 +1,8 @@ + + - - - - + + + 1.4 +8 -4 xml-cocoon2/src/java/org/apache/cocoon/serialization/svg.xmap Index: svg.xmap =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/svg.xmap,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- svg.xmap 21 Aug 2002 05:17:46 -0000 1.3 +++ svg.xmap 21 Aug 2002 06:15:31 -0000 1.4 @@ -1,10 +1,14 @@ - - + + + -//W3C//DTD SVG 20000303 Stylable//EN + http://www.w3.org/TR/2000/03/WD-SVG-20000303/ + + + - + 1.1 xml-cocoon2/src/java/org/apache/cocoon/transformation/chaperon.xmap Index: chaperon.xmap =================================================================== 1.74 +0 -24 xml-cocoon2/src/webapp/sitemap.xmap Index: sitemap.xmap =================================================================== RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- sitemap.xmap 20 Aug 2002 06:41:03 -0000 1.73 +++ sitemap.xmap 21 Aug 2002 06:15:31 -0000 1.74 @@ -64,16 +64,12 @@ - - - - 1.37 +0 -139 xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf Index: cocoon.xconf =================================================================== RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/cocoon.xconf,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- cocoon.xconf 20 Aug 2002 16:15:27 -0000 1.36 +++ cocoon.xconf 21 Aug 2002 06:15:32 -0000 1.37 @@ -429,19 +429,6 @@ - - @@ -466,22 +453,6 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - defaultSkin - http://localhost:8080/cocoon - - - - - - - - - - - - - - - - - - - - - resource://org/apache/cocoon/components/flow/javascript/system.js - - - - - - - - - - ---------------------------------------------------------------------- In case of troubles, e-mail: webmaster@xml.apache.org To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org For additional commands, e-mail: cocoon-cvs-help@xml.apache.org