Thosten, Are you working on the main branch or are you developing in another one ? Because, as you know, I use the dispatcher and I would like to use the version you are working on...
Salutations, Cyriaque, le 11/12/2008 11:44 [EMAIL PROTECTED] a écrit : > Author: thorsten > Date: Thu Dec 11 02:44:33 2008 > New Revision: 725650 > > URL: http://svn.apache.org/viewvc?rev=725650&view=rev > Log: > Using the config to determine whether we are allowed to parse properties > > 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=725650&r1=725649&r2=725650&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 > Thu Dec 11 02:44:33 2008 > @@ -237,8 +237,6 @@ > > private HashMap<String, Object> localParams; > > - private boolean allowXml; > - > private String currentProperty; > > private InputStream dataStream; > @@ -259,7 +257,7 @@ > config = new WritableDispatcherBean(); > config.setStaxHelper(new StAX()); > // are we allowing xml properties? > - allowXml = configuration.getChild("allowXml").getValueAsBoolean(false); > + boolean allowXml = > configuration.getChild("allowXml").getValueAsBoolean(false); > config.setAllowXmlProperties(allowXml); > // set the prefix for the contract resolving > contractUriPrefix = configuration.getChild("contractUriPrefix").getValue( > @@ -401,9 +399,7 @@ > } else if (Captions.NS.equals(uri)) { > // we are in the dispatcher ns > try { > - /* > - * We are in the dispatcher ns. > - */ > + // We are in the dispatcher ns. > getLogger().debug("Starting dispatcher element: " + raw); > if (Captions.STRUCTURE_ELEMENT.equals(name)) { > // we are in a structurer definition > @@ -458,7 +454,7 @@ > contractProcessingEnd(); > } else if (Captions.PROPERTY_ELEMENT.equals(name) && > this.includeNodes) { > // we are inside a property end element > - if (allowXml) { > + if (config.isAllowXmlProperties()) { > String property = null; > try { > //XMLizable endSAXRecording = super.endSAXRecording(); > @@ -692,7 +688,7 @@ > } > currentProperty = id; > // if we allow xml properties we will just record them > - if (allowXml) { > + if (config.isAllowXmlProperties()) { > // just start the recording > prefixString = "<"+raw+attributesString+">"; > startSerializedXMLRecording((XMLUtils.createPropertiesForXML(true))); > > > -- Salutations, Cyriaque PCO Cyriaque DUPOIRIEUX Consultant Consultant // Tel> +33 (0)5 34 60 44 13 Mob>+33 (0)6 30 29 17 07 PCO Innovation Immeuble BUROLINES 2 ter, rue Marcel DORET 31700 BLAGNAC - France Tel > + 33 (0)5 34 60 59 75 Fax > + 33 (0)5 34 60 44 10 http://www.pco-innovation.com <http://www.pco-innovation.com/> CONFIDENTIALITE : Ce message et les éventuelles pièces attachées sont confidentiels. Si vous n'êtes pas dans la liste des destinataires, veuillez informer l'expéditeur immédiatement et ne pas divulguer le contenu à une tierce personne, ne pas l'utiliser pour quelque raison que ce soit, ne pas stocker ou copier l'information qu'il contient sur un quelconque support. Tout droits réservés. /CONFIDENTIALITY : This e-mail and any attachments are confidential and may be privileged. If you are not a named recipient, please notify the sender immediately and do not disclose the contents to another person, use it for any purpose or store or copy the information in any medium. All rights reserved. / // P Pensez à l'environnement avant d'imprimer !/ Before printing, think about ENVIRONMENTAL responsibility!/