[jbosstools-commits] JBoss Tools SVN: r22882 - in branches/smooks-dmb: plugins/org.jboss.tools.smooks.model/META-INF and 20 other directories.

Author: tfennelly Date: 2010-06-18 10:36:27 -0400 (Fri, 18 Jun 2010) New Revision: 22882 Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-all-1.4-SNAPSHOT.jar branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml Removed: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs/xstream-1.2.2.jar branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-20100611.170738-20.jar branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-20100611.170738-18.jar branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-20100611.170738-16.jar Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.project branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml Log: Fixing up runtime classloading issues for the model Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project 2010-06-18 14:36:27 UTC (rev 22882) @@ -25,4 +25,16 @@ <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> + <linkedResources> + <link> + <name>SMOOKS_CORE_SRC</name> + <type>2</type> + <locationURI>SMOOKS_CORE_SRC</locationURI> + </link> + <link> + <name>SMOOKS_JAVABEAN_SRC</name> + <type>2</type> + <locationURI>SMOOKS_JAVABEAN_SRC</locationURI> + </link> + </linkedResources> </projectDescription> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF 2010-06-18 14:36:27 UTC (rev 22882) @@ -15,3 +15,4 @@ org.jboss.tools.smooks.model.csv, org.jboss.tools.smooks.model.javabean, org.jboss.tools.smooks.model.plugin +Bundle-ClassPath: . Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs/xstream-1.2.2.jar =================================================================== (Binary files differ) Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-18 14:36:27 UTC (rev 22882) @@ -22,7 +22,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; +import java.util.List; +import java.util.Properties; +import org.milyn.SmooksException; import org.milyn.javabean.dynamic.Model; import org.milyn.javabean.dynamic.ModelBuilder; import org.xml.sax.SAXException; @@ -36,10 +39,18 @@ */ public class SmooksModelBuilder { - private ModelBuilder modelBuilder; - - public SmooksModelBuilder() throws SAXException, IOException { - modelBuilder = new ModelBuilder(SmooksModel.MODEL_DESCRIPTOR, false); + private static ModelBuilder modelBuilder; + + static { + ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(SmooksModelBuilder.class.getClassLoader()); + modelBuilder = new ModelBuilder(SmooksModel.MODEL_DESCRIPTOR, false); + } catch (Exception e) { + throw new SmooksException("Failed to create ModelBuilder instance for descriptor '" + SmooksModel.MODEL_DESCRIPTOR + "'.", e); + } finally { + Thread.currentThread().setContextClassLoader(contextClassloader); + } } public ModelBuilder getModelBuilder() { @@ -47,10 +58,22 @@ } public Model<SmooksModel> readModel(InputStream configStream) throws SAXException, IOException { - return modelBuilder.readModel(configStream, SmooksModel.class); + ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(SmooksModelBuilder.class.getClassLoader()); + return modelBuilder.readModel(configStream, SmooksModel.class); + } finally { + Thread.currentThread().setContextClassLoader(contextClassloader); + } } public Model<SmooksModel> readModel(Reader configStream) throws SAXException, IOException { - return modelBuilder.readModel(configStream, SmooksModel.class); + ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(SmooksModelBuilder.class.getClassLoader()); + return modelBuilder.readModel(configStream, SmooksModel.class); + } finally { + Thread.currentThread().setContextClassLoader(contextClassloader); + } } } Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl 2010-06-18 14:36:27 UTC (rev 22882) @@ -1,13 +1,16 @@ <#if bean.singleBinding??> <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> > + <@writePreText bean=bean.singleBinding /> <${nsp}:singleBinding <@writeAttribs attribs="beanId,beanClass@class" bean=bean.singleBinding /> /> </${nsp}:reader> <#elseif bean.listBinding??> <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> > + <@writePreText bean=bean.listBinding /> <${nsp}:listBinding <@writeAttribs attribs="beanId,beanClass@class" bean=bean.listBinding /> /> </${nsp}:reader> <#elseif bean.mapBinding??> <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> > + <@writePreText bean=bean.mapBinding /> <${nsp}:mapBinding <@writeAttribs attribs="beanId,beanClass@class,keyField" bean=bean.mapBinding /> /> </${nsp}:reader> <#else> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl 2010-06-18 14:36:27 UTC (rev 22882) @@ -1,13 +1,16 @@ <#if bean.singleBinding??> <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> > + <@writePreText bean=bean.singleBinding /> <${nsp}:singleBinding <@writeAttribs attribs="beanId,beanClass@class" bean=bean.singleBinding /> /> </${nsp}:reader> <#elseif bean.listBinding??> <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> > + <@writePreText bean=bean.listBinding /> <${nsp}:listBinding <@writeAttribs attribs="beanId,beanClass@class" bean=bean.listBinding /> /> </${nsp}:reader> <#elseif bean.mapBinding??> <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> > + <@writePreText bean=bean.mapBinding /> <${nsp}:mapBinding <@writeAttribs attribs="beanId,beanClass@class,keyField" bean=bean.mapBinding /> /> </${nsp}:reader> <#else> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl 2010-06-18 14:36:27 UTC (rev 22882) @@ -2,10 +2,12 @@ <#if (numChildElemenst > 0)> <${nsp}:bindings <@writeAttribs attribs="beanId,beanClass@class,createOnElement,createOnElementNS"/>> <#list bean.valueBindings as valueBinding> + <@writePreText bean=valueBinding /> <#assign numDecodeParams = (valueBinding.decodeParams?size) > <#if (numDecodeParams > 0)> <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,dataNS,decoder,defaultVal@default"/>> <#list valueBinding.decodeParams as decodeParam> + <@writePreText bean=decodeParam /> <${nsp}:decodeParam <@writeAttribs bean=decodeParam attribs="name"/>>${decodeParam.value}</${nsp}:decodeParam> </#list> </${nsp}:value> @@ -14,9 +16,11 @@ </#if> </#list> <#list bean.wireBindings as wireBinding> + <@writePreText bean=wireBinding /> <${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement,wireOnElementNS"/> /> </#list> <#list bean.expressionBindings as expressionBinding> + <@writePreText bean=expressionBinding /> <${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,execOnElementNS"/> /> </#list> </${nsp}:bindings> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl 2010-06-18 14:36:27 UTC (rev 22882) @@ -2,10 +2,12 @@ <#if (numChildElemenst > 0)> <${nsp}:bean <@writeAttribs attribs="beanId,beanClass@class,createOnElement,createOnElementNS"/>> <#list bean.valueBindings as valueBinding> + <@writePreText bean=valueBinding /> <#assign numDecodeParams = (valueBinding.decodeParams?size) > <#if (numDecodeParams > 0)> <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,dataNS,decoder,defaultVal@default"/>> <#list valueBinding.decodeParams as decodeParam> + <@writePreText bean=decodeParam /> <${nsp}:decodeParam <@writeAttribs bean=decodeParam attribs="name"/>>${decodeParam.value}</${nsp}:decodeParam> </#list> </${nsp}:value> @@ -14,9 +16,11 @@ </#if> </#list> <#list bean.wireBindings as wireBinding> + <@writePreText bean=wireBinding /> <${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement,wireOnElementNS"/> /> </#list> <#list bean.expressionBindings as expressionBinding> + <@writePreText bean=expressionBinding /> <${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,execOnElementNS,initVal"/> /> </#list> </${nsp}:bean> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl 2010-06-18 14:36:27 UTC (rev 22882) @@ -2,10 +2,12 @@ <#if (numChildElemenst > 0)> <${nsp}:bean <@writeAttribs attribs="beanId,beanClass@class,createOnElement"/>> <#list bean.valueBindings as valueBinding> + <@writePreText bean=valueBinding /> <#assign numDecodeParams = (valueBinding.decodeParams?size) > <#if (numDecodeParams > 0)> <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,decoder,defaultVal@default"/>> <#list valueBinding.decodeParams as decodeParam> + <@writePreText bean=decodeParam /> <${nsp}:decodeParam <@writeAttribs bean=decodeParam attribs="name"/>>${decodeParam.value}</${nsp}:decodeParam> </#list> </${nsp}:value> @@ -14,9 +16,11 @@ </#if> </#list> <#list bean.wireBindings as wireBinding> + <@writePreText bean=wireBinding /> <${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement"/> /> </#list> <#list bean.expressionBindings as expressionBinding> + <@writePreText bean=expressionBinding /> <${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,initVal"/> /> </#list> </${nsp}:bean> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath 2010-06-18 14:36:27 UTC (rev 22882) @@ -1,12 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="libs/milyn-commons-1.4-SNAPSHOT.jar"/> - <classpathentry exported="true" kind="lib" path="libs/milyn-edisax-parser-1.4-20100611.170738-20.jar"/> - <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-core-1.4-SNAPSHOT.jar"/> - <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-csv-1.4-SNAPSHOT.jar"/> - <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-edi-1.4-20100611.170738-18.jar"/> - <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar"/> - <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-json-1.4-20100611.170738-16.jar"/> + <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-all-1.4-SNAPSHOT.jar" sourcepath="/Users/tfennelly/.m2/repository/org/milyn/milyn-smooks-all/1.4-SNAPSHOT/milyn-smooks-all-1.4-SNAPSHOT-sources.jar"/> <classpathentry exported="true" kind="lib" path="libs/jaxen-1.1.1.jar"/> <classpathentry exported="true" kind="lib" path="libs/mvel2-2.0.17.jar"/> <classpathentry exported="true" kind="lib" path="libs/xstream-1.2.2.jar"/> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.project =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.project 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.project 2010-06-18 14:36:27 UTC (rev 22882) @@ -1,28 +1,40 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.jboss.tools.smooks.runtime</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.smooks.runtime</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> + <linkedResources> + <link> + <name>SMOOKS_CORE_SRC</name> + <type>2</type> + <locationURI>SMOOKS_CORE_SRC</locationURI> + </link> + <link> + <name>SMOOKS_JAVABEAN_SRC</name> + <type>2</type> + <locationURI>SMOOKS_JAVABEAN_SRC</locationURI> + </link> + </linkedResources> +</projectDescription> Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-06-18 14:36:27 UTC (rev 22882) @@ -19,38 +19,163 @@ libs/jaxen-1.1.1.jar, libs/mvel2-2.0.17.jar, libs/xstream-1.2.2.jar, - libs/milyn-commons-1.4-SNAPSHOT.jar, - libs/milyn-edisax-parser-1.4-20100611.170738-20.jar, - libs/milyn-smooks-core-1.4-SNAPSHOT.jar, - libs/milyn-smooks-csv-1.4-SNAPSHOT.jar, - libs/milyn-smooks-edi-1.4-20100611.170738-18.jar, - libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar, - libs/milyn-smooks-json-1.4-20100611.170738-16.jar + libs/milyn-smooks-all-1.4-SNAPSHOT.jar Bundle-Localization: plugin Bundle-Vendor: %providerName Export-Package: au.com.bytecode.opencsv, - au.com.bytecode.opencsv.bean, - freemarker.core, - freemarker.template, - freemarker.template.utility, - org.milyn, - org.milyn.cdr, - org.milyn.container, - org.milyn.csv, - org.milyn.delivery, - org.milyn.delivery.sax, - org.milyn.io, - org.milyn.javabean, - org.milyn.javabean.context, - org.milyn.javabean.decoders, - org.milyn.javabean.dynamic, - org.milyn.javabean.dynamic.ext, - org.milyn.javabean.dynamic.resolvers, - org.milyn.javabean.dynamic.serialize, - org.milyn.javabean.dynamic.serialize.freemarker, - org.milyn.javabean.dynamic.visitor, - org.milyn.json, - org.milyn.payload, - org.milyn.smooks.edi, - org.milyn.util, - org.milyn.xml + au.com.bytecode.opencsv.bean;uses:="au.com.bytecode.opencsv", + freemarker.core; + uses:="javax.swing.tree, + javax.swing, + new freemarker.core, + freemarker.template", + freemarker.template; + uses:="freemarker.ext.beans, + javax.swing.tree, + freemarker.cache, + freemarker.core", + freemarker.template.utility; + uses:="org.python.core, + freemarker.core, + freemarker.template, + org.python.util, + org.w3c.dom", + org.milyn; + uses:="org.milyn.cdr, + org.milyn.container, + javax.xml.transform, + org.milyn.profile, + org.milyn.delivery", + org.milyn.cdr; + uses:="new org.milyn.cdr, + org.milyn.expression, + org.milyn.container, + org.milyn.profile, + org.w3c.dom, + javax.xml.namespace, + org.milyn, + org.milyn.delivery.sax, + org.milyn.delivery, + org.milyn.cdr.xpath", + org.milyn.container; + uses:="org.milyn.delivery.dom, + org.milyn.event, + org.milyn.cdr, + org.milyn.javabean.context, + org.milyn.delivery, + org.milyn.profile, + org.milyn.resource", + org.milyn.csv; + uses:="org.milyn.xml, + org.milyn.cdr, + org.milyn, + org.milyn.container, + org.milyn.delivery, + org.xml.sax", + org.milyn.delivery; + uses:="org.apache.commons.logging, + org.milyn.delivery.dom, + org.milyn.cdr, + org.milyn.container, + javax.xml.parsers, + org.milyn.dtd, + org.milyn.profile, + org.w3c.dom, + org.xml.sax, + org.milyn, + org.xml.sax.ext, + org.milyn.delivery.sax, + javax.xml.transform, + org.milyn.delivery.ordering", + org.milyn.delivery.sax; + uses:="org.milyn, + org.xml.sax.ext, + org.milyn.container, + javax.xml.transform, + org.milyn.delivery, + org.w3c.dom, + javax.xml.namespace, + org.xml.sax", + org.milyn.io; + uses:="org.apache.commons.logging, + org.milyn.delivery.dom, + org.milyn.delivery.sax, + org.milyn.container, + org.milyn.delivery, + org.milyn.delivery.ordering, + org.w3c.dom", + org.milyn.javabean; + uses:="org.milyn.expression, + org.milyn.delivery.dom, + org.milyn.container, + org.milyn.javabean.repository, + org.w3c.dom, + org.milyn, + org.milyn.delivery.sax, + org.milyn.javabean.factory, + org.milyn.javabean.context, + org.milyn.delivery, + org.milyn.delivery.ordering", + org.milyn.javabean.context; + uses:="org.milyn.javabean.lifecycle, + org.milyn.delivery.dom, + org.milyn.delivery.sax, + org.milyn.container, + org.milyn.delivery, + org.w3c.dom, + org.milyn.javabean.repository", + org.milyn.javabean.decoders;uses:="org.milyn.javabean,org.milyn.config", + org.milyn.javabean.dynamic; + uses:="org.apache.commons.logging, + org.milyn, + org.milyn.javabean.dynamic.serialize, + javax.xml.validation, + org.milyn.delivery, + org.xml.sax", + org.milyn.javabean.dynamic.ext; + uses:="org.milyn.delivery.dom, + org.milyn.container, + org.milyn.delivery, + org.w3c.dom", + org.milyn.javabean.dynamic.resolvers;uses:="org.xml.sax", + org.milyn.javabean.dynamic.serialize;uses:="org.milyn.javabean.dynamic", + org.milyn.javabean.dynamic.serialize.freemarker; + uses:="org.milyn.javabean.dynamic, + freemarker.core, + org.milyn.javabean.dynamic.serialize, + freemarker.template", + org.milyn.javabean.dynamic.visitor; + uses:="org.milyn.javabean.lifecycle, + org.milyn.delivery.dom, + org.milyn.container, + org.w3c.dom", + org.milyn.json; + uses:="org.milyn.xml, + org.milyn, + org.milyn.cdr, + org.milyn.container, + org.w3c.dom, + org.xml.sax", + org.milyn.payload;uses:="org.milyn.container,javax.xml.transform,javax.xml.transform.stream", + org.milyn.smooks.edi; + uses:="org.milyn.xml, + org.milyn, + org.milyn.cdr, + org.milyn.container, + org.milyn.edisax, + org.milyn.delivery, + org.xml.sax", + org.milyn.util; + uses:="javax.naming, + org.apache.commons.logging, + org.milyn.container, + org.hsqldb, + freemarker.template", + org.milyn.xml; + uses:="new org.milyn.xml, + org.milyn.container, + javax.xml.transform, + javax.xml.parsers, + org.milyn.delivery, + org.w3c.dom, + org.xml.sax" Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties 2010-06-18 14:36:27 UTC (rev 22882) @@ -7,11 +7,5 @@ libs/jaxen-1.1.1.jar,\ libs/mvel2-2.0.17.jar,\ libs/xstream-1.2.2.jar,\ - libs/milyn-commons-1.4-SNAPSHOT.jar,\ - libs/milyn-edisax-parser-1.4-20100611.170738-20.jar,\ - libs/milyn-smooks-core-1.4-SNAPSHOT.jar,\ - libs/milyn-smooks-csv-1.4-SNAPSHOT.jar,\ - libs/milyn-smooks-edi-1.4-20100611.170738-18.jar,\ - libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar,\ - libs/milyn-smooks-json-1.4-20100611.170738-16.jar + libs/milyn-smooks-all-1.4-SNAPSHOT.jar jars.compile.order = Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml 2010-06-18 14:36:27 UTC (rev 22882) @@ -1,68 +0,0 @@ -<project name="Get-Smooks" default="smooks.dependencies.get" basedir="." xmlns:artifact="urn:maven-artifact-ant"> - - <property name="smooks.version" value="1.4-SNAPSHOT"/> - - <description> - Script for pulling Smooks v${smooks.version} jars from the maven repo. - </description> - - <property environment="env"/> - <property name="maven.ant.version" value="2.0.9"/> - <property name="maven.dir" value="org/apache/maven/maven-ant-tasks/${maven.ant.version}"/> - <property name="maven.jar" value="maven-ant-tasks-${maven.ant.version}.jar"/> - <pathconvert targetos="unix" property="maven.repo.dir"> - <path> - <pathelement location="${user.home}/.m2/repository"/> - </path> - </pathconvert> - <pathconvert targetos="unix" property="maven.ant.repo.dir"> - <path> - <pathelement location="${maven.repo.dir}/${maven.dir}"/> - </path> - </pathconvert> - <condition property="maven.exists.locally"> - <available file="${maven.ant.repo.dir}/${maven.jar}"/> - </condition> - - <target name="smooks.dependencies.get" depends="maven.get"> - - <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpath="${maven.ant.repo.dir}/${maven.jar}"/> - <artifact:remoteRepository id="codehaus.m2.snapshots" url="http://snapshots.repository.codehaus.org" /> - <artifact:dependencies filesetId="dependencies"> - - <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-csv" /> - <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-edi" /> - <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-javabean"/> - <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-json"/> - - <remoteRepository refid="codehaus.m2.snapshots" /> - </artifact:dependencies> - - <tstamp> - <format property="get.time" pattern="MM-dd-yyyy-hh-mm-ss"/> - </tstamp> - - <property name="todir" value="libs" /> - <antcall target="copy.dependencies"> - <reference refid="dependencies" /> - </antcall> - <delete> - <fileset dir="./${todir}" includes="commons*.jar,jta*.jar,xerces*.jar,xpp*.jar,xml-apis*.jar,junit*,log4j*,hsqldb*,servlet-api*,xalan*,jbossall-client*,jboss-j2ee*,jdom*,cglib-full*,cglib-nodep*,struts*,mockejb*,mockrunner*,commons-beanutils*,commons-digester*,commons-fileupload*,commons-validator*,oro*,xmlunit*,hibernate-core-*,ibatis-sqlmap-*,dom4j-*,ant-*,javassist-3.10.0.GA.jar" /> - </delete> - </target> - - <target name="maven.get" unless="maven.exists.locally"> - <mkdir dir="${maven.ant.repo.dir}"/> - <get src="http://repo1.maven.org/maven2/${maven.dir}/${maven.jar}" dest="${maven.ant.repo.dir}/${maven.jar}" - usetimestamp="true"/> - </target> - - <target name="copy.dependencies"> - <mkdir dir="./${todir}" /> - <copy todir="./${todir}"> - <fileset refid="dependencies"/> - <mapper type="flatten"/> - </copy> - </target> - -</project> Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar =================================================================== (Binary files differ) Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-20100611.170738-20.jar =================================================================== (Binary files differ) Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-all-1.4-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-all-1.4-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar =================================================================== (Binary files differ) Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar =================================================================== (Binary files differ) Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-20100611.170738-18.jar =================================================================== (Binary files differ) Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar =================================================================== (Binary files differ) Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-20100611.170738-16.jar =================================================================== (Binary files differ) Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2010-06-18 14:36:27 UTC (rev 22882) @@ -37,7 +37,8 @@ org.eclipse.debug.ui, org.eclipse.jdt.debug.ui, org.eclipse.jdt.junit, - org.eclipse.ui.console + org.eclipse.ui.console, + org.jboss.tools.smooks.model Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-06-18 14:36:27 UTC (rev 22882) @@ -76,6 +76,7 @@ import org.jboss.tools.smooks.configuration.validate.SmooksMarkerHelper; import org.jboss.tools.smooks.configuration.validate.SmooksModelValidator; import org.jboss.tools.smooks.graphical.editors.ISmooksEditorInitListener; +import org.jboss.tools.smooks.model.SmooksModelBuilder; import org.jboss.tools.smooks.model.common.AbstractAnyType; import org.jboss.tools.smooks.model.common.provider.CommonItemProviderAdapterFactory; import org.jboss.tools.smooks.model.csv12.provider.Csv12ItemProviderAdapterFactory; @@ -134,6 +135,8 @@ protected boolean graphChanged = false; + private SmooksModelBuilder modelBuilder; + // private Object smooksDOMModel; public AbstractSmooksFormEditor() { @@ -141,6 +144,8 @@ resourceChangeListener = new SmooksResourceTraker(); xmlDocumentTraker = new SmooksXMLEditorDocumentListener(); initEditingDomain(); + + modelBuilder = new SmooksModelBuilder(); } /** Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project 2010-06-18 14:36:27 UTC (rev 22882) @@ -25,4 +25,16 @@ <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> + <linkedResources> + <link> + <name>SMOOKS_CORE_SRC</name> + <type>2</type> + <locationURI>SMOOKS_CORE_SRC</locationURI> + </link> + <link> + <name>SMOOKS_JAVABEAN_SRC</name> + <type>2</type> + <locationURI>SMOOKS_JAVABEAN_SRC</locationURI> + </link> + </linkedResources> </projectDescription> Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF 2010-06-18 14:36:27 UTC (rev 22882) @@ -8,8 +8,8 @@ Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Require-Bundle: org.junit, - org.jboss.tools.smooks.runtime, org.eclipse.core.runtime, - org.jboss.tools.smooks.model + org.jboss.tools.smooks.model, + org.jboss.tools.smooks.runtime Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-18 14:36:27 UTC (rev 22882) @@ -63,7 +63,10 @@ public void assertModelEquals(Model<SmooksModel> model, String messageFile) throws IOException, SAXException { StringWriter modelWriter = new StringWriter(); model.writeModel(modelWriter); - System.out.println(modelWriter); + +// System.out.println(modelWriter); +// System.out.println(org.milyn.io.StreamUtils.readStreamAsString(getClass().getResourceAsStream(messageFile))); + XMLUnit.setIgnoreWhitespace( true ); XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString())); } Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-18 14:36:27 UTC (rev 22882) @@ -71,4 +71,8 @@ params.setFilterType(StreamFilterType.SAX); assertModelEquals(model, "v1_1/config-01.xml"); } + + public void test_config_v11_03() throws IOException, SAXException { + test("v1_1/config-03.xml"); + } } \ No newline at end of file Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml 2010-06-18 14:36:27 UTC (rev 22882) @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"> + + <!-- params --> + <params> + <!-- param a --> + <param name="a">aVal</param> + <param name="b">bVal</param> + <!-- filter param --> + <param name="stream.filter.type">DOM</param> + </params> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml 2010-06-18 14:36:27 UTC (rev 22882) @@ -12,7 +12,9 @@ Wire in the "header" and "orderItems" beans. --> <jb:bindings beanId="order" class="example.model.Order" createOnElement="order"> + <!-- Wire in the header... --> <jb:wiring property="header" beanIdRef="header" /> + <!-- Wire in the order items... --> <jb:wiring property="orderItems" beanIdRef="orderItems" /> </jb:bindings> @@ -29,13 +31,18 @@ This bean is wired into the "order" bean. --> <jb:bindings beanId="header" class="example.model.Header" createOnElement="header"> + <!-- Date... --> <jb:value property="date" decoder="Date" data="header/date" dataNS="http://boohoo"> + <!-- Decode formatting... --> <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam> <jb:decodeParam name="locale-language">en</jb:decodeParam> <jb:decodeParam name="locale-country">IE</jb:decodeParam> </jb:value> + <!-- customer num... --> <jb:value property="customerNumber" decoder="Long" data="header/customer/@number" setterMethod="setCustomerNumber" /> + <!-- customer name... --> <jb:value property="customerName" data="header/customer" /> + <!-- x by expression... --> <jb:expression property="x" setterMethod="setX" execOnElement="xEl" execOnElementNS="http://x" /> </jb:bindings> Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml 2010-06-18 14:36:27 UTC (rev 22882) @@ -12,7 +12,9 @@ Wire in the "header" and "orderItems" beans. --> <jb:bean beanId="order" class="example.model.Order" createOnElement="order"> + <!-- comment --> <jb:wiring property="header" beanIdRef="header" /> + <!-- comment --> <jb:wiring property="orderItems" beanIdRef="orderItems" /> </jb:bean> @@ -29,13 +31,17 @@ This bean is wired into the "order" bean. --> <jb:bean beanId="header" class="example.model.Header" createOnElement="header"> + <!-- comment --> <jb:value property="date" decoder="Date" data="header/date" dataNS="http://boohoo"> + <!-- comment --> <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam> <jb:decodeParam name="locale-language">en</jb:decodeParam> <jb:decodeParam name="locale-country">IE</jb:decodeParam> </jb:value> <jb:value property="customerNumber" decoder="Long" data="header/customer/@number" setterMethod="setCustomerNumber" /> + <!-- comment --> <jb:value property="customerName" data="header/customer" /> + <!-- comment --> <jb:expression property="x" setterMethod="setX" execOnElement="xEl" execOnElementNS="http://x" /> </jb:bean> @@ -46,6 +52,7 @@ <jb:bean beanId="orderItem" class="example.model.OrderItem" createOnElement="order-item"> <jb:value property="productId" decoder="Long" data="order-item/product" /> <jb:value property="quantity" decoder="Integer" data="order-item/quantity" /> + <!-- comment --> <jb:value property="price" decoder="Double" data="order-item/price" /> </jb:bean> Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml 2010-06-18 14:35:31 UTC (rev 22881) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml 2010-06-18 14:36:27 UTC (rev 22882) @@ -13,6 +13,7 @@ --> <jb:bean beanId="order" class="example.model.Order" createOnElement="order"> <jb:wiring property="header" beanIdRef="header" /> + <!-- comment --> <jb:wiring property="orderItems" beanIdRef="orderItems" /> </jb:bean> @@ -30,12 +31,17 @@ --> <jb:bean beanId="header" class="example.model.Header" createOnElement="header"> <jb:value property="date" decoder="Date" data="header/date"> + <!-- comment --> <jb:decodeParam name="format">EEE MMM dd HH:mm:ss z yyyy</jb:decodeParam> <jb:decodeParam name="locale-language">en</jb:decodeParam> + <!-- comment --> <jb:decodeParam name="locale-country">IE</jb:decodeParam> </jb:value> + <!-- comment --> <jb:value property="customerNumber" decoder="Long" data="header/customer/@number" setterMethod="setCustomerNumber" /> + <!-- comment --> <jb:value property="customerName" data="header/customer" /> + <!-- comment --> <jb:expression property="x" setterMethod="setX" execOnElement="xEl" /> </jb:bean> @@ -45,6 +51,7 @@ --> <jb:bean beanId="orderItem" class="example.model.OrderItem" createOnElement="order-item"> <jb:value property="productId" decoder="Long" data="order-item/product" /> + <!-- comment --> <jb:value property="quantity" decoder="Integer" data="order-item/quantity" /> <jb:value property="price" decoder="Double" data="order-item/price" /> </jb:bean>