Author: tony Date: Wed Dec 22 14:21:46 2004 New Revision: 123142 URL: http://svn.apache.org/viewcvs?view=rev&rev=123142 Log: fixing 'enum' keyword and adding cocoon-version attribute to output Modified: cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java
Modified: cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java?view=diff&rev=123142&p1=cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java&r1=123141&p2=cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java&r2=123142 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/generation/StatusGenerator.java Wed Dec 22 14:21:46 2004 @@ -27,6 +27,7 @@ import org.apache.avalon.framework.service.ServiceException; import org.apache.avalon.framework.service.ServiceManager; +import org.apache.cocoon.Constants; import org.apache.commons.lang.SystemUtils; import org.apache.excalibur.store.Store; import org.apache.excalibur.store.StoreJanitor; @@ -55,6 +56,7 @@ * <!ATTLIST statusinfo * date CDATA #IMPLIED * host CDATA #IMPLIED + * cocoon-version CDATA #IMPLIED * > * * <!ELEMENT group (group|value)*> @@ -74,7 +76,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a> * @author <a href="mailto:[EMAIL PROTECTED]">Sébastien Kœchlin</a> (iVision) * @author <a href="mailto:[EMAIL PROTECTED]">Gerhard Froehlich</a> - * @version CVS $Id: StatusGenerator.java,v 1.10 2004/07/02 08:33:42 antonio Exp $ + * @version CVS $Id$ */ public class StatusGenerator extends ServiceableGenerator { @@ -172,6 +174,7 @@ AttributesImpl atts = new AttributesImpl(); atts.addAttribute(namespace, "date", "date", "CDATA", dateTime); atts.addAttribute(namespace, "host", "host", "CDATA", localHost); + atts.addAttribute(namespace, "cocoon-version", "cocoon-version", "CDATA", Constants.VERSION); ch.startElement(namespace, "statusinfo", "statusinfo", atts); genVMStatus(ch); @@ -271,11 +274,11 @@ atts.clear(); atts.addAttribute(namespace, "name", "name", "CDATA", "cached"); ch.startElement(namespace, "value", "value", atts); - Enumeration enum = this.store_persistent.keys(); - while (enum.hasMoreElements()) { + Enumeration enumer = this.store_persistent.keys(); + while (enumer.hasMoreElements()) { size++; - Object key = enum.nextElement(); + Object key = enumer.nextElement(); Object val = store_persistent.get(key); String line = null; if (val == null) {
