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

Author: tfennelly Date: 2010-06-25 07:57:27 -0400 (Fri, 25 Jun 2010) New Revision: 23034 Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplate.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplateTest.java branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/config-01.xml Removed: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml Modified: 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/SmooksModel.java 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/core/Params.java branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 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/SmooksModelTestCase.java branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java Log: Added FreMarker model 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-25 11:53:28 UTC (rev 23033) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF 2010-06-25 11:57:27 UTC (rev 23034) @@ -14,6 +14,8 @@ org.jboss.tools.smooks.model.core, org.jboss.tools.smooks.model.csv, org.jboss.tools.smooks.model.edi, + org.jboss.tools.smooks.model.freemarker, org.jboss.tools.smooks.model.javabean, + org.jboss.tools.smooks.model.json, org.jboss.tools.smooks.model.plugin Bundle-ClassPath: . Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-25 11:53:28 UTC (rev 23033) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-25 11:57:27 UTC (rev 23034) @@ -20,12 +20,10 @@ package org.jboss.tools.smooks.model; import org.jboss.tools.smooks.model.core.Component; -import org.jboss.tools.smooks.model.core.Params; +import org.jboss.tools.smooks.model.core.GlobalParams; import org.jboss.tools.smooks.model.core.Reader; -import org.milyn.javabean.dynamic.Model; import org.milyn.javabean.dynamic.serialize.DefaultNamespace; -import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -39,15 +37,15 @@ public static final String MODEL_DESCRIPTOR = "org/jboss/tools/smooks/model/descriptor.properties"; - private Params params; + private GlobalParams params; private List<Reader> readers = new ArrayList<Reader>(); private List<Component> components = new ArrayList<Component>(); - public Params getParams() { + public GlobalParams getParams() { return params; } - public void setParams(Params params) { + public void setParams(GlobalParams params) { this.params = params; } 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-25 11:53:28 UTC (rev 23033) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-25 11:57:27 UTC (rev 23034) @@ -37,7 +37,7 @@ */ public class SmooksModelBuilder { - private static ModelBuilder modelBuilder; + public static ModelBuilder modelBuilder; static { ClassLoader contextClassloader = Thread.currentThread().getContextClassLoader(); Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java 2010-06-25 11:57:27 UTC (rev 23034) @@ -0,0 +1,50 @@ +/** + * 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.milyn.StreamFilterType; +import org.milyn.delivery.Filter; + +/** + * Global Parameters. + * + * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> + */ +public class GlobalParams extends Params { + + public GlobalParams setFilterType(StreamFilterType filterType) { + setParam(Filter.STREAM_FILTER_TYPE, filterType.toString()); + return this; + } + + public StreamFilterType getFilterType() { + String filterType = getParam(Filter.STREAM_FILTER_TYPE); + + if(filterType == null) { + return null; + } + + try { + return StreamFilterType.valueOf(filterType); + } catch(Exception e) { + return null; + } + } +} Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/GlobalParams.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-06-25 11:53:28 UTC (rev 23033) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-06-25 11:57:27 UTC (rev 23034) @@ -23,9 +23,6 @@ import java.util.Iterator; import java.util.List; -import org.milyn.StreamFilterType; -import org.milyn.delivery.Filter; - /** * Params. * @@ -85,23 +82,4 @@ return this; } - - public Params setFilterType(StreamFilterType filterType) { - setParam(Filter.STREAM_FILTER_TYPE, filterType.toString()); - return this; - } - - public StreamFilterType getFilterType() { - String filterType = getParam(Filter.STREAM_FILTER_TYPE); - - if(filterType == null) { - return null; - } - - try { - return StreamFilterType.valueOf(filterType); - } catch(Exception e) { - return null; - } - } } Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-25 11:53:28 UTC (rev 23033) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-25 11:57:27 UTC (rev 23034) @@ -1,16 +0,0 @@ -<?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.readers as reader><@writeBean bean=reader /></#list> -<#list bean.components as component><@writeBean bean=component /></#list> - -</smooks-resource-list> \ No newline at end of file Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-25 11:53:28 UTC (rev 23033) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-25 11:57:27 UTC (rev 23034) @@ -1,40 +0,0 @@ -<?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"> - - <!-- - Main Smooks model bean. - --> - <jb:bean beanId="smooksModel" class="org.jboss.tools.smooks.model.SmooksModel" createOnElement="#document"> - <jb:wiring property="params" beanIdRef="params" /> - <jb:wiring property="readers" beanIdRef="readers" /> - <jb:wiring property="components" beanIdRef="components" /> - </jb:bean> - <jb:bean beanId="readers" class="java.util.ArrayList" createOnElement="#document"> - <jb:wiring beanType="org.jboss.tools.smooks.model.core.Reader" /> - </jb:bean> - <jb:bean beanId="components" class="java.util.ArrayList" createOnElement="#document"> - <jb:wiring beanType="org.jboss.tools.smooks.model.core.Component" /> - </jb:bean> - - <!-- params --> - <jb:bean beanId="params" class="org.jboss.tools.smooks.model.core.Params" createOnElement="/smooks-resource-list/params"> - <jb:wiring property="params" beanIdRef="paramsList" /> - </jb:bean> - <jb:bean beanId="paramsList" class="java.util.ArrayList" 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.ftl</param> - </dmb:writer> - -</smooks-resource-list> \ No newline at end of file Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl (from rev 22992, branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl) =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.ftl 2010-06-25 11:57:27 UTC (rev 23034) @@ -0,0 +1,16 @@ +<?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.readers as reader><@writeBean bean=reader /></#list> +<#list bean.components as component><@writeBean bean=component /></#list> + +</smooks-resource-list> \ No newline at end of file Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml (from rev 22992, branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml) =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml 2010-06-25 11:57:27 UTC (rev 23034) @@ -0,0 +1,40 @@ +<?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"> + + <!-- + 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="readers" beanIdRef="readers" /> + <jb:wiring property="components" beanIdRef="components" /> + </jb:bean> + <jb:bean beanId="readers" class="java.util.ArrayList" createOnElement="#document"> + <jb:wiring beanType="org.jboss.tools.smooks.model.core.Reader" /> + </jb:bean> + <jb:bean beanId="components" class="java.util.ArrayList" createOnElement="#document"> + <jb:wiring beanType="org.jboss.tools.smooks.model.core.Component" /> + </jb:bean> + + <!-- params --> + <jb:bean beanId="globalParams" class="org.jboss.tools.smooks.model.core.GlobalParams" createOnElement="/smooks-resource-list/params"> + <jb:wiring property="params" beanIdRef="paramsList" /> + </jb:bean> + <jb:bean beanId="paramsList" class="java.util.ArrayList" 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.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-06-25 11:53:28 UTC (rev 23033) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-06-25 11:57:27 UTC (rev 23034) @@ -7,7 +7,7 @@ # 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.xml +smooks11.bindingConfigLocation=/org/jboss/tools/smooks/model/core/v1_1/v1.1.xml smooks11.order=0 # csv v1.2 @@ -54,3 +54,8 @@ 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 + + # freemarker v1.1 +ftl11.namespace=http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd +ftl11.schemaLocation=/META-INF/xsd/smooks/freemarker-1.1.xsd +ftl11.bindingConfigLocation=/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplate.java =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplate.java (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplate.java 2010-06-25 11:57:27 UTC (rev 23034) @@ -0,0 +1,70 @@ +/** + * 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.freemarker; + +import org.jboss.tools.smooks.model.core.Component; +import org.jboss.tools.smooks.model.core.Params; +import org.milyn.javabean.dynamic.serialize.DefaultNamespace; + +/** + * FreeMarker Template component model. + * + * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> + */ +@DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd", prefix = "ftl11") +public class FreeMarkerTemplate implements Component { + + private String template; + private String applyOnElement; + private String applyOnElementNS; + private Boolean applyBefore; + private Params params; + + public String getTemplate() { + return template; + } + public void setTemplate(String template) { + this.template = template; + } + public String getApplyOnElement() { + return applyOnElement; + } + public void setApplyOnElement(String applyOnElement) { + this.applyOnElement = applyOnElement; + } + public String getApplyOnElementNS() { + return applyOnElementNS; + } + public void setApplyOnElementNS(String applyOnElementNS) { + this.applyOnElementNS = applyOnElementNS; + } + public Boolean getApplyBefore() { + return applyBefore; + } + public void setApplyBefore(Boolean applyBefore) { + this.applyBefore = applyBefore; + } + public Params getParams() { + return params; + } + public void setParams(Params params) { + this.params = params; + } +} Property changes on: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.ftl =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.ftl (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.ftl 2010-06-25 11:57:27 UTC (rev 23034) @@ -0,0 +1,8 @@ +<${nsp}:freemarker <@writeAttribs attribs="applyOnElement,applyOnElementNS,applyBefore" />> + <${nsp}:template><![CDATA[${bean.template}]]></${nsp}:template> + <#if (bean.params.params?size > 0)> + <#list bean.params.params as param> + <param name="${param.name}">${param.value}</param> + </#list> + </#if> + </${nsp}:freemarker> \ No newline at end of file Added: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml =================================================================== --- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml (rev 0) +++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml 2010-06-25 11:57:27 UTC (rev 23034) @@ -0,0 +1,44 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:core="http://www.milyn.org/xsd/smooks/smooks-core-1.3.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"> + + <core:namespaces> + <!-- + Need to explicitly defin the smooks v1.1 namespace because we use it in the + in the "param" bean selectors. All the other configuration namespaces + will default to the binding namespace (in this case the freemarker-1.1 namespace). + The <param> element (targeted by the "param" bean config) is in the smooks-1.1 namespace + and so needs to be explicitly handled. + --> + <core:namespace prefix="smooks" uri="http://www.milyn.org/xsd/smooks-1.1.xsd" /> + </core:namespaces> + + <!-- Binding configs (unmarshal)... --> + + <jb:bean beanId="freemarkerTemplate" class="org.jboss.tools.smooks.model.freemarker.FreeMarkerTemplate" createOnElement="freemarker"> + <jb:value property="template" data="freemarker/template" /> + <jb:value property="applyOnElement" data="freemarker/@applyOnElement" /> + <jb:value property="applyOnElementNS" data="freemarker/@applyOnElementNS" /> + <jb:value property="applyBefore" data="freemarker/@applyBefore" /> + <jb:wiring property="params" beanIdRef="params" /> + </jb:bean> + <jb:bean beanId="params" class="org.jboss.tools.smooks.model.core.Params" createOnElement="freemarker"> + <jb:wiring property="params" beanIdRef="paramsList" /> + </jb:bean> + <jb:bean beanId="paramsList" class="java.util.ArrayList" createOnElement="freemarker"> + <jb:wiring beanIdRef="param" /> + </jb:bean> + <jb:bean beanId="param" class="org.jboss.tools.smooks.model.core.Param" createOnElement="freemarker/smooks:param"> + <jb:value property="name" data="freemarker/smooks:param/@name" /> + <jb:value property="value" data="freemarker/smooks:param" /> + </jb:bean> + + <!-- Writers (marshal)... --> + + <dmb:writer beanId="freemarkerTemplate" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter"> + <param name="template">/org/jboss/tools/smooks/model/freemarker/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.model/src/org/jboss/tools/smooks/model/freemarker/v1_1/v1.1.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-all-1.4-SNAPSHOT.jar =================================================================== (Binary files differ) 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-25 11:53:28 UTC (rev 23033) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-25 11:57:27 UTC (rev 23034) @@ -70,4 +70,8 @@ XMLUnit.setIgnoreWhitespace( true ); XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString())); } + + protected void reportTo(String reportPath) { + SmooksModelBuilder.modelBuilder.setReportPath(reportPath); + } } \ No newline at end of file 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-25 11:53:28 UTC (rev 23033) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-25 11:57:27 UTC (rev 23034) @@ -37,7 +37,7 @@ } public void test_manual() { - Params params = new Params(); + GlobalParams params = new GlobalParams(); assertEquals(null, params.getParam("a")); params.removeParam("a"); // make sure there's no exception params.setParam("a", "aVal"); @@ -53,7 +53,7 @@ public void test_config_v11_01() throws IOException, SAXException { Model<SmooksModel> model = test("v1_1/config-01.xml"); - Params params = model.getModelRoot().getParams(); + GlobalParams params = model.getModelRoot().getParams(); assertTrue(params.getFilterType() == StreamFilterType.SAX); @@ -64,7 +64,7 @@ public void test_config_v11_02() throws IOException, SAXException { Model<SmooksModel> model = test("v1_1/config-02.xml"); - Params params = model.getModelRoot().getParams(); + GlobalParams params = model.getModelRoot().getParams(); assertTrue(params.getFilterType() == StreamFilterType.DOM); Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplateTest.java =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplateTest.java (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplateTest.java 2010-06-25 11:57:27 UTC (rev 23034) @@ -0,0 +1,41 @@ +/** + * 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.freemarker; + +import java.io.IOException; + +import org.jboss.tools.smooks.model.SmooksModelTestCase; +import org.xml.sax.SAXException; + +/** + * + * + * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> + */ +public class FreeMarkerTemplateTest extends SmooksModelTestCase { + + public FreeMarkerTemplateTest() throws IOException, SAXException { + super(); + } + + public void test_01() throws IOException, SAXException { + test("config-01.xml"); + } +} Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/FreeMarkerTemplateTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/config-01.xml =================================================================== --- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/config-01.xml (rev 0) +++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/config-01.xml 2010-06-25 11:57:27 UTC (rev 23034) @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" + xmlns:ftl="http://www.milyn.org/xsd/smooks/freemarker-1.1.xsd"> + + <!-- comment --> + <params> + <param name="stream.filter.type">SAX</param> + </params> + + <ftl:freemarker applyOnElement="root/bla/blub"> + <ftl:template><![CDATA[${env.abc}]]></ftl:template> + </ftl:freemarker> + + <!-- comment --> + <ftl:freemarker applyOnElement="root/bla/blub"> + <ftl:template><![CDATA[${env.def}]]></ftl:template> + <param name="x">1</param> + <param name="y">2</param> + </ftl:freemarker> + + </smooks-resource-list> Property changes on: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/freemarker/config-01.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Id Revision Name: svn:eol-style + LF