Author: tony Date: Wed Dec 22 14:35:10 2004 New Revision: 123144 URL: http://svn.apache.org/viewcvs?view=rev&rev=123144 Log: backport from 2.2-dev: fixing enum keyword and adding cocoon-version attribute to output Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/StatusGenerator.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/StatusGenerator.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/StatusGenerator.java?view=diff&rev=123144&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/StatusGenerator.java&r1=123143&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/StatusGenerator.java&r2=123144 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/StatusGenerator.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/StatusGenerator.java Wed Dec 22 14:35:10 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)*> @@ -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) {
