http://blog.gmane.org/gmane.text.xml.forrest.cvs hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9480 Author: thorsten Date: Wed Dec 3 06:00:51 2008 New Revision: 722889 URL: http://svn.apache.org/viewvc?rev=722889&view=rev Log: Fixing various issues with the properties recording (should work fine again). Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java?rev=722889&r1=722888&r2=722889&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java Wed Dec 3 06:00:51 2008 < at >< at > -57,10 +57,12 < at >< at > import org.apache.cocoon.environment.SourceResolver; import org.apache.cocoon.transformation.AbstractSAXTransformer; import org.apache.cocoon.util.TraxErrorHandler; +import org.apache.cocoon.xml.XMLUtils; import org.apache.excalibur.source.Source; import org.apache.excalibur.source.SourceException; import org.apache.excalibur.source.SourceValidity; import org.apache.excalibur.xml.sax.SAXParser; +import org.apache.excalibur.xml.sax.XMLizable; import org.apache.forrest.dispatcher.api.Contract; import org.apache.forrest.dispatcher.api.Resolver; import org.apache.forrest.dispatcher.api.Structurer; < at >< at > -244,6 +246,8 < at >< at > private InputStream dataStream; + private String prefixString; + /* * < at >see * org.apache.cocoon.transformation.AbstractSAXTransformer#configure(org.apache < at >< at > -389,9 +393,11 < at >< at > throws SAXException { // Process start element event // Are we inside of properties? If so we need to record the elements. + if (this.insideProperties && this.includeNodes) { // just start the recording - startSerializedXMLRecording(null); + super.startElement(uri, name, raw, attr); + //startSerializedXMLRecording(null); } else if (Captions.NS.equals(uri)) { // we are in the dispatcher ns try { < at >< at > -399,7 +405,7 < at >< at > * We are in the dispatcher ns. */ getLogger().debug("Starting dispatcher element: " + raw); - if (Captions.STRUCTURER_ELEMENT.equals(name)) { + if (Captions.STRUCTURE_ELEMENT.equals(name)) { // we are in a structurer definition structurerProcessingStart(attr); } < at >< at > -434,6 +440,7 < at >< at > */ public void endElement(String uri, String name, String raw) throws SAXException { + System.out.println(); getLogger().debug("Ending element: " + raw); if (Captions.NS.equals(uri)) { // we are in the dispatcher ns < at >< at > -444,6 +451,7 < at >< at > } else if (Captions.HOOK_ELEMENT.equals(name) && this.includeNodes) { // we are inside a hook end element // FIXME Implement + System.out.println("FIXME Implement "); } else if (Captions.CONTRACT_ELEMENT.equals(name) && this.includeNodes) { // we are inside a contract end element contractProcessingEnd(); < at >< at > -452,8 +460,9 < at >< at > if (allowXml) { String property = null; try { - super.endElement(uri, name, raw); - property = super.endSerializedXMLRecording(); + property = prefixString+super.endSerializedXMLRecording()+"</forrest:property>"; + insideProperties = false; + System.out.println("super.endSerializedXMLRecording(): "+property); } catch (ProcessingException e) { throw new SAXException(e); } < at >< at > -462,6 +471,7 < at >< at > } } else { // FIXME Implement + System.out.println("FIXME Implement "); } } } catch (ContractException e) { < at >< at > -473,7 +483,7 < at >< at > } catch (XMLStreamException e) { throw new SAXException(e); } - } else if (!this.insideProperties && this.includeNodes) { + } else if (this.insideProperties && this.includeNodes) { super.endElement(uri, name, raw); } } < at >< at > -546,7 +556,7 < at >< at > } } else { // lookup the node where we want to inject the result part - xpath = PATH_PREFIX + xpath; + xpath = "/" + PATH_PREFIX + xpath; // we need to feed the xpathSelector with the ns we may have AXIOMXPathCreate xpathSelector = new AXIOMXPathCreate(xpath); // add all namespaces that are known to the selector < at >< at > -601,6 +611,7 < at >< at > private void structurerProcessingEnd(String raw) { if (includeNodes) { // FIXME: implement + System.out.println("FIXME Implement "); } } < at >< at > -619,9 +630,11 < at >< at > Attributes attr) throws SAXException { // determine the name and a possible value String id = null, value = null; + String attributesString =""; for (int i = 0; i < attr.getLength(); i++) { String localName = attr.getLocalName(i); String localValue = attr.getValue(i); + attributesString += " "+localName+"=\""+localValue+"\""; if (Captions.NAME_ATT.equals(localName)) { id = localValue; } else if (Captions.VALUE_ATT.equals(localName)) { < at >< at > -630,9 +643,9 < at >< at > } // if we allow xml properties we will just record them if (allowXml) { - // just start the recording - startSerializedXMLRecording(null); - super.startElement(uri, name, raw, attr); + // just start the recording + prefixString = "<"+raw+attributesString+">"; + startSerializedXMLRecording(XMLUtils.createPropertiesForXML(true)); currentProperty = id; } else { // if we do not allow xml we will use a simple key/value approach thorsten< at >apache.org 2008-12-03T14:00:51 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9479 Author: thorsten Date: Wed Dec 3 03:55:46 2008 New Revision: 722848 URL: http://svn.apache.org/viewvc?rev=722848&view=rev Log: white noise - formating changes Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java?rev=722848&r1=722847&r2=722848&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java Wed Dec 3 03:55:46 2008 < at >< at > -32,16 +32,16 < at >< at > /** * - * Return the Node from the rootNode using the XPath expression path. - * If the node does not exist, it is created and then returned. This is a very - * simple method for creating new nodes. If the XPath contains selectors ([,,,]) - * or "*" it is of course not possible to create the new node. So if you use - * such XPaths the node must exist beforehand. An simple exception is if the - * expression contains attribute test to values (e.g. [< at >id = 'du' and < at >select = 'true']) + * Return the Node from the rootNode using the XPath expression path. If the + * node does not exist, it is created and then returned. This is a very simple + * method for creating new nodes. If the XPath contains selectors ([,,,]) or "*" + * it is of course not possible to create the new node. So if you use such + * XPaths the node must exist beforehand. An simple exception is if the + * expression contains attribute test to values (e.g. [< at >id = 'du' and < at >select = + * 'true']) * * - * Issue: - * WSCOMMONS-389 + * Issue: WSCOMMONS-389 * * As soon the above issue is fixed we need to drop this implementation since * this class will be go into the axiom code base. < at >< at > -81,8 +81,9 < at >< at > xpathNode = xpath.selectSingleNode(root); if (xpathNode == null) { int endIndex = path.lastIndexOf("/"); - if(endIndex<0){ - // we need to break here if we do not want to provoke a StringIndexOutOfBoundsException + if (endIndex < 0) { + // we need to break here if we do not want to provoke a + // StringIndexOutOfBoundsException break; } rest = path.substring(endIndex + 1) + "/" + rest; thorsten< at >apache.org 2008-12-03T11:55:46 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9478 Author: thorsten Date: Wed Dec 3 03:55:17 2008 New Revision: 722846 URL: http://svn.apache.org/viewvc?rev=722846&view=rev Log: if we do not find a / we will break to not produce a StringIndexOutOfBoundsException Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java?rev=722846&r1=722845&r2=722846&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java Wed Dec 3 03:55:17 2008 < at >< at > -81,6 +81,10 < at >< at > xpathNode = xpath.selectSingleNode(root); if (xpathNode == null) { int endIndex = path.lastIndexOf("/"); + if(endIndex<0){ + // we need to break here if we do not want to provoke a StringIndexOutOfBoundsException + break; + } rest = path.substring(endIndex + 1) + "/" + rest; path = path.substring(0, endIndex); } else if (xpathNode != null) { thorsten< at >apache.org 2008-12-03T11:55:18 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9477 Author: thorsten Date: Tue Dec 2 03:57:23 2008 New Revision: 722435 URL: http://svn.apache.org/viewvc?rev=722435&view=rev Log: white noise - formating changes Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java?rev=722435&r1=722434&r2=722435&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherWrapperTransformer.java Tue Dec 2 03:57:23 2008 < at >< at > -77,8 +77,8 < at >< at > * < at >version 1.0 * */ -public class DispatcherWrapperTransformer extends AbstractSAXTransformer implements - Disposable, CacheableProcessingComponent, URIResolver { +public class DispatcherWrapperTransformer extends AbstractSAXTransformer + implements Disposable, CacheableProcessingComponent, URIResolver { /** * The requested format. < at >< at > -143,11 +143,13 < at >< at > private WritableDispatcherBean config; /** - * Cocoon 2.2 compatible method. - * Allow that the ServiceManager is be set via e.g. spring - * < at >param manager manger to use in the context + * Cocoon 2.2 compatible method. Allow that the ServiceManager is be set via + * e.g. spring + * + * < at >param manager + * manger to use in the context */ - public void setManager(ServiceManager manager){ + public void setManager(ServiceManager manager) { this.manager = manager; } < at >< at > -162,7 +164,8 < at >< at > private String xpathSupport; /** - * < at >param xpathSupport the xpathSupport to set + * < at >param xpathSupport + * the xpathSupport to set */ public synchronized void setXpathSupport(String xpathSupport) { this.xpathSupport = xpathSupport; < at >< at > -185,10 +188,11 < at >< at > private static final String DEFAULT_VARIABLES = "defaultVariables"; /** - * preparing the parser that will pick up the result and - * pass it to the consumer again. + * preparing the parser that will pick up the result and pass it to the + * consumer again. */ SAXParser parser = null; + /* * < at >see * org.apache.cocoon.transformation.AbstractSAXTransformer#configure(org.apache < at >< at > -205,25 +209,29 < at >< at > config.setAllowXmlProperties(allowXml); contractUriPrefix = configuration.getChild("contractUriPrefix").getValue( "cocoon://resolve.contract."); - config.setContractUriSufix(configuration.getChild("contractUriSufix").getValue("")); + config.setContractUriSufix(configuration.getChild("contractUriSufix") + .getValue("")); xpathSupport = configuration.getChild("xpathSupport").getValue("basic"); boolean shrink = configuration.getChild("shrink").getValueAsBoolean(true); config.setShrink(shrink); setNewTransformerFactory(); } - + /** - * Cocoon 2.2 compatible method. - * Allow that the WritableDispatcherBean is be set via e.g. spring - * < at >param config the configuration to use. + * Cocoon 2.2 compatible method. Allow that the WritableDispatcherBean is be + * set via e.g. spring + * + * < at >param config + * the configuration to use. */ public void setConfig(WritableDispatcherBean config) { this.config = config; - if(config.getTransFact()==null){ + if (config.getTransFact() == null) { setNewTransformerFactory(); } contractUriPrefix = config.getContractUriPrefix(); } + private void setNewTransformerFactory() throws TransformerFactoryConfigurationError { // FIXME: is this the best way to get an instance in cocoon? < at >< at > -243,8 +251,9 < at >< at > .getParameter(DISPATCHER_REQUEST_ATTRIBUTE, null); this.cacheKey = parameters.getParameter(CACHE_PARAMETER, null); if (null == this.cacheKey) - getLogger().warn("Caching not activated! Declare the CACHE_KEY_PARAMETER=" - + CACHE_PARAMETER + " in your sitemap."); + getLogger().warn( + "Caching not activated! Declare the CACHE_KEY_PARAMETER=" + + CACHE_PARAMETER + " in your sitemap."); this.validityFile = parameters.getParameter(VALIDITY_PARAMETER, null); this.validityChecking = parameters.getParameter( VALIDITY_OVERRIDE_PARAMETER, ""); < at >< at > -268,7 +277,7 < at >< at > throw new ProcessingException(error); } this.cacheKey += requestedFormat; - if (null == m_resolver){ + if (null == m_resolver) { try { m_resolver = (org.apache.excalibur.source.SourceResolver) manager .lookup(SourceResolver.ROLE); < at >< at > -278,31 +287,31 < at >< at > } } } - -/* - * Here we just start recording to use them later on. - * - * In the future we may want to implement a sax based - * structurer implementation again. - * - * old transformer link < at >see - * http://svn.apache.org/viewvc?view=rev&revision=694101 - * - * < at >see org.apache.cocoon.transformation.AbstractSAXTransformer#startDocument() - */ + + /* + * Here we just start recording to use them later on. + * + * In the future we may want to implement a sax based structurer + * implementation again. + * + * old transformer link < at >see + * http://svn.apache.org/viewvc?view=rev&revision=694101 + * + * < at >see + * org.apache.cocoon.transformation.AbstractSAXTransformer#startDocument() + */ public void startDocument() throws SAXException { // just start the recording startSerializedXMLRecording(null); } /* - * Here we pick up the recoreder result and start the - * processing on it. + * Here we pick up the recoreder result and start the processing on it. * * < at >see org.apache.cocoon.transformation.AbstractSAXTransformer#endDocument() */ public void endDocument() throws SAXException { - + // start structurer routine Structurer structurer = null; // need to get the properties for this uri < at >< at > -312,28 +321,26 < at >< at > // get the source representation of the propertyURI Source propsSource = m_resolver.resolveURI(propertyURI); if (propsSource != null) { - // get the stream + // get the stream InputStream stream = new BufferedInputStream(propsSource .getInputStream()); /* - * we need either just the bytes of the stream (if we allow - * xml properties) or we need to process it extracting the - * properties. + * we need either just the bytes of the stream (if we allow xml + * properties) or we need to process it extracting the properties. */ if (config.isAllowXmlProperties()) { // get the bytes from the stream byte[] properties = IOUtils.getStreamAsByteArray(stream); /* - * add the bytes to the properties map - * later on they will be picked up and - * parsed to a dom node. + * add the bytes to the properties map later on they will be picked up + * and parsed to a dom node. */ map.put(DEFAULT_VARIABLES, properties); } else { // extract the properties of the in coming stream XMLProperties.parseProperties(stream, map); } - // release source - you need to ALWAYS do this! + // release source - you need to ALWAYS do this! release(propsSource); } } catch (Exception e) { < at >< at > -342,44 +349,43 < at >< at > // which implementation do we want if (xpathSupport.equals("enhanced")) { /* - * The axiom implementation is an object model - * approach to StAX. It allows you a dom like navigation - * (allocate xpath nodes), adding of child elements in - * this xpath statement and many more. + * The axiom implementation is an object model approach to StAX. It allows + * you a dom like navigation (allocate xpath nodes), adding of child + * elements in this xpath statement and many more. */ - structurer = new XMLStructurerAxiom((DispatcherBean)config, map); + structurer = new XMLStructurerAxiom((DispatcherBean) config, map); } else { /* - * The stax implementationis 100% StAX even the generation - * of the resulting document is done with StAX. - * However it does not offer real support of xpath expressions. + * The stax implementationis 100% StAX even the generation of the + * resulting document is done with StAX. However it does not offer real + * support of xpath expressions. */ - structurer = new XMLStructurer((DispatcherBean)config, map); + structurer = new XMLStructurer((DispatcherBean) config, map); } - + try { - // the recorded document we just streamed - String document = null; - try { - // request the information from the recorder - document = super.endSerializedXMLRecording(); - } catch (ProcessingException e) { - throw new SAXException(e); - } - // get the result of the structurer as stream - InputStream result = structurer.execute(new BufferedInputStream( - new ByteArrayInputStream(document.getBytes())), requestedFormat); - // requesting a parser - parser = (SAXParser) manager.lookup(SAXParser.ROLE); - // adding the result to the consumer - parser.parse(new InputSource(result), super.xmlConsumer); + // the recorded document we just streamed + String document = null; + try { + // request the information from the recorder + document = super.endSerializedXMLRecording(); + } catch (ProcessingException e) { + throw new SAXException(e); + } + // get the result of the structurer as stream + InputStream result = structurer.execute(new BufferedInputStream( + new ByteArrayInputStream(document.getBytes())), requestedFormat); + // requesting a parser + parser = (SAXParser) manager.lookup(SAXParser.ROLE); + // adding the result to the consumer + parser.parse(new InputSource(result), super.xmlConsumer); } catch (DispatcherException e) { throw new SAXException(e); } catch (Exception e) { throw new SAXException(e); } finally { if (null != parser) { - // release parser - you need to ALWAYS do this! + // release parser - you need to ALWAYS do this! manager.release(parser); } } < at >< at > -458,9 +464,11 < at >< at > } - /* + /* * From URIResolver, copied from TraxProcessor - * < at >see javax.xml.transform.URIResolver#resolve(java.lang.String, java.lang.String) + * + * < at >see javax.xml.transform.URIResolver#resolve(java.lang.String, + * java.lang.String) */ public javax.xml.transform.Source resolve(String href, String base) throws TransformerException { thorsten< at >apache.org 2008-12-02T11:57:24 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9476 Author: thorsten Date: Tue Dec 2 03:54:20 2008 New Revision: 722434 URL: http://svn.apache.org/viewvc?rev=722434&view=rev Log: Adding more javadoc and inline comments to the classes Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java?rev=722434&r1=722433&r2=722434&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java Tue Dec 2 03:54:20 2008 < at >< at > -31,7 +31,17 < at >< at > import org.jaxen.JaxenException; /** - * Issue: WSCOMMONS-389 + * + * Return the Node from the rootNode using the XPath expression path. + * If the node does not exist, it is created and then returned. This is a very + * simple method for creating new nodes. If the XPath contains selectors ([,,,]) + * or "*" it is of course not possible to create the new node. So if you use + * such XPaths the node must exist beforehand. An simple exception is if the + * expression contains attribute test to values (e.g. [< at >id = 'du' and < at >select = 'true']) + * + * + * Issue: + * WSCOMMONS-389 * * As soon the above issue is fixed we need to drop this implementation since * this class will be go into the axiom code base. Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java?rev=722434&r1=722433&r2=722434&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/transformation/DispatcherTransformer.java Tue Dec 2 03:54:20 2008 < at >< at > -214,7 +214,17 < at >< at > private OMFactory factory; private ContractFactory contractRep; + /* + * Housekeeping variables to indicate the state of processing. Remember SAX is + * a stream. + */ + /** + * whether or not we need to process the properties + */ private boolean insideProperties = false; + /** + * whether or not we need are in the requested structurer + */ private boolean includeNodes = true; private OMElement root; < at >< at > -245,16 +255,22 < at >< at > // parameters here config = new WritableDispatcherBean(); config.setStaxHelper(new StAX()); - allowXml = configuration.getChild("allowXml").getValueAsBoolean( - false); + // are we allowing xml properties? + allowXml = configuration.getChild("allowXml").getValueAsBoolean(false); config.setAllowXmlProperties(allowXml); + // set the prefix for the contract resolving contractUriPrefix = configuration.getChild("contractUriPrefix").getValue( "cocoon://resolve.contract."); + // set the suffix for the contract config.setContractUriSufix(configuration.getChild("contractUriSufix") .getValue("")); + // what level of xpath support do we want to allow? xpathSupport = configuration.getChild("xpathSupport").getValue("basic"); + // Do we want to shrink xml properties that have only a < at >value? boolean shrink = configuration.getChild("shrink").getValueAsBoolean(true); config.setShrink(shrink); + // request all factories to be created at this point since it is better to + // create them only once setNewTransformerFactory(); } < at >< at > -273,31 +289,57 < at >< at > contractUriPrefix = config.getContractUriPrefix(); } + /** + * Will prepare the factories that we need in further processing + * + * < at >throws TransformerFactoryConfigurationError + */ private void setNewTransformerFactory() throws TransformerFactoryConfigurationError { // Is this the best way to get an instance in cocoon? TransformerFactory tfactory = TransformerFactory.newInstance(); + // set the uri resolver the same as this class tfactory.setURIResolver(this); + // we want to set the error handler here to make sure it is intitialized tfactory.setErrorListener(new TraxErrorHandler(getLogger())); + // add the factory to the config config.setTransFact(tfactory); + // get the OM factory this.factory = OMAbstractFactory.getOMFactory(); + // get the contract factory this.contractRep = new ContractFactory(config); } - // we do all the heavy stuff later and only prepare the basics here, - // this enhance the response time while caching. + /* + * < at >see + * org.apache.cocoon.transformation.AbstractSAXTransformer#setup(org.apache + * .cocoon.environment.SourceResolver, java.util.Map, java.lang.String, + * org.apache.avalon.framework.parameters.Parameters) + */ public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par) throws ProcessingException, SAXException, IOException { + /* + * we do all the heavy stuff later and only prepare the basics here, this + * enhance the response time while caching. + */ + // setup our super class super.setup(resolver, objectModel, src, par); - + // get the id of this request this.requestId = parameters .getParameter(DISPATCHER_REQUEST_ATTRIBUTE, null); + // get the external cache key this.cacheKey = parameters.getParameter(CACHE_PARAMETER, null); if (null == this.cacheKey) getLogger().warn( "Caching not activated! Declare the CACHE_KEY_PARAMETER=" + CACHE_PARAMETER + " in your sitemap."); + /* + * which is the file use to watch for changes (normally the structurer of + * the request). As long the file does not change we are using the cache + * object. + */ this.validityFile = parameters.getParameter(VALIDITY_PARAMETER, null); + // do we want to force that is caching is turned off? this.validityChecking = parameters.getParameter( VALIDITY_OVERRIDE_PARAMETER, ""); if (requestId == null) { < at >< at > -306,6 +348,7 < at >< at > getLogger().error(error); throw new ProcessingException(error); } + // which format we want to process? this.requestedFormat = parameters.getParameter(Captions.TYPE_ATT, null); /* * We need to change now the contract uri prefixes since in cocoon we need < at >< at > -319,11 +362,13 < at >< at > getLogger().error(error); throw new ProcessingException(error); } + // add the format to the cache key this.cacheKey += requestedFormat; if (null == m_resolver) { try { m_resolver = (org.apache.excalibur.source.SourceResolver) manager .lookup(SourceResolver.ROLE); + // add the resolver we use to the dispatcher resolverDispatcher = new CocoonResolver(m_resolver); config.setResolver(resolverDispatcher); } catch (ServiceException e) { < at >< at > -343,46 +388,68 < at >< at > public void startElement(String uri, String name, String raw, Attributes attr) throws SAXException { // Process start element event - if (Captions.NS.equals(uri)) { + // Are we inside of properties? If so we need to record the elements. + if (this.insideProperties && this.includeNodes) { + // just start the recording + startSerializedXMLRecording(null); + } else if (Captions.NS.equals(uri)) { + // we are in the dispatcher ns try { /* * We are in the dispatcher ns. */ getLogger().debug("Starting dispatcher element: " + raw); - if (Captions.STRUCTURE_ELEMENT.equals(name)) { + if (Captions.STRUCTURER_ELEMENT.equals(name)) { + // we are in a structurer definition structurerProcessingStart(attr); - } else if (Captions.HOOK_ELEMENT.equals(name) && this.includeNodes) { - hookProcessingStart(name, raw, attr); - } else if (Captions.CONTRACT_ELEMENT.equals(name) && this.includeNodes) { - contractProcessingStart(attr); - } else if (Captions.PROPERTY_ELEMENT.equals(name) && this.includeNodes) { - this.insideProperties = true; - propertyProcessingStart(uri, name, raw, attr); + } + if (this.includeNodes) { + if (Captions.HOOK_ELEMENT.equals(name)) { + // we are inside a hook element + hookProcessingStart(name, raw, attr); + } else if (Captions.CONTRACT_ELEMENT.equals(name)) { + // we are inside a contract element + contractProcessingStart(attr); + } else if (Captions.PROPERTY_ELEMENT.equals(name)) { + // we are inside a property element + this.insideProperties = true; + propertyProcessingStart(uri, name, raw, attr); + } } } catch (Exception e) { throw new SAXException(e); } } else { - if (!this.insideProperties && this.includeNodes ){ + if (!this.insideProperties && this.includeNodes) { super.startElement(uri, name, raw, attr); } } } - + + /* + * < at >see + * org.apache.cocoon.transformation.AbstractSAXTransformer#endElement(java + * .lang.String, java.lang.String, java.lang.String) + */ public void endElement(String uri, String name, String raw) - throws SAXException { + throws SAXException { getLogger().debug("Ending element: " + raw); - if (Captions.NS.equals(uri)){ + if (Captions.NS.equals(uri)) { + // we are in the dispatcher ns try { - if (Captions.STRUCTURE_ELEMENT.equals(name)){ + if (Captions.STRUCTURE_ELEMENT.equals(name)) { + // we are in a structurer end element structurerProcessingEnd(raw); } else if (Captions.HOOK_ELEMENT.equals(name) && this.includeNodes) { - //TODO Implement + // we are inside a hook end element + // FIXME Implement } else if (Captions.CONTRACT_ELEMENT.equals(name) && this.includeNodes) { + // we are inside a contract end element contractProcessingEnd(); - } else if (Captions.PROPERTY_ELEMENT.equals(name) && this.includeNodes){ - if (allowXml){ + } else if (Captions.PROPERTY_ELEMENT.equals(name) && this.includeNodes) { + // we are inside a property end element + if (allowXml) { String property = null; try { super.endElement(uri, name, raw); < at >< at > -390,33 +457,50 < at >< at > } catch (ProcessingException e) { throw new SAXException(e); } - if (null != property){ + if (null != property) { localParams.put(currentProperty, property.getBytes()); } + } else { + // FIXME Implement } } } catch (ContractException e) { - throw new SAXException (e); + throw new SAXException(e); } catch (IOException e) { - throw new SAXException (e); + throw new SAXException(e); } catch (JaxenException e) { - throw new SAXException (e); + throw new SAXException(e); } catch (XMLStreamException e) { - throw new SAXException (e); + throw new SAXException(e); } - }else if (!this.insideProperties && this.includeNodes){ + } else if (!this.insideProperties && this.includeNodes) { super.endElement(uri, name, raw); } } - private void contractProcessingEnd() throws ContractException, IOException, JaxenException, XMLStreamException { + /** + * Will execute the contract and process the result. + * + * < at >throws ContractException + * < at >throws IOException + * < at >throws JaxenException + * < at >throws XMLStreamException + */ + private void contractProcessingEnd() throws ContractException, IOException, + JaxenException, XMLStreamException { + // get the result stream from contract by executing it InputStream resultStream = contract.execute(dataStream, localParams); + // close data stream StreamHelper.closeStream(dataStream); + // add the result of the contract to the overall result set processContractResult(resultStream, pathNode); + // close the result Stream StreamHelper.closeStream(resultStream); } /** + * Process the contract result to add it to the overall result set. + * * < at >param resultStream * < at >param pathNode * < at >throws XMLStreamException < at >< at > -425,8 +509,12 < at >< at > < at >SuppressWarnings("unchecked") private void processContractResult(InputStream resultStream, OMElement pathNode) throws XMLStreamException, JaxenException { - XMLStreamReader contractResultReader = config.getStaxHelper().getReader(resultStream); + // get xml stream reader + XMLStreamReader contractResultReader = config.getStaxHelper().getReader( + resultStream); + // get Axiom builder StAXOMBuilder builder = new StAXOMBuilder(contractResultReader); + // get the document element OMElement content = builder.getDocumentElement(); /* * For full blown ns support we need to get all ns from the result. This < at >< at > -438,28 +526,40 < at >< at > OMNamespace space = ns.next(); spaces.add(space); } + // get the different parts of the contract Iterator<OMElement> parts = content.getChildrenWithName(qIt( Captions.NS_CONTRACTS, Captions.PART_ELEMENT)); while (parts.hasNext()) { + // while we have more parts, get the next part OMElement part = parts.next(); + // where do we need to inject it String xpath = part.getAttributeValue(qIt(Captions.RESULT_XPATH)); + // get the children of a part. This children needs to be injected in + // the result Iterator<OMNode> children = part.getChildren(); if (xpath == null) { + // when we do not have a xpath to inject we will inject it in the + // current loaction while (children.hasNext()) { OMNode child = (OMNode) children.next(); pathNode.addChild(child); } } else { + // lookup the node where we want to inject the result part xpath = PATH_PREFIX + xpath; // we need to feed the xpathSelector with the ns we may have AXIOMXPathCreate xpathSelector = new AXIOMXPathCreate(xpath); - + // add all namespaces that are known to the selector for (OMNamespace space : spaces) { xpathSelector .addNamespace(space.getPrefix(), space.getNamespaceURI()); } + // request the final inject point (node which will be used to inject the + // result) OMElement injectionPoint = (OMElement) xpathSelector.selectSingleNode( root, true); + // now iterate through the children of the result part and append the + // content to the injection point while (children.hasNext()) { OMNode child = (OMNode) children.next(); injectionPoint.addChild(child); < at >< at > -468,55 +568,88 < at >< at > } } } + /** + * Helper method to create a qname + * * < at >param name - * < at >return + * the element name + * < at >return a qualified qname */ private QName qIt(String name) { return new QName(name); } + /** + * Helper method to create a qname + * * < at >param name + * the element name * < at >param uri - * < at >return + * the ns + * < at >return a qualified qname */ - private QName qIt(String uri,String name) { - return new QName(uri,name); + private QName qIt(String uri, String name) { + return new QName(uri, name); } + + /** + * Finish the processing of the structurer + * + * < at >param raw + */ private void structurerProcessingEnd(String raw) { - if(includeNodes){ - + if (includeNodes) { + // FIXME: implement } - + } + /** + * Start the processing of the properties including setting the correct state + * for the next event round + * + * < at >param uri + * < at >param name + * < at >param raw + * < at >param attr + * < at >throws SAXException + */ private void propertyProcessingStart(String uri, String name, String raw, Attributes attr) throws SAXException { - - String id = null , value = null; + // determine the name and a possible value + String id = null, value = null; for (int i = 0; i < attr.getLength(); i++) { String localName = attr.getLocalName(i); String localValue = attr.getValue(i); - if (Captions.NAME_ATT.equals(localName)){ + if (Captions.NAME_ATT.equals(localName)) { id = localValue; - }else if(Captions.VALUE_ATT.equals(localName)){ + } else if (Captions.VALUE_ATT.equals(localName)) { value = localValue; } } - - if (allowXml){ + // if we allow xml properties we will just record them + if (allowXml) { // just start the recording startSerializedXMLRecording(null); super.startElement(uri, name, raw, attr); currentProperty = id; - }else{ - if (id!=null && value!= null){ + } else { + // if we do not allow xml we will use a simple key/value approach + if (id != null && value != null) { localParams.put(id, new String(value)); } } } + /** + * Start the processing of the contract this includes to resolve the data + * stream and the actual contract. + * + * < at >param attr + * < at >throws SAXException + */ private void contractProcessingStart(Attributes attr) throws SAXException { String name = "", data = null; try { < at >< at > -524,18 +657,22 < at >< at > String localName = attr.getLocalName(i); String value = attr.getValue(i); if (Captions.NAME_ATT.equals(localName)) { + // get the name of the contract name = value; } else if (Captions.DATA_ATT.equals(localName)) { + // see whether we have a defined dataUri data = value; } } dataStream = null; if (null != data && !data.equals("")) { + // try resoolving the dataUri dataStream = resolverDispatcher.resolve(data); } + // get the contract contract = contractRep.resolve(name); + // prepare empty properties map localParams = new HashMap<String, Object>(map); - } catch (Exception e) { String error = DispatcherException.ERROR_500 + "\n" + "component: ContractBean" + "\n" < at >< at > -547,6 +684,14 < at >< at > } + /** + * Start the processing of the hooks. Actually we just create a element in the + * result model with the same name and attributes as the incoming event. + * + * < at >param name + * < at >param raw + * < at >param attr + */ private void hookProcessingStart(String name, String raw, Attributes attr) { OMElement element = factory.createOMElement(name, Captions.NS, "forrest"); for (int i = 0; i < attr.getLength(); i++) { < at >< at > -572,9 +717,14 < at >< at > for (int i = 0; i < attr.getLength(); i++) { String localName = attr.getLocalName(i); String value = attr.getValue(i); + // determine what type (format) we have on the structurer if (localName.equals(Captions.TYPE_ATT)) { m_type = value; } + /* + * Determine whether we have a hooks path attribute. If so it determines + * the smallest common path (e.g. <code>/html/body</code>) + */ if (localName.equals(Captions.HOOKS_ATT)) { // adding the default path boolean startsWithRoot = "/".equals(String.valueOf(value.charAt(0))); < at >< at > -586,20 +736,25 < at >< at > path += value; } } + // are we in the format that have been requested? if (requestedFormat.equals(m_type)) { try { // need to get the properties for this uri map = new HashMap<String, Object>(); + /* + * the properties are provided by a match in cocoon and are generated + * individually for each request + */ String propertyURI = "cocoon://" + requestId + ".props"; // get the source representation of the propertyURI Source propsSource = m_resolver.resolveURI(propertyURI); if (propsSource != null) { - // get the stream + // get an input stream from the properties InputStream stream = new BufferedInputStream(propsSource .getInputStream()); /* * we need either just the bytes of the stream (if we allow xml - * properties) or we need to process it extracting the properties. + * properties) or we need to process it: extracting the properties. */ if (config.isAllowXmlProperties()) { // get the bytes from the stream < at >< at > -610,12 +765,13 < at >< at > */ map.put(DEFAULT_VARIABLES, properties); } else { - // extract the properties of the in coming stream + // extract the properties of the incoming stream XMLProperties.parseProperties(stream, map); } // release source - you need to ALWAYS do this! release(propsSource); } + // creating in/out stream objects BufferedInputStream stream = null; ByteArrayOutputStream out = new ByteArrayOutputStream(); /* < at >< at > -623,10 +779,20 < at >< at > * need to strip the root element again. */ OMDocument doc = factory.createOMDocument(); + // creating the root node for the xml document root = factory.createOMElement(PATH_PREFIX, null); + // adding root element to the document (much like in DOM) doc.addChild(root); - AXIOMXPathCreate xpath = new AXIOMXPathCreate("/"+PATH_PREFIX + path); + /* + * request a axiom xpath resolver that will return a axiom element for a + * given xpath expression. If the node does not exist, it is created and + * then returned. + */ + AXIOMXPathCreate xpath = new AXIOMXPathCreate("/" + PATH_PREFIX + path); + // get the node (if it does not exist, create it) pathNode = (OMElement) xpath.selectSingleNode(root, true); + // we need to set the status variable, indicating we need process the + // children. this.includeNodes = true; } catch (Exception e) { throw new DispatcherException(e); thorsten< at >apache.org 2008-12-02T11:54:20 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9475 Author: thorsten Date: Tue Dec 2 03:53:29 2008 New Revision: 722433 URL: http://svn.apache.org/viewvc?rev=722433&view=rev Log: white noise - formating changes Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java?rev=722433&r1=722432&r2=722433&view=diff ============================================================================== --- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java (original) +++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathCreate.java Tue Dec 2 03:53:29 2008 < at >< at > -33,7 +33,7 < at >< at > /** * Issue: WSCOMMONS-389 * - * As soon the above issue is fixed we need to drop this implementation since + * As soon the above issue is fixed we need to drop this implementation since * this class will be go into the axiom code base. * * < at >version 1.0 < at >< at > -125,7 +125,7 < at >< at > OMElement element = null; OMNamespaceImpl localSpace = null; Map<String, String> map = new HashMap<String, String>(); - String localName = cleanFromExpressions(pathPart,map); + String localName = cleanFromExpressions(pathPart, map); String[] nameSpacedNode = localName.split(":"); if (nameSpacedNode.length == 2) { final String prefix = nameSpacedNode[0]; < at >< at > -143,24 +143,24 < at >< at > private String cleanFromExpressions(String pathPart, Map<String, String> map) { Pattern pattern = Pattern.compile("(.*)\\[(.*)\\]"); Matcher matcher = pattern.matcher(pathPart); - if (matcher.matches()){ - pathPart=matcher.group(1); + if (matcher.matches()) { + pathPart = matcher.group(1); String expression = matcher.group(2); - String [] parts = expression.split("([\\s]*and[\\s]*)"); + String[] parts = expression.split("([\\s]*and[\\s]*)"); for (String part : parts) { pattern = Pattern.compile("< at >([a-zA-Z0-9]*)='(.*)'"); matcher = pattern.matcher(part); - if (matcher.matches()){ + if (matcher.matches()) { String key = matcher.group(1); String value = matcher.group(2); int end = value.indexOf("'"); - if (end>-1){ + if (end > -1) { /* - * if we have a ' in the expression it means that we have - * a xpath expression with operators other then "and". - * We will use only the first one to create an attribute from it. + * if we have a ' in the expression it means that we have a xpath + * expression with operators other then "and". We will use only the + * first one to create an attribute from it. */ - value= value.substring(0, end); + value = value.substring(0, end); } map.put(key, value); } thorsten< at >apache.org 2008-12-02T11:53:29 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9474 Author: crossley Date: Sat Nov 29 18:53:28 2008 New Revision: 721753 URL: http://svn.apache.org/viewvc?rev=721753&view=rev Log: The Message of the Day (motd) for old plugins was incorrect. Modified: forrest/trunk/site-author/skinconf.xml Modified: forrest/trunk/site-author/skinconf.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/skinconf.xml?rev=721753&r1=721752&r2=721753&view=diff ============================================================================== --- forrest/trunk/site-author/skinconf.xml (original) +++ forrest/trunk/site-author/skinconf.xml Sat Nov 29 18:53:28 2008 < at >< at > -141,7 +141,7 < at >< at > <motd-option pattern="plugins_0_70"> <motd-title>v0.7</motd-title> <motd-page location="both"> - This is documentation for current version v0.7 + This is documentation for past version v0.7 </motd-page> <motd-page-url>http://forrest.apache.org/pluginDocs/</motd-page-url> </motd-option> crossley< at >apache.org 2008-11-30T02:53:28 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9473 Author: crossley Date: Wed Nov 26 21:51:36 2008 New Revision: 721084 URL: http://svn.apache.org/viewvc?rev=721084&view=rev Log: In r124991 a dummy DTD was added to the "seed site" xdocs directory, to work around an issue with 'build.sh test' not using the projects xml catalog. As a result of other recent changes (e.g. FOR-1131) this dummy is now not required. Removed: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples-b/hello-v10.dtd crossley< at >apache.org 2008-11-27T05:51:36 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9472 Author: crossley Date: Wed Nov 26 21:35:21 2008 New Revision: 721083 URL: http://svn.apache.org/viewvc?rev=721083&view=rev Log: The preparation of the set of xmlcatalogs is better done in our "validation-props" ant target. Thanks to assistance from Thomas Emmel. Issue: FOR-1131 FOR-1120 Modified: forrest/trunk/main/forrest.build.xml forrest/trunk/main/targets/validate.xml Modified: forrest/trunk/main/forrest.build.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?rev=721083&r1=721082&r2=721083&view=diff ============================================================================== --- forrest/trunk/main/forrest.build.xml (original) +++ forrest/trunk/main/forrest.build.xml Wed Nov 26 21:35:21 2008 < at >< at > -36,16 +36,6 < at >< at > <property name="forrest.build.lib-dir" location="${forrest.home}/build"/> <property name="forrest.core" location="${forrest.home}/main"/> <property name="forrest.core.webapp" location="${forrest.core}/webapp"/> - <path id="fcatalog.path"> - <pathelement location="${forrest.core.webapp}/resources/schema/catalog.xcat"/> - <pathelement location="${forrest.plugins-dir}/catalog.xcat"/> - <pathelement location="${catalog}"/> - </path> - <xmlcatalog id="fcatalog"> - <catalogpath> - <path refid="fcatalog.path"/> - </catalogpath> - </xmlcatalog> <import file="targets/validate.xml"/> <import file="targets/webapp.xml"/> <import file="targets/site.xml"/> Modified: forrest/trunk/main/targets/validate.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/validate.xml?rev=721083&r1=721082&r2=721083&view=diff ============================================================================== --- forrest/trunk/main/targets/validate.xml (original) +++ forrest/trunk/main/targets/validate.xml Wed Nov 26 21:35:21 2008 < at >< at > -95,6 +95,17 < at >< at > <property name="forrest.validate.skins.stylesheets.excludes" value=""/> <property name="forrest.validate.skins.stylesheets.failonerror" value="${forrest.validate.skins.failonerror}" /> + <path id="fcatalog.path"> + <pathelement location="${forrest.core.webapp}/resources/schema/catalog.xcat"/> + <pathelement location="${forrest.plugins-dir}/catalog.xcat"/> + <pathelement location="${catalog}"/> + </path> + <xmlcatalog id="fcatalog"> + <catalogpath> + <path refid="fcatalog.path"/> + </catalogpath> + </xmlcatalog> + <echo message="Using these catalog descriptors: ${toString:fcatalog.path}"/> </target> <target name="validate-site" depends="load-project-props"> <condition property="forrest.validate.skinconf.disable-xml-link"> < at >< at > -121,7 +132,6 < at >< at > </target> <target name="validate-xdocs" depends="init, validation-props" if="validate.xdocs" description="Validate the project xdocs"> - <echo level="verbose" message="Using these catalog descriptors: ${toString:fcatalog.path}"/> <xmlvalidate failonerror="${forrest.validate.xdocs.failonerror}" lenient="no" warn="yes" classpathref="forrest.cp" classname="org.apache.xerces.parsers.SAXParser"> <attribute name="http://apache.org/xml/features/validation/dynamic" value="true"/> <xmlcatalog refid="fcatalog" /> crossley< at >apache.org 2008-11-27T05:35:21 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9471 Author: crossley Date: Wed Nov 26 19:55:26 2008 New Revision: 721076 URL: http://svn.apache.org/viewvc?rev=721076&view=rev Log: A better way to report the set of xmlcatalog files being used. Define a "path" structure and show it using toString:... Modified: forrest/trunk/main/forrest.build.xml forrest/trunk/main/targets/validate.xml Modified: forrest/trunk/main/forrest.build.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?rev=721076&r1=721075&r2=721076&view=diff ============================================================================== --- forrest/trunk/main/forrest.build.xml (original) +++ forrest/trunk/main/forrest.build.xml Wed Nov 26 19:55:26 2008 < at >< at > -36,13 +36,14 < at >< at > <property name="forrest.build.lib-dir" location="${forrest.home}/build"/> <property name="forrest.core" location="${forrest.home}/main"/> <property name="forrest.core.webapp" location="${forrest.core}/webapp"/> + <path id="fcatalog.path"> + <pathelement location="${forrest.core.webapp}/resources/schema/catalog.xcat"/> + <pathelement location="${forrest.plugins-dir}/catalog.xcat"/> + <pathelement location="${catalog}"/> + </path> <xmlcatalog id="fcatalog"> <catalogpath> - <pathelement - location="${forrest.core.webapp}/resources/schema/catalog.xcat"/> - <pathelement - location="${forrest.plugins-dir}/catalog.xcat"/> - <pathelement location="${catalog}"/> + <path refid="fcatalog.path"/> </catalogpath> </xmlcatalog> <import file="targets/validate.xml"/> Modified: forrest/trunk/main/targets/validate.xml URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/validate.xml?rev=721076&r1=721075&r2=721076&view=diff ============================================================================== --- forrest/trunk/main/targets/validate.xml (original) +++ forrest/trunk/main/targets/validate.xml Wed Nov 26 19:55:26 2008 < at >< at > -121,10 +121,7 < at >< at > </target> <target name="validate-xdocs" depends="init, validation-props" if="validate.xdocs" description="Validate the project xdocs"> - <echo level="verbose" message="Using these catalog descriptors: -forrest.core.webapp=${forrest.core.webapp}/resources/schema/catalog.xcat -forrest.plugins-dir=${forrest.plugins-dir}/catalog.xcat -catalog=${catalog}"/> + <echo level="verbose" message="Using these catalog descriptors: ${toString:fcatalog.path}"/> <xmlvalidate failonerror="${forrest.validate.xdocs.failonerror}" lenient="no" warn="yes" classpathref="forrest.cp" classname="org.apache.xerces.parsers.SAXParser"> <attribute name="http://apache.org/xml/features/validation/dynamic" value="true"/> <xmlcatalog refid="fcatalog" /> crossley< at >apache.org 2008-11-27T03:55:26 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9470 Author: crossley Date: Wed Nov 26 14:59:03 2008 New Revision: 721024 URL: http://svn.apache.org/viewvc?rev=721024&view=rev Log: The "fixes-bug" attribute needs the "FOR-" prefix. Modified: forrest/trunk/site-author/status.xml Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=721024&r1=721023&r2=721024&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Wed Nov 26 14:59:03 2008 < at >< at > -186,7 +186,7 < at >< at > products such as Apache Xerces and Apache Xalan, etc. See <link href="site:upgrading_09/cocoon">upgrading notes</link>. </action> - <action context="code" type="update" dev="TS" fixes-bug="1103" importance="high"> + <action context="code" type="update" dev="TS" fixes-bug="FOR-1103" importance="high"> Promoting the output.inputModule plugin to core. Main reason for the move is to prevent plugins dependencies since the code has attracted different use cases solved in plugins to move it into core. crossley< at >apache.org 2008-11-26T22:59:04 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9469 Author: crossley Date: Wed Nov 26 14:57:13 2008 New Revision: 721023 URL: http://svn.apache.org/viewvc?rev=721023&view=rev Log: Raise the importance of the Jing upgrade, mention FOR-984 Java 6 missing datatype library. Modified: forrest/trunk/site-author/status.xml Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=721023&r1=721022&r2=721023&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Wed Nov 26 14:57:13 2008 < at >< at > -155,9 +155,11 < at >< at > <action context="code" type="update" dev="DC"> Forrestbot deploy.scp workstage now reports which files were transferred. </action> - <action context="code" type="update" dev="DC"> - Updated to Jing-20081028 release from - <link href="http://code.google.com/p/jing-trang/">http://code.google.com/p/jing-trang/</link> + <action context="code" type="update" dev="DC" fixes-bug="FOR-984" importance="high"> + Updated to Jing-20081028 release (from + <link href="http://code.google.com/p/jing-trang/">http://code.google.com/p/jing-trang/</link>). + As well as providing us with a reliable RELAX NG tool, this upgrade + fixes an issue on some Java 6 with missing datatype library. </action> <!-- 2008-10 --> <action context="code" type="update" dev="DC" importance="high"> crossley< at >apache.org 2008-11-26T22:57:14 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9468 Author: crossley Date: Tue Nov 25 20:48:13 2008 New Revision: 720742 URL: http://svn.apache.org/viewvc?rev=720742&view=rev Log: The Cocoon "Running Modes" facility is not available in cocoon-2.1 version. Issues: FOR-1091 FOR-917 Modified: forrest/trunk/site-author/content/xdocs/howto-dev.xml forrest/trunk/site-author/content/xdocs/site.xml forrest/trunk/site-author/status.xml Modified: forrest/trunk/site-author/content/xdocs/howto-dev.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/howto-dev.xml?rev=720742&r1=720741&r2=720742&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/howto-dev.xml (original) +++ forrest/trunk/site-author/content/xdocs/howto-dev.xml Tue Nov 25 20:48:13 2008 < at >< at > -384,24 +384,6 < at >< at > Cocoon logfiles and their configuration. </p> </section> - <section id="debug-modes"> - <title>Cocoon Running Modes</title> - <p> - Cocoon startup reads additional properties from various files. This - enables some different properties to be used for production or - development. By default, Forrest uses Cocoon in running mode "dev". So - it first reads from - <code>main/webapp/WEB-INF/properties/core.properties</code> then from - <code>main/webapp/WEB-INF/properties/dev/core.properties</code> - </p> - <p> - To use a different mode, say "prod" for production, add to the - forrest.jvmargs in your forrest.properties file: - <code>-Dorg.apache.cocoon.mode=prod</code> and provide the relevant - properties in a matching "prod" sub-directory of - <code>main/webapp/WEB-INF/properties</code> - </p> - </section> <section id="debug-intermediate"> <title>View intermediate processing</title> <p> Modified: forrest/trunk/site-author/content/xdocs/site.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/site.xml?rev=720742&r1=720741&r2=720742&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/site.xml (original) +++ forrest/trunk/site-author/content/xdocs/site.xml Tue Nov 25 20:48:13 2008 < at >< at > -98,7 +98,6 < at >< at > <sitemap href="#sitemap"/> <debug href="#debug"/> <debug-cocoon-profiler href="#debug-cocoon-profiler"/> - <debug-modes href="#debug-modes"/> <debug-sitemap-exec href="#debug-sitemap-exec"/> <debug-validation href="#debug-validation"/> </forrest-dev> Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=720742&r1=720741&r2=720742&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Tue Nov 25 20:48:13 2008 < at >< at > -304,11 +304,6 < at >< at > <action dev="DC" type="add" context="docs"> New document to explain <link href="site:sitemap-explain">Cocoon sitemaps</link> using a specific worked example. </action> - <action dev="DC" type="add" context="docs"> - Add explanation of - <link href="site:procedures/forrest-dev/debug-modes">Cocoon Running Modes</link> - for setting different properties. - </action> <action dev="DC" type="update" context="code"> Enhanced the Message of the Day (MOTD) facility to enable specific matches. See skinconf.xml from a "seed" site for configuration details. crossley< at >apache.org 2008-11-26T04:48:13 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9467 Author: crossley Date: Tue Nov 25 20:33:46 2008 New Revision: 720739 URL: http://svn.apache.org/viewvc?rev=720739&view=rev Log: Cocoon properties are now at WEB-INF/properties/core.properties file. Issue: FOR-1091 Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml Modified: forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml?rev=720739&r1=720738&r2=720739&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml (original) +++ forrest/trunk/site-author/content/xdocs/docs_0_90/validation.xml Tue Nov 25 20:33:46 2008 < at >< at > -342,7 +342,7 < at >< at > <p> However this configuration does not show your DTDs being resolved. So raise the verbosity level in the central configuration at - <code>main/webapp/WEB-INF/properties/dev/core.properties</code> and + <code>main/webapp/WEB-INF/properties/core.properties</code> and re-start forrest. This also shows the main catalogs being loaded and shows the resolving of every DTD and entity set. </p> crossley< at >apache.org 2008-11-26T04:33:46 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9466 Author: crossley Date: Sun Nov 23 20:33:48 2008 New Revision: 720112 URL: http://svn.apache.org/viewvc?rev=720112&view=rev Log: Added newton.codecauldron.org Issue: FOR-1130 Modified: forrest/trunk/site-author/content/xdocs/live-sites.xml Modified: forrest/trunk/site-author/content/xdocs/live-sites.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/live-sites.xml?rev=720112&r1=720111&r2=720112&view=diff ============================================================================== --- forrest/trunk/site-author/content/xdocs/live-sites.xml (original) +++ forrest/trunk/site-author/content/xdocs/live-sites.xml Sun Nov 23 20:33:48 2008 < at >< at > -165,6 +165,7 < at >< at > <li><a href="http://stephane.galles.free.fr/jagraffe/english" rel="nofollow">JAgraffe</a> Quickly send scaled down pictures by email only via DnD</li> <li><a href="http://incubator.apache.org/hama">Apache Hama - a parallel matrix computational package based on Hadoop.</a></li> + <li><a href="http://newton.codecauldron.org/">Newton</a> - Distributed OSGi framework</li> <!-- <li><a href=""></a></li> --> </ul> </section> crossley< at >apache.org 2008-11-24T04:33:48 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9465 Author: crossley Date: Sun Nov 23 19:28:39 2008 New Revision: 720106 URL: http://svn.apache.org/viewvc?rev=720106&view=rev Log: Use the a.o/events/ promotion resources, rather than link to specific events. Modified: forrest/trunk/site-author/skinconf.xml Modified: forrest/trunk/site-author/skinconf.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/skinconf.xml?rev=720106&r1=720105&r2=720106&view=diff ============================================================================== --- forrest/trunk/site-author/skinconf.xml (original) +++ forrest/trunk/site-author/skinconf.xml Sun Nov 23 19:28:39 2008 < at >< at > -269,9 +269,9 < at >< at > <height>22</height> </credit> <credit box-location="alt2"> - <name>ApacheCon US 2008</name> - <url>http://us.apachecon.com/</url> - <image>http://apache.org/ads/ApacheCon/2008-usa-125x125.png</image> + <name>ApacheCon</name> + <url>http://www.apache.org/events/current-event.html</url> + <image>http://www.apache.org/events/current-event-125x125.png</image> <width>125</width> <height>125</height> </credit> crossley< at >apache.org 2008-11-24T03:28:40 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9464 Author: crossley Date: Sun Nov 23 18:55:29 2008 New Revision: 720103 URL: http://svn.apache.org/viewvc?rev=720103&view=rev Log: Forrestbot deploy.scp workstage now reports which files were transferred. Modified: forrest/trunk/site-author/status.xml forrest/trunk/tools/forrestbot/core/deploy.xml Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=720103&r1=720102&r2=720103&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Sun Nov 23 18:55:29 2008 < at >< at > -153,6 +153,9 < at >< at > </action> <!-- 2008-11 --> <action context="code" type="update" dev="DC"> + Forrestbot deploy.scp workstage now reports which files were transferred. + </action> + <action context="code" type="update" dev="DC"> Updated to Jing-20081028 release from <link href="http://code.google.com/p/jing-trang/">http://code.google.com/p/jing-trang/</link> </action> Modified: forrest/trunk/tools/forrestbot/core/deploy.xml URL: http://svn.apache.org/viewvc/forrest/trunk/tools/forrestbot/core/deploy.xml?rev=720103&r1=720102&r2=720103&view=diff ============================================================================== --- forrest/trunk/tools/forrestbot/core/deploy.xml (original) +++ forrest/trunk/tools/forrestbot/core/deploy.xml Sun Nov 23 18:55:29 2008 < at >< at > -77,7 +77,7 < at >< at > </then> </if> <scp todir="${deploy.scp.dest}" - keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}"> + keyfile="${deploy.scp.keyfile}" passphrase="${deploy.scp.passphrase}" verbose="true"> <fileset dir="${build.site-dir}"> <modified/> </fileset> crossley< at >apache.org 2008-11-24T02:55:29 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9463 Author: crossley Date: Sun Nov 23 18:27:53 2008 New Revision: 720102 URL: http://svn.apache.org/viewvc?rev=720102&view=rev Log: Update Jsch license. Added: forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt (contents, props changed) - copied, changed from r719458, forrest/trunk/tools/ant/lib/jsch-0.1.28.jar.license.txt Removed: forrest/trunk/tools/ant/lib/jsch-0.1.28.jar.license.txt Copied: forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt (from r719458, forrest/trunk/tools/ant/lib/jsch-0.1.28.jar.license.txt) URL: http://svn.apache.org/viewvc/forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt?p2=forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt&p1=forrest/trunk/tools/ant/lib/jsch-0.1.28.jar.license.txt&r1=719458&r2=720102&rev=720102&view=diff ============================================================================== --- forrest/trunk/tools/ant/lib/jsch-0.1.28.jar.license.txt (original) +++ forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt Sun Nov 23 18:27:53 2008 < at >< at > -2,7 +2,7 < at >< at > over to a BSD-style license. ------------------------------------------------------------------------------ -Copyright (c) 2002,2003,2004,2005,2006 Atsuhiko Yamanaka, JCraft,Inc. +Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Atsuhiko Yamanaka, JCraft,Inc. All rights reserved. Redistribution and use in source and binary forms, with or without Propchange: forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: forrest/trunk/tools/ant/lib/jsch-0.1.39.jar.license.txt ------------------------------------------------------------------------------ svn:mergeinfo = crossley< at >apache.org 2008-11-24T02:27:54 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9462 Author: crossley Date: Thu Nov 20 20:10:17 2008 New Revision: 719471 URL: http://svn.apache.org/viewvc?rev=719471&view=rev Log: Upgraded Jing from Jing-20030619 to new Jing-20081028 from http://code.google.com/p/jing-trang/ This should also fix FOR-984. Added: forrest/trunk/lib/core/jing-20081028.jar (with props) forrest/trunk/lib/core/jing-20081028.jar.license.txt (contents, props changed) - copied, changed from r719458, forrest/trunk/lib/core/jing-20030619.jar.license.txt Removed: forrest/trunk/lib/core/jing-20030619.jar forrest/trunk/lib/core/jing-20030619.jar.license.txt Modified: forrest/trunk/site-author/status.xml Added: forrest/trunk/lib/core/jing-20081028.jar URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/jing-20081028.jar?rev=719471&view=auto ============================================================================== Binary file - no diff available. Propchange: forrest/trunk/lib/core/jing-20081028.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Copied: forrest/trunk/lib/core/jing-20081028.jar.license.txt (from r719458, forrest/trunk/lib/core/jing-20030619.jar.license.txt) URL: http://svn.apache.org/viewvc/forrest/trunk/lib/core/jing-20081028.jar.license.txt?p2=forrest/trunk/lib/core/jing-20081028.jar.license.txt&p1=forrest/trunk/lib/core/jing-20030619.jar.license.txt&r1=719458&r2=719471&rev=719471&view=diff ============================================================================== --- forrest/trunk/lib/core/jing-20030619.jar.license.txt (original) +++ forrest/trunk/lib/core/jing-20081028.jar.license.txt Thu Nov 20 20:10:17 2008 < at >< at > -1,4 +1,4 < at >< at > -Copyright (c) 2001, 2002 Thai Open Source Software Center Ltd +Copyright (c) 2001-2003, 2008 Thai Open Source Software Center Ltd All rights reserved. Redistribution and use in source and binary forms, with or without Propchange: forrest/trunk/lib/core/jing-20081028.jar.license.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: forrest/trunk/lib/core/jing-20081028.jar.license.txt ------------------------------------------------------------------------------ svn:mergeinfo = Modified: forrest/trunk/site-author/status.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=719471&r1=719470&r2=719471&view=diff ============================================================================== --- forrest/trunk/site-author/status.xml (original) +++ forrest/trunk/site-author/status.xml Thu Nov 20 20:10:17 2008 < at >< at > -151,6 +151,11 < at >< at > Added document to facilitate <link href="site:upgrading_09">upgrading to v0.9</link> </action> +<!-- 2008-11 --> + <action context="code" type="update" dev="DC"> + Updated to Jing-20081028 release from + <link href="http://code.google.com/p/jing-trang/">http://code.google.com/p/jing-trang/</link> + </action> <!-- 2008-10 --> <action context="code" type="update" dev="DC" importance="high"> Updated to Apache-Ant-1.7.1 release. crossley< at >apache.org 2008-11-21T04:10:18 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9461 Author: twilliams Date: Thu Nov 20 18:39:58 2008 New Revision: 719454 URL: http://svn.apache.org/viewvc?rev=719454&view=rev Log: After reading FOR-1071 and FOR-1075 I gather this was just an oversight. Added: forrest/trunk/main/template-sites/benchmark/src/documentation/resources/schema/symbols-project-v10.ent Added: forrest/trunk/main/template-sites/benchmark/src/documentation/resources/schema/symbols-project-v10.ent URL: http://svn.apache.org/viewvc/forrest/trunk/main/template-sites/benchmark/src/documentation/resources/schema/symbols-project-v10.ent?rev=719454&view=auto ============================================================================== --- forrest/trunk/main/template-sites/benchmark/src/documentation/resources/schema/symbols-project-v10.ent (added) +++ forrest/trunk/main/template-sites/benchmark/src/documentation/resources/schema/symbols-project-v10.ent Thu Nov 20 18:39:58 2008 < at >< at > -0,0 +1,26 < at >< at > +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- Typical invocation: + <!ENTITY % symbols-project + PUBLIC "-//Apache Forrest//ENTITIES Symbols Project v1.0//EN" + "symbols-project-v10.ent"> + %symbols-project; +--> +<!ENTITY myp "My Project Name"> +<!ENTITY myp-s "<strong>My Project Name</strong>"> +<!ENTITY myp-t "My Project Name&trade;"> twilliams< at >apache.org 2008-11-21T02:39:58 http://permalink.gmane.org/gmane.text.xml.forrest.cvs/9460 Author: crossley Date: Sat Nov 15 00:33:11 2008 New Revision: 714223 URL: http://svn.apache.org/viewvc?rev=714223&view=rev Log: ApacheCon 2009. Modified: forrest/trunk/tools/logos/projects.xml Modified: forrest/trunk/tools/logos/projects.xml URL: http://svn.apache.org/viewvc/forrest/trunk/tools/logos/projects.xml?rev=714223&r1=714222&r2=714223&view=diff ============================================================================== --- forrest/trunk/tools/logos/projects.xml (original) +++ forrest/trunk/tools/logos/projects.xml Sat Nov 15 00:33:11 2008 < at >< at > -18,6 +18,54 < at >< at > <projects> <!-- ApacheCon images. See www.apache.org/ads/ApacheCon/ --> <project + id="apachecon-eu-2009" + logo="apachecon" + name="Europe" + name-2="2009" + name-3="March 23-27" + name-4="Amsterdam" + name-5="The Netherlands" + bgcolor="#c98d44" + color="white" + color-2="black" + scale="normal" /> + <project + id="apachecon-eu-2009-wide" + logo="apachecon-wide" + name="Europe" + name-2="2009" + name-3="March 23-27" + name-4="Amsterdam" + name-5="The Netherlands" + bgcolor="#c98d44" + color="white" + color-2="black" + scale="normal" /> + <project + id="apachecon-us-2009" + logo="apachecon" + name="US" + name-2="2009" + name-3="November 2-6" + name-4="Oakland" + name-5="California, USA" + bgcolor="#4169e1" + color="white" + color-2="black" + scale="normal" /> + <project + id="apachecon-us-2009-wide" + logo="apachecon-wide" + name="US" + name-2="2009" + name-3="November 2-6" + name-4="Oakland" + name-5="California, USA" + bgcolor="#4169e1" + color="white" + color-2="black" + scale="normal" /> + <project id="apachecon-eu-2008" logo="apachecon" name="Europe" crossley< at >apache.org 2008-11-15T08:33:11 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.text.xml.forrest.cvs