[jbosstools-commits] JBoss Tools SVN: r23725 - in branches/smooks-dmb: plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core and 21 other directories.

Author: tfennelly Date: 2010-07-26 09:54:59 -0400 (Mon, 26 Jul 2010) New Revision: 23725 Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/SmooksEditorModelBuilder.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/SmooksModel.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.out.xml branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/descriptor.properties branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_1/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_2/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_3/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/META-INF/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/META-INF/MANIFEST.MF branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/build.properties branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/lib/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/lib/xmlunit-1.1.jar branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/plugin.properties branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/pom.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/resources/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java Log: Added DMB code and tests Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/SmooksEditorModelBuilder.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/SmooksEditorModelBuilder.java (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/SmooksEditorModelBuilder.java 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,81 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2009, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2009, JBoss Inc. + */ +package org.jboss.tools.smooks.model; + +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; + +import org.milyn.SmooksException; +import org.milyn.javabean.dynamic.Model; +import org.milyn.javabean.dynamic.ModelBuilder; +import org.xml.sax.SAXException; + +/** + * {@link SmooksModel} Builder. + * <p/> + * Simple wrapper for the {@link ModelBuilder}. + * + * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> + */ +public class SmooksEditorModelBuilder { + + private ModelBuilder modelBuilder; + + public SmooksEditorModelBuilder() { + ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(SmooksEditorModelBuilder.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() { + return modelBuilder; + } + + public Model<SmooksModel> newModel() { + return new Model<SmooksModel>(new SmooksModel(), modelBuilder); + } + + public Model<SmooksModel> readModel(InputStream configStream) throws SAXException, IOException { + ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(SmooksEditorModelBuilder.class.getClassLoader()); + return modelBuilder.readModel(configStream, SmooksModel.class); + } finally { + Thread.currentThread().setContextClassLoader(contextClassloader); + } + } + + public Model<SmooksModel> readModel(Reader configStream) throws SAXException, IOException { + ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(SmooksEditorModelBuilder.class.getClassLoader()); + return modelBuilder.readModel(configStream, SmooksModel.class); + } finally { + Thread.currentThread().setContextClassLoader(contextClassloader); + } + } +} Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/SmooksEditorModelBuilder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/SmooksModel.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/SmooksModel.java (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,57 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2009, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2009, JBoss Inc. + */ +package org.jboss.tools.smooks.model; + +import org.jboss.tools.smooks.model.core.IComponent; +import org.jboss.tools.smooks.model.core.GlobalParams; +import org.milyn.javabean.dynamic.serialize.DefaultNamespace; + +import java.util.ArrayList; +import java.util.List; + +/** + * Smooks Model Root. + * + * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a> + */ +@DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks-1.1.xsd") +public class SmooksModel { + + public static final String MODEL_DESCRIPTOR = "org/jboss/tools/smooks/model/descriptor.properties"; + + private GlobalParams params; + private List<IComponent> components = new ArrayList<IComponent>(); + + public GlobalParams getParams() { + return params; + } + + public void setParams(GlobalParams params) { + this.params = params; + } + + public List<IComponent> getComponents() { + return components; + } + + public void setComponents(List<IComponent> components) { + this.components = components; + } +} Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/SmooksModel.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java 2010-07-26 13:36:08 UTC (rev 23724) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java 2010-07-26 13:54:59 UTC (rev 23725) @@ -43,12 +43,11 @@ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ public IGlobalParams setFilterType(StreamFilterType filterType) { - // TODO: implement this method - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); + setParam(Filter.STREAM_FILTER_TYPE, filterType.toString()); + return this; } /** Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-07-26 13:36:08 UTC (rev 23724) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-07-26 13:54:59 UTC (rev 23725) @@ -10,7 +10,9 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; +import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -97,17 +99,49 @@ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ - public IParams setParam(String name, String value) { - // TODO: implement this method - // Ensure that you remove @generated or mark it @generated NOT - throw new UnsupportedOperationException(); + public Params setParam(String name, String value) { + if(params == null) { + params = new BasicEList<IParam>(); + } + + removeParam(name); + + Param newParam = new Param(); + newParam.setName(name); + newParam.setValue(value); + params.add(newParam); + + return this; } /** * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @generated NOT + */ + public Params removeParam(String name) { + if(params == null) { + return this; + } + + Iterator<IParam> paramsIterator = params.iterator(); + + while(paramsIterator.hasNext()) { + String paramName = paramsIterator.next().getName(); + if(paramName != null && paramName.equals(name)) { + paramsIterator.remove(); + return this; + } + } + + return this; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ @Override Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<smooks-resource-list <@writeNamespaces indent="22"/>> + +<#if bean.params??> + <@writePreText bean=bean.params /> + <params> + <#list bean.params.params as param> + <@writePreText bean=param /> + <param name="${param.name}">${param.value}</param> + </#list> + </params> +</#if> +<#list bean.components as component><@writeBean bean=component /></#list> + +</smooks-resource-list> \ No newline at end of file Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.out.xml =================================================================== Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.out.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,38 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.xsd" + xmlns:dmb="http://www.milyn.org/xsd/smooks/dmb-1.4.xsd"> + + <params> + <param name="factory.definition.parser.class">org.milyn.javabean.factory.MVELFactoryDefinitionParser</param> + </params> + + <!-- + Main Smooks model bean. + --> + <jb:bean beanId="smooksModel" class="org.jboss.tools.smooks.model.SmooksModel" createOnElement="#document"> + <jb:wiring property="params" beanIdRef="globalParams" /> + <jb:wiring property="components" beanIdRef="components" /> + </jb:bean> + <jb:bean beanId="components" class="java.util.ArrayList" createOnElement="#document"> + <jb:wiring beanType="org.jboss.tools.smooks.model.core.IComponent" /> + </jb:bean> + + <!-- params --> + <jb:bean beanId="globalParams" class="org.jboss.tools.smooks.model.core.GlobalParams" createOnElement="/smooks-resource-list/params" /> + <jb:bean beanId="paramsList" class="org.eclipse.emf.common.util.EList" factory="globalParams.params" createOnElement="/smooks-resource-list/params"> + <jb:wiring beanIdRef="param" /> + </jb:bean> + <jb:bean beanId="param" class="org.jboss.tools.smooks.model.core.Param" createOnElement="/smooks-resource-list/params/param"> + <jb:value property="name" data="/smooks-resource-list/params/param/@name" /> + <jb:value property="value" data="/smooks-resource-list/params/param" /> + </jb:bean> + + <!-- + Top level writer... + --> + <dmb:writer beanId="smooksModel" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter"> + <param name="template">/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl</param> + </dmb:writer> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/descriptor.properties =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/descriptor.properties (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,26 @@ +############################################################################################ +# +# Smooks configuration model descriptor. +# +############################################################################################ + + # smooks core v1.1 +smooks11.namespace=http://www.milyn.org/xsd/smooks-1.1.xsd +smooks11.schemaLocation=/META-INF/xsd/smooks-1.1.xsd +smooks11.bindingConfigLocation=/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml +smooks11.order=0 + + # javabean v1.1 +jb11.namespace=http://www.milyn.org/xsd/smooks/javabean-1.1.xsd +jb11.schemaLocation=/META-INF/xsd/smooks/javabean-1.1.xsd +jb11.bindingConfigLocation=/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml + + # javabean v1.2 +jb12.namespace=http://www.milyn.org/xsd/smooks/javabean-1.2.xsd +jb12.schemaLocation=/META-INF/xsd/smooks/javabean-1.2.xsd +jb12.bindingConfigLocation=/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml + + # javabean v1.3 +jb13.namespace=http://www.milyn.org/xsd/smooks/javabean-1.3.xsd +jb13.schemaLocation=/META-INF/xsd/smooks/javabean-1.3.xsd +jb13.bindingConfigLocation=/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml \ No newline at end of file Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,29 @@ +<#assign numChildElemenst = (bean.valueBindings?size + bean.wireBindings?size + bean.expressionBindings?size) > +<#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> + <#else> + <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,dataNS,decoder,defaultVal@default"/> /> + </#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> +<#else> + <${nsp}:bindings <@writeAttribs attribs="beanId,beanClass@class,createOnElement,createOnElementNS"/> /> +</#if> Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.xsd" + xmlns:dmb="http://www.milyn.org/xsd/smooks/dmb-1.4.xsd"> + + <!-- Binding configs (unmarshal)... --> + + <jb:bean beanId="javaBean" class="org.jboss.tools.smooks.model.javabean.Bean" createOnElement="bindings"> + <jb:value property="beanId" data="bindings/@beanId" /> + <jb:value property="beanClass" data="bindings/@class" /> + <jb:value property="createOnElement" data="bindings/@createOnElement" /> + <jb:value property="createOnElementNS" data="bindings/@createOnElementNS" /> + </jb:bean> + + <jb:bean beanId="valueBindings" class="org.eclipse.emf.common.util.EList" factory="javaBean.valueBindings" createOnElement="bindings"> + <jb:wiring beanIdRef="valueBinding" /> + </jb:bean> + <jb:bean beanId="valueBinding" class="org.jboss.tools.smooks.model.javabean.Value" createOnElement="bindings/value"> + <jb:value property="property" data="bindings/value/@property" /> + <jb:value property="setterMethod" data="bindings/value/@setterMethod" /> + <jb:value property="data" data="bindings/value/@data" /> + <jb:value property="dataNS" data="bindings/value/@dataNS" /> + <jb:value property="decoder" data="bindings/value/@decoder" /> + <jb:value property="defaultVal" data="bindings/value/@default" /> + </jb:bean> + <jb:bean beanId="decodeParams" class="org.eclipse.emf.common.util.EList" factory="valueBinding.decodeParams" createOnElement="bindings/value"> + <jb:wiring beanIdRef="decodeParam" /> + </jb:bean> + <jb:bean beanId="decodeParam" class="org.jboss.tools.smooks.model.javabean.DecodeParam" createOnElement="bindings/value/decodeParam"> + <jb:value property="name" data="decodeParam/@name" /> + <jb:value property="value" data="decodeParam" /> + </jb:bean> + + <jb:bean beanId="expressionBindings" class="org.eclipse.emf.common.util.EList" factory="javaBean.expressionBindings" createOnElement="bindings"> + <jb:wiring beanIdRef="expressionBinding" /> + </jb:bean> + <jb:bean beanId="expressionBinding" class="org.jboss.tools.smooks.model.javabean.Expression" createOnElement="bindings/expression"> + <jb:value property="property" data="bindings/expression/@property" /> + <jb:value property="setterMethod" data="bindings/expression/@setterMethod" /> + <jb:value property="execOnElement" data="bindings/expression/@execOnElement" /> + <jb:value property="execOnElementNS" data="bindings/expression/@execOnElementNS" /> + <jb:value property="initVal" data="bindings/expression/@initVal" /> + </jb:bean> + + <jb:bean beanId="wireBindings" class="org.eclipse.emf.common.util.BasicEList" factory="javaBean.wireBindings" createOnElement="bindings"> + <jb:wiring beanIdRef="wireBinding" /> + </jb:bean> + <jb:bean beanId="wireBinding" class="org.jboss.tools.smooks.model.javabean.Wiring" createOnElement="bindings/wiring"> + <jb:value property="property" data="bindings/wiring/@property" /> + <jb:value property="setterMethod" data="bindings/wiring/@setterMethod" /> + <jb:value property="beanIdRef" data="bindings/wiring/@beanIdRef" /> + <jb:value property="wireOnElement" data="bindings/wiring/@wireOnElement" /> + <jb:value property="wireOnElementNS" data="bindings/wiring/@wireOnElementNS" /> + </jb:bean> + + <!-- Writers (marshal)... --> + + <dmb:writer beanId="javaBean" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter"> + <param name="template">/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl</param> + </dmb:writer> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,29 @@ +<#assign numChildElemenst = (bean.valueBindings?size + bean.wireBindings?size + bean.expressionBindings?size) > +<#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> + <#else> + <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,dataNS,decoder,defaultVal@default"/> /> + </#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> +<#else> + <${nsp}:bean <@writeAttribs attribs="beanId,beanClass@class,createOnElement,createOnElementNS"/> /> +</#if> Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.xsd" + xmlns:dmb="http://www.milyn.org/xsd/smooks/dmb-1.4.xsd"> + + <!-- Binding configs (unmarshal)... --> + + <jb:bean beanId="javaBean" class="org.jboss.tools.smooks.model.javabean.Bean" createOnElement="bean"> + <jb:value property="beanId" data="bean/@beanId" /> + <jb:value property="beanClass" data="bean/@class" /> + <jb:value property="createOnElement" data="bean/@createOnElement" /> + <jb:value property="createOnElementNS" data="bean/@createOnElementNS" /> + </jb:bean> + + <jb:bean beanId="valueBindings" class="org.eclipse.emf.common.util.EList" factory="javaBean.valueBindings" createOnElement="bean"> + <jb:wiring beanIdRef="valueBinding" /> + </jb:bean> + <jb:bean beanId="valueBinding" class="org.jboss.tools.smooks.model.javabean.Value" createOnElement="bean/value"> + <jb:value property="property" data="bean/value/@property" /> + <jb:value property="setterMethod" data="bean/value/@setterMethod" /> + <jb:value property="data" data="bean/value/@data" /> + <jb:value property="dataNS" data="bean/value/@dataNS" /> + <jb:value property="decoder" data="bean/value/@decoder" /> + <jb:value property="defaultVal" data="bean/value/@default" /> + </jb:bean> + <jb:bean beanId="decodeParams" class="org.eclipse.emf.common.util.EList" factory="valueBinding.decodeParams" createOnElement="bean/value"> + <jb:wiring beanIdRef="decodeParam" /> + </jb:bean> + <jb:bean beanId="decodeParam" class="org.jboss.tools.smooks.model.javabean.DecodeParam" createOnElement="bean/value/decodeParam"> + <jb:value property="name" data="decodeParam/@name" /> + <jb:value property="value" data="decodeParam" /> + </jb:bean> + + <jb:bean beanId="expressionBindings" class="org.eclipse.emf.common.util.EList" factory="javaBean.expressionBindings" createOnElement="bean"> + <jb:wiring beanIdRef="expressionBinding" /> + </jb:bean> + <jb:bean beanId="expressionBinding" class="org.jboss.tools.smooks.model.javabean.Expression" createOnElement="bean/expression"> + <jb:value property="property" data="bean/expression/@property" /> + <jb:value property="setterMethod" data="bean/expression/@setterMethod" /> + <jb:value property="execOnElement" data="bean/expression/@execOnElement" /> + <jb:value property="execOnElementNS" data="bean/expression/@execOnElementNS" /> + <jb:value property="initVal" data="bean/expression/@initVal" /> + </jb:bean> + + <jb:bean beanId="wireBindings" class="org.eclipse.emf.common.util.EList" factory="javaBean.wireBindings" createOnElement="bean"> + <jb:wiring beanIdRef="wireBinding" /> + </jb:bean> + <jb:bean beanId="wireBinding" class="org.jboss.tools.smooks.model.javabean.Wiring" createOnElement="bean/wiring"> + <jb:value property="property" data="bean/wiring/@property" /> + <jb:value property="setterMethod" data="bean/wiring/@setterMethod" /> + <jb:value property="beanIdRef" data="bean/wiring/@beanIdRef" /> + <jb:value property="wireOnElement" data="bean/wiring/@wireOnElement" /> + <jb:value property="wireOnElementNS" data="bean/wiring/@wireOnElementNS" /> + </jb:bean> + + <!-- Writers (marshal)... --> + + <dmb:writer beanId="javaBean" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter"> + <param name="template">/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl</param> + </dmb:writer> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,29 @@ +<#assign numChildElemenst = (bean.valueBindings?size + bean.wireBindings?size + bean.expressionBindings?size) > +<#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> + <#else> + <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,decoder,defaultVal@default"/> /> + </#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> +<#else> + <${nsp}:bean <@writeAttribs attribs="beanId,beanClass@class,createOnElement"/> /> +</#if> Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.xsd" + xmlns:dmb="http://www.milyn.org/xsd/smooks/dmb-1.4.xsd"> + + <!-- Binding configs (unmarshal)... --> + + <jb:bean beanId="javaBean" class="org.jboss.tools.smooks.model.javabean.Bean" createOnElement="bean"> + <jb:value property="beanId" data="bean/@beanId" /> + <jb:value property="beanClass" data="bean/@class" /> + <jb:value property="createOnElement" data="bean/@createOnElement" /> + <jb:value property="createOnElementNS" data="bean/@createOnElementNS" /> + </jb:bean> + + <jb:bean beanId="valueBindings" class="org.eclipse.emf.common.util.EList" factory="javaBean.valueBindings" createOnElement="bean"> + <jb:wiring beanIdRef="valueBinding" /> + </jb:bean> + <jb:bean beanId="valueBinding" class="org.jboss.tools.smooks.model.javabean.Value" createOnElement="bean/value"> + <jb:value property="property" data="bean/value/@property" /> + <jb:value property="setterMethod" data="bean/value/@setterMethod" /> + <jb:value property="data" data="bean/value/@data" /> + <jb:value property="dataNS" data="bean/value/@dataNS" /> + <jb:value property="decoder" data="bean/value/@decoder" /> + <jb:value property="defaultVal" data="bean/value/@default" /> + </jb:bean> + <jb:bean beanId="decodeParams" class="org.eclipse.emf.common.util.EList" factory="valueBinding.decodeParams" createOnElement="bean/value"> + <jb:wiring beanIdRef="decodeParam" /> + </jb:bean> + <jb:bean beanId="decodeParam" class="org.jboss.tools.smooks.model.javabean.DecodeParam" createOnElement="bean/value/decodeParam"> + <jb:value property="name" data="decodeParam/@name" /> + <jb:value property="value" data="decodeParam" /> + </jb:bean> + + <jb:bean beanId="expressionBindings" class="org.eclipse.emf.common.util.EList" factory="javaBean.expressionBindings" createOnElement="bean"> + <jb:wiring beanIdRef="expressionBinding" /> + </jb:bean> + <jb:bean beanId="expressionBinding" class="org.jboss.tools.smooks.model.javabean.Expression" createOnElement="bean/expression"> + <jb:value property="property" data="bean/expression/@property" /> + <jb:value property="setterMethod" data="bean/expression/@setterMethod" /> + <jb:value property="execOnElement" data="bean/expression/@execOnElement" /> + <jb:value property="execOnElementNS" data="bean/expression/@execOnElementNS" /> + <jb:value property="initVal" data="bean/expression/@initVal" /> + </jb:bean> + + <jb:bean beanId="wireBindings" class="org.eclipse.emf.common.util.EList" factory="javaBean.wireBindings" createOnElement="bean"> + <jb:wiring beanIdRef="wireBinding" /> + </jb:bean> + <jb:bean beanId="wireBinding" class="org.jboss.tools.smooks.model.javabean.Wiring" createOnElement="bean/wiring"> + <jb:value property="property" data="bean/wiring/@property" /> + <jb:value property="setterMethod" data="bean/wiring/@setterMethod" /> + <jb:value property="beanIdRef" data="bean/wiring/@beanIdRef" /> + <jb:value property="wireOnElement" data="bean/wiring/@wireOnElement" /> + <jb:value property="wireOnElementNS" data="bean/wiring/@wireOnElementNS" /> + </jb:bean> + + <!-- Writers (marshal)... --> + + <dmb:writer beanId="javaBean" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter"> + <param name="template">/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl</param> + </dmb:writer> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/META-INF/MANIFEST.MF =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/META-INF/MANIFEST.MF (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/META-INF/MANIFEST.MF 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,16 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.tools.smooks.ecore.model.test +Bundle-Version: 1.1.0.qualifier +Bundle-ClassPath: lib/xmlunit-1.1.jar, + . +Bundle-Vendor: %Bundle-Vendor.0 +Bundle-Localization: plugin +Require-Bundle: org.junit, + org.eclipse.core.runtime, + org.jboss.tools.smooks.ecore.model, + org.jboss.tools.smooks.runtime, + org.eclipse.emf.ecore +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-ActivationPolicy: lazy Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/build.properties =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/build.properties (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/build.properties 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,7 @@ +output.. = bin/ +bin.includes = META-INF/,\ + plugin.properties,\ + projects/,\ + lib/xmlunit-1.1.jar,\ + . +source.. = src/ Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/lib/xmlunit-1.1.jar =================================================================== (Binary files differ) Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/lib/xmlunit-1.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/plugin.properties =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/plugin.properties (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/plugin.properties 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,3 @@ +#Properties file for org.jboss.tools.smooks.test +Bundle-Vendor.0 = JBoss by Red Hat +Bundle-Name.0 = Smooks Tools ECore Model Test Plug-in \ No newline at end of file Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/pom.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/pom.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/pom.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,14 @@ +<project +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <relativePath>../../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.smooks.ecore.model.test</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,69 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2009, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2009, JBoss Inc. + */ +package org.jboss.tools.smooks.model; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.StringReader; +import java.io.StringWriter; + +import org.custommonkey.xmlunit.XMLAssert; +import org.custommonkey.xmlunit.XMLUnit; +import org.jboss.tools.smooks.model.SmooksModel; +import org.jboss.tools.smooks.model.SmooksEditorModelBuilder; +import org.milyn.javabean.dynamic.Model; +import org.xml.sax.SAXException; + +import junit.framework.TestCase; + +/** + * Abstract SmooksModel test case. + * + * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> + */ +public abstract class SmooksModelTestCase extends TestCase { + + protected static SmooksEditorModelBuilder smooksModelBuilder = new SmooksEditorModelBuilder(); + + public SmooksEditorModelBuilder getSmooksModelBuilder() { + return smooksModelBuilder; + } + + public Model<SmooksModel> test(String messageFile) throws IOException, SAXException { + Model<SmooksModel> model = smooksModelBuilder.readModel(getClass().getResourceAsStream(messageFile)); + assertModelEquals(model, messageFile); + return model; + } + + 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(org.milyn.io.StreamUtils.readStreamAsString(getClass().getResourceAsStream(messageFile))); + + XMLUnit.setIgnoreWhitespace( true ); + XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString())); + } + + protected void reportTo(String reportPath) { + smooksModelBuilder.getModelBuilder().setReportPath(reportPath); + } +} \ No newline at end of file Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,74 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2009, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2009, JBoss Inc. + */ +package org.jboss.tools.smooks.model.core; + +import org.jboss.tools.smooks.model.SmooksModel; +import org.jboss.tools.smooks.model.SmooksModelTestCase; +import org.milyn.StreamFilterType; +import org.milyn.javabean.dynamic.Model; +import org.xml.sax.SAXException; + +import java.io.IOException; + +/** + * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a> + */ +public class ParamsTest extends SmooksModelTestCase { + + public void test_manual() { + GlobalParams params = new GlobalParams(); + assertEquals(null, params.getParam("a")); + params.removeParam("a"); // make sure there's no exception + params.setParam("a", "aVal"); + assertEquals("aVal", params.getParam("a")); + params.setParam("a", "bVal"); + assertEquals("bVal", params.getParam("a")); + params.setFilterType(StreamFilterType.SAX); + assertTrue(params.getFilterType() == StreamFilterType.SAX); + params.setFilterType(StreamFilterType.DOM); + assertTrue(params.getFilterType() == StreamFilterType.DOM); + } + + public void test_config_v11_01() throws IOException, SAXException { + Model<SmooksModel> model = test("v1_1/config-01.xml"); + + GlobalParams params = model.getModelRoot().getParams(); + + assertTrue(params.getFilterType() == StreamFilterType.SAX); + + params.setFilterType(StreamFilterType.DOM); + assertModelEquals(model, "v1_1/config-02.xml"); + } + + public void test_config_v11_02() throws IOException, SAXException { + Model<SmooksModel> model = test("v1_1/config-02.xml"); + + GlobalParams params = model.getModelRoot().getParams(); + + assertTrue(params.getFilterType() == StreamFilterType.DOM); + + 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 Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"> + + <params> + <param name="a">aVal</param> + <param name="b">bVal</param> + <param name="stream.filter.type">SAX</param> + </params> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"> + + <params> + <param name="a">aVal</param> + <param name="b">bVal</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.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -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.ecore.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-03.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,53 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2009, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2009, JBoss Inc. + */ +package org.jboss.tools.smooks.model.javabean; + +import org.jboss.tools.smooks.model.SmooksModelTestCase; +import org.xml.sax.SAXException; + +import java.io.IOException; + +/** + * @author <a href="mailto:tom.fennelly@gmail.com">tom.fennelly@gmail.com</a> + */ +public class BeanTest extends SmooksModelTestCase { + + public void test_v11() throws IOException, SAXException { + test("v1_1/config-01.xml"); + } + + public void test_v12_01() throws IOException, SAXException { + test("v1_2/config-01.xml"); + } + + public void test_v12_02() throws IOException, SAXException { + // mixed namespaces... + test("v1_2/config-02.xml"); + } + + public void test_v13_01() throws IOException, SAXException { + test("v1_3/config-01.xml"); + } + + public void test_v13_02() throws IOException, SAXException { + // mixed namespaces... + test("v1_3/config-02.xml"); + } +} \ No newline at end of file Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd" + xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd"> + + <!-- The reader --> + <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true"/> + + <!-- + Create an "example.beans.Order" bean instance when we visit the start of the <order> element. + Assign the new bean instance to the beanId of "order". + 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> + + <!-- + Create an ArrayList bean instance when we visit the start of the <order> element. + This bean is wired into the "order" bean. + --> + <jb:bindings beanId="orderItems" class="java.util.ArrayList" createOnElement="order" createOnElementNS="http://boohoo"> + <jb:wiring beanIdRef="orderItem" /> + </jb:bindings> + + <!-- + Create an "example.beans.Header" bean instance when we visit the start of the <header> element. + 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> + + <!-- + Create an "example.beans.OrderItem" bean instance when we visit the start of the <order-item> element. + This bean is wired into the "orderItems" ArrayList bean. + --> + <jb:bindings 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" /> + <jb:value property="price" decoder="Double" data="order-item/price" /> + </jb:bindings> + + <!-- Something else... --> + <jb:bindings beanId="somethingX" class="example.model.X" createOnElement="xxx" /> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.2.xsd" + xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd"> + + <!-- The reader --> + <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true"/> + + <!-- + Create an "example.beans.Order" bean instance when we visit the start of the <order> element. + Assign the new bean instance to the beanId of "order". + 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> + + <!-- + Create an ArrayList bean instance when we visit the start of the <order> element. + This bean is wired into the "order" bean. + --> + <jb:bean beanId="orderItems" class="java.util.ArrayList" createOnElement="order" createOnElementNS="http://boohoo"> + <jb:wiring beanIdRef="orderItem" /> + </jb:bean> + + <!-- + Create an "example.beans.Header" bean instance when we visit the start of the <header> element. + 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> + + <!-- + Create an "example.beans.OrderItem" bean instance when we visit the start of the <order-item> element. + This bean is wired into the "orderItems" ArrayList bean. + --> + <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> + + <!-- Something else... --> + <jb:bean beanId="somethingX" class="example.model.X" createOnElement="xxx" /> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb11="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd" + xmlns:jb12="http://www.milyn.org/xsd/smooks/javabean-1.2.xsd" + xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd"> + + <!-- The reader --> + <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true"/> + + <!-- + Create an "example.beans.Order" bean instance when we visit the start of the <order> element. + Assign the new bean instance to the beanId of "order". + Wire in the "header" and "orderItems" beans. + --> + <jb12:bean beanId="order" class="example.model.Order" createOnElement="order"> + <jb12:wiring property="header" beanIdRef="header" /> + <jb12:wiring property="orderItems" beanIdRef="orderItems" /> + </jb12:bean> + + <!-- + Create an ArrayList bean instance when we visit the start of the <order> element. + This bean is wired into the "order" bean. + --> + <jb11:bindings beanId="orderItems" class="java.util.ArrayList" createOnElement="order" createOnElementNS="http://boohoo"> + <jb11:wiring beanIdRef="orderItem" /> + </jb11:bindings> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,58 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.3.xsd"> + + <!-- + Create an "example.beans.Order" bean instance when we visit the start of the <order> element. + Assign the new bean instance to the beanId of "order". + Wire in the "header" and "orderItems" beans. + --> + <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> + + <!-- + Create an ArrayList bean instance when we visit the start of the <order> element. + This bean is wired into the "order" bean. + --> + <jb:bean beanId="orderItems" class="java.util.ArrayList" createOnElement="order"> + <jb:wiring beanIdRef="orderItem" /> + </jb:bean> + + <!-- + Create an "example.beans.Header" bean instance when we visit the start of the <header> element. + This bean is wired into the "order" bean. + --> + <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> + + <!-- + Create an "example.beans.OrderItem" bean instance when we visit the start of the <order-item> element. + This bean is wired into the "orderItems" ArrayList bean. + --> + <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> + + <!-- Something else... --> + <jb:bean beanId="somethingX" class="example.model.X" createOnElement="xxx" /> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml 2010-07-26 13:54:59 UTC (rev 23725) @@ -0,0 +1,41 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:jb11="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd" + xmlns:jb12="http://www.milyn.org/xsd/smooks/javabean-1.2.xsd" + xmlns:jb13="http://www.milyn.org/xsd/smooks/javabean-1.3.xsd" + xmlns:csv12="http://www.milyn.org/xsd/smooks/csv-1.2.xsd" + xmlns:csv13="http://www.milyn.org/xsd/smooks/csv-1.3.xsd"> + + <!-- Reader from v1.2 --> + <csv12:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true"/> + + <!-- Reader from v1.3 --> + <csv13:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true" strict="true"/> + + <!-- + Create an "example.beans.Order" bean instance when we visit the start of the <order> element. + Assign the new bean instance to the beanId of "order". + Wire in the "header" and "orderItems" beans. + --> + <jb12:bean beanId="order" class="example.model.Order" createOnElement="order"> + <jb12:wiring property="header" beanIdRef="header" /> + <jb12:wiring property="orderItems" beanIdRef="orderItems" /> + </jb12:bean> + + <!-- + Create an ArrayList bean instance when we visit the start of the <order> element. + This bean is wired into the "order" bean. + --> + <jb11:bindings beanId="orderItems" class="java.util.ArrayList" createOnElement="order" createOnElementNS="http://boohoo"> + <jb11:wiring beanIdRef="orderItem" /> + </jb11:bindings> + + <!-- + Create an ArrayList bean instance when we visit the start of the <order> element. + This bean is wired into the "order" bean. + --> + <jb13:bean beanId="orderItems" class="java.util.ArrayList" createOnElement="order"> + <jb13:wiring beanIdRef="orderItem" /> + </jb13:bean> + +</smooks-resource-list> \ No newline at end of file Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.ecore.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF