[jbosstools-commits] JBoss Tools SVN: r22726 - in branches/smooks-dmb: plugins/org.jboss.tools.smooks.core and 59 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Jun 10 11:48:36 EDT 2010
Author: tfennelly
Date: 2010-06-10 11:48:17 -0400 (Thu, 10 Jun 2010)
New Revision: 22726
Added:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.classpath
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.settings/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.settings/org.eclipse.jdt.core.prefs
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/about.html
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/build.properties
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs/xstream-1.2.2.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.properties
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/pom.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/
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/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.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/core/Reader.java
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
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/Binding.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/ListBinding.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/MapBinding.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/SingleBinding.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml
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/javabean/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Binding.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/DecodeParam.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Expression.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Value.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Wiring.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/SmooksModelActivator.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/jaxen-1.1.1.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-SNAPSHOT.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/mvel2-2.0.17.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/xstream-1.2.2.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/TemplatingModelBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputSourceContainerEditPart.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/OutputContainerEditPart.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputSourceContainerModel.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/OutputTargetModel.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerBorder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerFigure.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/FillLayout.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/SourceContainerFigure.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/TargetContainerFigure.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.classpath
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.settings/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.settings/org.eclipse.jdt.core.prefs
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/build.properties
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/lib/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/lib/xmlunit-1.1.jar
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/plugin.properties
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/pom.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/resources/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/
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/
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/v1_1/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-02.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-03.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-02.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-03.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-05.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml
Removed:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.classpath
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.settings/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.settings/org.eclipse.jdt.core.prefs
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/about.html
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/build.properties
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs/xstream-1.2.2.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.properties
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/pom.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/
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/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.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/core/Reader.java
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
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/Binding.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/ListBinding.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/MapBinding.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/SingleBinding.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml
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/javabean/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Binding.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/DecodeParam.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Expression.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Value.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Wiring.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/
branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/SmooksModelActivator.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.2.1.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.2.1.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.2.1.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.2.1.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.2.1.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.2.1.jar
branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/ModelBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerBorder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerFigure.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/FillLayout.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/SourceContainerFigure.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/TargetContainerFigure.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.classpath
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.settings/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.settings/org.eclipse.jdt.core.prefs
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/build.properties
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/lib/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/lib/xmlunit-1.1.jar
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/plugin.properties
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/pom.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/resources/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/
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/
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/v1_1/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-02.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-03.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-02.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-03.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-05.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml
Modified:
branches/smooks-dmb/plugins/org.jboss.tools.smooks.core/plugin.xml
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties
branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/ModelNodeResolver.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/csv/CSVModelBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XMLSampleModelBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XSDModelBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/TemplateBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/xml/XMLFreeMarkerTemplateBuilder.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/RootModel.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/RootEditPart.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksEditFactory.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/autolayout/JavaMappingAutoLayout.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksRootEditPart.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerAttrModel.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerModelAnalyzer.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateModelLabelProvider.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateXMLModel.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java
branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java
Log:
merge changes from workspaces/smooks-dmb branch
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.core/plugin.xml
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.core/plugin.xml 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.core/plugin.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -4,18 +4,7 @@
<extension
point="org.eclipse.core.contenttype.contentTypes">
</extension>
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.milyn.org/xsd/smooks/groovy-1.1.xsd"
- class="org.jboss.tools.smooks.model.groovy.GroovyPackage"
- genModel="model/groovy-1.1.genmodel"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <parser
- type="groovy"
- class="org.jboss.tools.smooks.model.groovy.util.GroovyResourceFactoryImpl"/>
- </extension>
+
<extension point="org.eclipse.emf.ecore.generated_package">
@@ -57,32 +46,8 @@
class="org.jboss.tools.smooks.model.smooks.util.SmooksResourceFactoryImpl"/>
</extension>
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.milyn.org/xsd/smooks/xsl-1.1.xsd"
- class="org.jboss.tools.smooks.model.xsl.XslPackage"
- genModel="ecore.model/xsl-1.1.genmodel"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <parser
- type="xsl"
- class="org.jboss.tools.smooks.model.xsl.util.XslResourceFactoryImpl"/>
- </extension>
+
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.milyn.org/xsd/smooks/javabean-1.1.xsd"
- class="org.jboss.tools.smooks.model.javabean.JavabeanPackage"
- genModel="ecore.model/javabean-1.1.genmodel"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <parser
- type="javabean"
- class="org.jboss.tools.smooks.model.javabean.util.JavabeanResourceFactoryImpl"/>
- </extension>
-
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri="http://www.milyn.org/schema/edi-message-mapping-1.0.xsd"
@@ -96,97 +61,10 @@
class="org.jboss.tools.smooks.model.medi.util.MEdiResourceFactoryImpl"/>
</extension>
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.milyn.org/xsd/smooks/file-routing-1.1.xsd"
- class="org.jboss.tools.smooks.model.fileRouting.FileRoutingPackage"
- genModel="model/file-routing-1.1.genmodel"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <parser
- type="filerouting"
- class="org.jboss.tools.smooks.model.fileRouting.util.FileRoutingResourceFactoryImpl"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.milyn.org/xsd/smooks/csv-1.1.xsd"
- class="org.jboss.tools.smooks.model.csv.CsvPackage"
- genModel="model/csv-1.1.genmodel"/>
- </extension>
+
<extension
point="org.eclipse.emf.ecore.generated_package">
<package
- class="org.jboss.tools.smooks.model.iorouting.IoroutingPackage"
- genModel="model/io-routing-1.1.genmodel"
- uri="http://www.milyn.org/xsd/smooks/io-routing-1.1.xsd">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.jboss.tools.smooks.model.dbrouting.DbroutingPackage"
- genModel="model/db-routing-1.1.genmodel"
- uri="http://www.milyn.org/xsd/smooks/db-routing-1.1.xsd">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.jboss.tools.smooks.model.jmsrouting.JmsroutingPackage"
- genModel="model/jms-routing-1.1.genmodel"
- uri="http://www.milyn.org/xsd/smooks/jms-routing-1.1.xsd">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.jboss.tools.smooks.model.json.JsonPackage"
- genModel="model/json-1.1.genmodel"
- uri="http://www.milyn.org/xsd/smooks/json-1.1.xsd">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.jboss.tools.smooks.model.edi.EdiPackage"
- genModel="model/edi-1.1.genmodel"
- uri="http://www.milyn.org/xsd/smooks/edi-1.1.xsd">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.jboss.tools.smooks.model.datasource.DatasourcePackage"
- genModel="model/datasource-1.1.genmodel"
- uri="http://www.milyn.org/xsd/smooks/datasource-1.1.xsd">
- </package>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://www.milyn.org/xsd/smooks/calc-1.1.xsd"
- class="org.jboss.tools.smooks.model.calc.CalcPackage"
- genModel="model/calc-1.1.genmodel"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.extension_parser">
- <parser
- type="calc"
- class="org.jboss.tools.smooks.model.calc.util.CalcResourceFactoryImpl"/>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.jboss.tools.smooks.model.esbrouting.EsbroutingPackage"
- genModel="model/esbrouting-1.0.genmodel"
- uri="http://www.jboss.org/xsd/jbossesb/smooks/routing-1.0.xsd">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
class="org.jboss.tools.smooks.model.javabean12.Javabean12Package"
genModel="model/smooks-1.2-models/javabean12.genmodel"
uri="http://www.milyn.org/xsd/smooks/javabean-1.2.xsd">
@@ -216,39 +94,8 @@
uri="http://www.milyn.org/xsd/smooks/edi-1.2.xsd">
</package>
</extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.jboss.tools.smooks.model.jmsrouting12.Jmsrouting12Package"
- genModel="model/smooks-1.2-models/jmsrouting12.genmodel"
- uri="http://www.milyn.org/xsd/smooks/jms-routing-1.2.xsd">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.jboss.tools.smooks.model.persistence12.Persistence12Package"
- genModel="model/smooks-1.2-models/persistence12.genmodel"
- uri="http://www.milyn.org/xsd/smooks/persistence-1.2.xsd">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.jboss.tools.smooks.model.rules10.Rules10Package"
- genModel="model/smooks-1.2-models/rules10.genmodel"
- uri="http://www.milyn.org/xsd/smooks/rules-1.0.xsd">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.jboss.tools.smooks.model.validation10.Validation10Package"
- genModel="model/smooks-1.2-models/validation10.genmodel"
- uri="http://www.milyn.org/xsd/smooks/validation-1.0.xsd">
- </package>
- </extension>
+
</plugin>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.classpath
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/.classpath 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.classpath 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.classpath (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/.classpath)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.classpath (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.classpath 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/.project 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.smooks.model</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/.project)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.project 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.smooks.model</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.settings (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/.settings)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/.settings/org.eclipse.jdt.core.prefs 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.settings/org.eclipse.jdt.core.prefs 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,8 +0,0 @@
-#Fri Dec 11 09:51:41 MST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.settings/org.eclipse.jdt.core.prefs (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/.settings/org.eclipse.jdt.core.prefs 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,8 @@
+#Fri Dec 11 09:51:41 MST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/META-INF)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.jboss.tools.smooks.model;singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.core.runtime,
- org.jboss.tools.smooks.runtime
-Bundle-Activator: org.jboss.tools.smooks.model.plugin.SmooksModelActivator
-Export-Package: org.jboss.tools.smooks.model,
- org.jboss.tools.smooks.model.core,
- org.jboss.tools.smooks.model.csv,
- org.jboss.tools.smooks.model.javabean,
- org.jboss.tools.smooks.model.plugin
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.jboss.tools.smooks.model;singleton:=true
+Bundle-Version: 1.1.0.qualifier
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.core.runtime,
+ org.jboss.tools.smooks.runtime
+Bundle-Activator: org.jboss.tools.smooks.model.plugin.SmooksModelActivator
+Export-Package: org.jboss.tools.smooks.model,
+ org.jboss.tools.smooks.model.core,
+ org.jboss.tools.smooks.model.csv,
+ org.jboss.tools.smooks.model.javabean,
+ org.jboss.tools.smooks.model.plugin
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/about.html
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/about.html 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/about.html 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Smooks Tools - Templating</title>
-<style type="text/css" media="screen">
-<!--
- body {
- font-family: Sans-serif, Arial, Helvetica;
- }
-
--->
-</style>
-</head>
-<body>
-<h1>Smooks Tools - Templating</h1>
-
-<p>
-This plugin is part of the JBoss Tools developed by the <a href="http://www.jboss.com">JBoss Inc.</a>
-</p>
-
-<p>Information about this plugin is available at <a href="http://www.jboss.org/tools">JBoss Tools project page</a></p>
-
-<p>
-This software is distributed under the terms of the Eclipse Public License - v 1.0
-(see <a href="www.eclipse.org/legal/epl-v10.html">Eclipse Public License - Version 1.0</a>).
-</p>
-</body>
-</html>
\ No newline at end of file
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/about.html (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/about.html)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/about.html (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/about.html 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Smooks Tools - Templating</title>
+<style type="text/css" media="screen">
+<!--
+ body {
+ font-family: Sans-serif, Arial, Helvetica;
+ }
+
+-->
+</style>
+</head>
+<body>
+<h1>Smooks Tools - Templating</h1>
+
+<p>
+This plugin is part of the JBoss Tools developed by the <a href="http://www.jboss.com">JBoss Inc.</a>
+</p>
+
+<p>Information about this plugin is available at <a href="http://www.jboss.org/tools">JBoss Tools project page</a></p>
+
+<p>
+This software is distributed under the terms of the Eclipse Public License - v 1.0
+(see <a href="www.eclipse.org/legal/epl-v10.html">Eclipse Public License - Version 1.0</a>).
+</p>
+</body>
+</html>
\ No newline at end of file
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/build.properties
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/build.properties 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/build.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,8 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.properties
-jars.compile.order = .
-source.. = src/
-source.. = src/
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/build.properties (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/build.properties)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/build.properties (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/build.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,8 @@
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ about.html,\
+ plugin.properties
+jars.compile.order = .
+source.. = src/
+source.. = src/
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/libs)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs/xstream-1.2.2.jar
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/libs/xstream-1.2.2.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/libs/xstream-1.2.2.jar)
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.properties
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/plugin.properties 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,8 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-providerName = JBoss by Red Hat
-pluginName = Smooks Model Plug-in
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.properties (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/plugin.properties)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.properties (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,8 @@
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+providerName = JBoss by Red Hat
+pluginName = Smooks Model Plug-in
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/plugin.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-</plugin>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.xml (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/plugin.xml)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/plugin.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+</plugin>
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/pom.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/pom.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/pom.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,14 +0,0 @@
-<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.model</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/pom.xml (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/pom.xml)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/pom.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/pom.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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.model</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,69 +0,0 @@
-/**
- * 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.Component;
-import org.jboss.tools.smooks.model.core.Params;
-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;
-
-/**
- * Smooks Model Root.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
- at 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 Params params;
- private List<Reader> readers = new ArrayList<Reader>();
- private List<Component> components = new ArrayList<Component>();
-
- public Params getParams() {
- return params;
- }
-
- public void setParams(Params params) {
- this.params = params;
- }
-
- public List<Reader> getReaders() {
- return readers;
- }
-
- public void setReaders(List<Reader> readers) {
- this.readers = readers;
- }
-
- public List<Component> getComponents() {
- return components;
- }
-
- public void setComponents(List<Component> components) {
- this.components = components;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java (from rev 22724, workspace/smooks-dmb/smooks/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 (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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 org.jboss.tools.smooks.model.core.Component;
+import org.jboss.tools.smooks.model.core.Params;
+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;
+
+/**
+ * Smooks Model Root.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+ at 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 Params params;
+ private List<Reader> readers = new ArrayList<Reader>();
+ private List<Component> components = new ArrayList<Component>();
+
+ public Params getParams() {
+ return params;
+ }
+
+ public void setParams(Params params) {
+ this.params = params;
+ }
+
+ public List<Reader> getReaders() {
+ return readers;
+ }
+
+ public void setReaders(List<Reader> readers) {
+ this.readers = readers;
+ }
+
+ public List<Component> getComponents() {
+ return components;
+ }
+
+ public void setComponents(List<Component> components) {
+ this.components = components;
+ }
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,56 +0,0 @@
-/**
- * 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.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 at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class SmooksModelBuilder {
-
- private ModelBuilder modelBuilder;
-
- public SmooksModelBuilder() throws SAXException, IOException {
- modelBuilder = new ModelBuilder(SmooksModel.MODEL_DESCRIPTOR, false);
- }
-
- public ModelBuilder getModelBuilder() {
- return modelBuilder;
- }
-
- public Model<SmooksModel> readModel(InputStream configStream) throws SAXException, IOException {
- return modelBuilder.readModel(configStream, SmooksModel.class);
- }
-
- public Model<SmooksModel> readModel(Reader configStream) throws SAXException, IOException {
- return modelBuilder.readModel(configStream, SmooksModel.class);
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java (from rev 22724, workspace/smooks-dmb/smooks/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 (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModelBuilder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,56 @@
+/**
+ * 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.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 at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class SmooksModelBuilder {
+
+ private ModelBuilder modelBuilder;
+
+ public SmooksModelBuilder() throws SAXException, IOException {
+ modelBuilder = new ModelBuilder(SmooksModel.MODEL_DESCRIPTOR, false);
+ }
+
+ public ModelBuilder getModelBuilder() {
+ return modelBuilder;
+ }
+
+ public Model<SmooksModel> readModel(InputStream configStream) throws SAXException, IOException {
+ return modelBuilder.readModel(configStream, SmooksModel.class);
+ }
+
+ public Model<SmooksModel> readModel(Reader configStream) throws SAXException, IOException {
+ return modelBuilder.readModel(configStream, SmooksModel.class);
+ }
+}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,30 +0,0 @@
-/**
- * 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.javabean.Bean;
-
-/**
- * Marker interface for Smooks non-reader components, such as {@link Bean Beans} etc.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public interface Component {
-}
\ No newline at end of file
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Component.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,30 @@
+/**
+ * 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.javabean.Bean;
+
+/**
+ * Marker interface for Smooks non-reader components, such as {@link Bean Beans} etc.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public interface Component {
+}
\ No newline at end of file
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,49 +0,0 @@
-/**
- * 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;
-
-/**
- * Param.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class Param {
-
- private String name;
- private String value;
-
- public String getName() {
- return name;
- }
-
- public Param setName(String name) {
- this.name = name;
- return this;
- }
-
- public String getValue() {
- return value;
- }
-
- public Param setValue(String value) {
- this.value = value;
- return this;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Param.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,49 @@
+/**
+ * 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;
+
+/**
+ * Param.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class Param {
+
+ private String name;
+ private String value;
+
+ public String getName() {
+ return name;
+ }
+
+ public Param setName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public Param setValue(String value) {
+ this.value = value;
+ return this;
+ }
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,107 +0,0 @@
-/**
- * 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 java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.milyn.StreamFilterType;
-import org.milyn.delivery.Filter;
-
-/**
- * Params.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class Params {
-
- private List<Param> params;
-
- public List<Param> getParams() {
- return params;
- }
-
- public void setParams(List<Param> params) {
- this.params = params;
- }
-
- public String getParam(String name) {
- if(params == null) {
- return null;
- }
-
- for(Param param : params) {
- String paramName = param.getName();
- if(paramName != null && paramName.equals(name)) {
- return param.getValue();
- }
- }
-
- return null;
- }
-
- public Params setParam(String name, String value) {
- if(params == null) {
- params = new ArrayList<Param>();
- }
-
- removeParam(name);
- params.add(new Param().setName(name).setValue(value));
- return this;
- }
-
- public Params removeParam(String name) {
- if(params == null) {
- return this;
- }
-
- Iterator<Param> paramsIterator = params.iterator();
-
- while(paramsIterator.hasNext()) {
- String paramName = paramsIterator.next().getName();
- if(paramName != null && paramName.equals(name)) {
- paramsIterator.remove();
- return this;
- }
- }
-
- 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;
- }
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java (from rev 22724, workspace/smooks-dmb/smooks/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 (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Params.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,107 @@
+/**
+ * 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 java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.milyn.StreamFilterType;
+import org.milyn.delivery.Filter;
+
+/**
+ * Params.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class Params {
+
+ private List<Param> params;
+
+ public List<Param> getParams() {
+ return params;
+ }
+
+ public void setParams(List<Param> params) {
+ this.params = params;
+ }
+
+ public String getParam(String name) {
+ if(params == null) {
+ return null;
+ }
+
+ for(Param param : params) {
+ String paramName = param.getName();
+ if(paramName != null && paramName.equals(name)) {
+ return param.getValue();
+ }
+ }
+
+ return null;
+ }
+
+ public Params setParam(String name, String value) {
+ if(params == null) {
+ params = new ArrayList<Param>();
+ }
+
+ removeParam(name);
+ params.add(new Param().setName(name).setValue(value));
+ return this;
+ }
+
+ public Params removeParam(String name) {
+ if(params == null) {
+ return this;
+ }
+
+ Iterator<Param> paramsIterator = params.iterator();
+
+ while(paramsIterator.hasNext()) {
+ String paramName = paramsIterator.next().getName();
+ if(paramName != null && paramName.equals(name)) {
+ paramsIterator.remove();
+ return this;
+ }
+ }
+
+ 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/Reader.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Reader.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Reader.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,28 +0,0 @@
-/**
- * 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;
-
-/**
- * Marker interface for Smooks reader components.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public interface Reader {
-}
\ No newline at end of file
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Reader.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Reader.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Reader.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/Reader.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,28 @@
+/**
+ * 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;
+
+/**
+ * Marker interface for Smooks reader components.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public interface Reader {
+}
\ 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.ftl
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl (from rev 22724, workspace/smooks-dmb/smooks/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 (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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.xml (from rev 22724, workspace/smooks-dmb/smooks/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 (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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="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/csv (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/Binding.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/Binding.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/Binding.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,47 +0,0 @@
-/**
- * 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.csv;
-
-/**
- * CSV Reader inline binding configuration.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public abstract class Binding {
-
- private String beanId;
- private String beanClass;
-
- public String getBeanId() {
- return beanId;
- }
-
- public void setBeanId(String beanId) {
- this.beanId = beanId;
- }
-
- public String getBeanClass() {
- return beanClass;
- }
-
- public void setBeanClass(String beanClass) {
- this.beanClass = beanClass;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/Binding.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/Binding.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/Binding.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/Binding.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,47 @@
+/**
+ * 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.csv;
+
+/**
+ * CSV Reader inline binding configuration.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public abstract class Binding {
+
+ private String beanId;
+ private String beanClass;
+
+ public String getBeanId() {
+ return beanId;
+ }
+
+ public void setBeanId(String beanId) {
+ this.beanId = beanId;
+ }
+
+ public String getBeanClass() {
+ return beanClass;
+ }
+
+ public void setBeanClass(String beanClass) {
+ this.beanClass = beanClass;
+ }
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,143 +0,0 @@
-/**
- * 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.csv;
-
-import org.jboss.tools.smooks.model.core.Reader;
-import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
-
-/**
- * CSV Reader component.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
- at DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks/csv-1.3.xsd", prefix = "csv13")
-public class CSVReader implements Reader {
-
- private String fields;
- private Character separator;
- private Character quote;
- private Integer skipLines;
- private String rootElementName;
- private String recordElementName;
- private Boolean indent;
- private Boolean strict;
- private Boolean validateHeader;
-
- // Only one of the following binding configs will be wired into this bean...
- private SingleBinding singleBinding;
- private ListBinding listBinding;
- private MapBinding mapBinding;
-
- public String getFields() {
- return fields;
- }
-
- public void setFields(String fields) {
- this.fields = fields;
- }
-
- public Character getSeparator() {
- return separator;
- }
-
- public void setSeparator(Character separator) {
- this.separator = separator;
- }
-
- public Character getQuote() {
- return quote;
- }
-
- public void setQuote(Character quote) {
- this.quote = quote;
- }
-
- public Integer getSkipLines() {
- return skipLines;
- }
-
- public void setSkipLines(Integer skipLines) {
- this.skipLines = skipLines;
- }
-
- public String getRootElementName() {
- return rootElementName;
- }
-
- public void setRootElementName(String rootElementName) {
- this.rootElementName = rootElementName;
- }
-
- public String getRecordElementName() {
- return recordElementName;
- }
-
- public void setRecordElementName(String recordElementName) {
- this.recordElementName = recordElementName;
- }
-
- public Boolean isIndent() {
- return indent;
- }
-
- public void setIndent(Boolean indent) {
- this.indent = indent;
- }
-
- public Boolean isStrict() {
- return strict;
- }
-
- public void setStrict(Boolean strict) {
- this.strict = strict;
- }
-
- public Boolean isValidateHeader() {
- return validateHeader;
- }
-
- public void setValidateHeader(Boolean validateHeader) {
- this.validateHeader = validateHeader;
- }
-
- public SingleBinding getSingleBinding() {
- return singleBinding;
- }
-
- public void setSingleBinding(SingleBinding singleBinding) {
- this.singleBinding = singleBinding;
- }
-
- public ListBinding getListBinding() {
- return listBinding;
- }
-
- public void setListBinding(ListBinding listBinding) {
- this.listBinding = listBinding;
- }
-
- public MapBinding getMapBinding() {
- return mapBinding;
- }
-
- public void setMapBinding(MapBinding mapBinding) {
- this.mapBinding = mapBinding;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/CSVReader.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,143 @@
+/**
+ * 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.csv;
+
+import org.jboss.tools.smooks.model.core.Reader;
+import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
+
+/**
+ * CSV Reader component.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+ at DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks/csv-1.3.xsd", prefix = "csv13")
+public class CSVReader implements Reader {
+
+ private String fields;
+ private Character separator;
+ private Character quote;
+ private Integer skipLines;
+ private String rootElementName;
+ private String recordElementName;
+ private Boolean indent;
+ private Boolean strict;
+ private Boolean validateHeader;
+
+ // Only one of the following binding configs will be wired into this bean...
+ private SingleBinding singleBinding;
+ private ListBinding listBinding;
+ private MapBinding mapBinding;
+
+ public String getFields() {
+ return fields;
+ }
+
+ public void setFields(String fields) {
+ this.fields = fields;
+ }
+
+ public Character getSeparator() {
+ return separator;
+ }
+
+ public void setSeparator(Character separator) {
+ this.separator = separator;
+ }
+
+ public Character getQuote() {
+ return quote;
+ }
+
+ public void setQuote(Character quote) {
+ this.quote = quote;
+ }
+
+ public Integer getSkipLines() {
+ return skipLines;
+ }
+
+ public void setSkipLines(Integer skipLines) {
+ this.skipLines = skipLines;
+ }
+
+ public String getRootElementName() {
+ return rootElementName;
+ }
+
+ public void setRootElementName(String rootElementName) {
+ this.rootElementName = rootElementName;
+ }
+
+ public String getRecordElementName() {
+ return recordElementName;
+ }
+
+ public void setRecordElementName(String recordElementName) {
+ this.recordElementName = recordElementName;
+ }
+
+ public Boolean isIndent() {
+ return indent;
+ }
+
+ public void setIndent(Boolean indent) {
+ this.indent = indent;
+ }
+
+ public Boolean isStrict() {
+ return strict;
+ }
+
+ public void setStrict(Boolean strict) {
+ this.strict = strict;
+ }
+
+ public Boolean isValidateHeader() {
+ return validateHeader;
+ }
+
+ public void setValidateHeader(Boolean validateHeader) {
+ this.validateHeader = validateHeader;
+ }
+
+ public SingleBinding getSingleBinding() {
+ return singleBinding;
+ }
+
+ public void setSingleBinding(SingleBinding singleBinding) {
+ this.singleBinding = singleBinding;
+ }
+
+ public ListBinding getListBinding() {
+ return listBinding;
+ }
+
+ public void setListBinding(ListBinding listBinding) {
+ this.listBinding = listBinding;
+ }
+
+ public MapBinding getMapBinding() {
+ return mapBinding;
+ }
+
+ public void setMapBinding(MapBinding mapBinding) {
+ this.mapBinding = mapBinding;
+ }
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/ListBinding.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/ListBinding.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/ListBinding.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,27 +0,0 @@
-/**
- * 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.csv;
-
-/**
- * Object List CSV binding.
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class ListBinding extends Binding {
-}
\ No newline at end of file
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/ListBinding.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/ListBinding.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/ListBinding.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/ListBinding.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,27 @@
+/**
+ * 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.csv;
+
+/**
+ * Object List CSV binding.
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class ListBinding extends Binding {
+}
\ No newline at end of file
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/MapBinding.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/MapBinding.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/MapBinding.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,37 +0,0 @@
-/**
- * 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.csv;
-
-/**
- * {@link java.util.Map} binding.
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class MapBinding extends Binding {
-
- private String keyField;
-
- public String getKeyField() {
- return keyField;
- }
-
- public void setKeyField(String keyField) {
- this.keyField = keyField;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/MapBinding.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/MapBinding.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/MapBinding.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/MapBinding.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,37 @@
+/**
+ * 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.csv;
+
+/**
+ * {@link java.util.Map} binding.
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class MapBinding extends Binding {
+
+ private String keyField;
+
+ public String getKeyField() {
+ return keyField;
+ }
+
+ public void setKeyField(String keyField) {
+ this.keyField = keyField;
+ }
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/SingleBinding.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/SingleBinding.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/SingleBinding.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,27 +0,0 @@
-/**
- * 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.csv;
-
-/**
- * Single object CSV binding.
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class SingleBinding extends Binding {
-}
\ No newline at end of file
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/SingleBinding.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/SingleBinding.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/SingleBinding.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/SingleBinding.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,27 @@
+/**
+ * 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.csv;
+
+/**
+ * Single object CSV binding.
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class SingleBinding extends Binding {
+}
\ No newline at end of file
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2 (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,15 +0,0 @@
-<#if bean.singleBinding??>
- <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> >
- <${nsp}:singleBinding <@writeAttribs attribs="beanId,beanClass at class" bean=bean.singleBinding /> />
- </${nsp}:reader>
-<#elseif bean.listBinding??>
- <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> >
- <${nsp}:listBinding <@writeAttribs attribs="beanId,beanClass at class" bean=bean.listBinding /> />
- </${nsp}:reader>
-<#elseif bean.mapBinding??>
- <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> >
- <${nsp}:mapBinding <@writeAttribs attribs="beanId,beanClass at class,keyField" bean=bean.mapBinding /> />
- </${nsp}:reader>
-<#else>
- <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> />
-</#if>
\ No newline at end of file
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,15 @@
+<#if bean.singleBinding??>
+ <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> >
+ <${nsp}:singleBinding <@writeAttribs attribs="beanId,beanClass at class" bean=bean.singleBinding /> />
+ </${nsp}:reader>
+<#elseif bean.listBinding??>
+ <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> >
+ <${nsp}:listBinding <@writeAttribs attribs="beanId,beanClass at class" bean=bean.listBinding /> />
+ </${nsp}:reader>
+<#elseif bean.mapBinding??>
+ <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> >
+ <${nsp}:mapBinding <@writeAttribs attribs="beanId,beanClass at class,keyField" bean=bean.mapBinding /> />
+ </${nsp}:reader>
+<#else>
+ <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent" /> />
+</#if>
\ No newline at end of file
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,42 +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">
-
- <!-- Binding configs (unmarshal)... -->
-
- <jb:bean beanId="csvReader" class="org.jboss.tools.smooks.model.csv.CSVReader" createOnElement="reader">
- <jb:value property="fields" data="reader/@fields" />
- <jb:value property="separator" data="reader/@separator" />
- <jb:value property="quote" data="reader/@quote" />
- <jb:value property="skipLines" data="reader/@skipLines" />
- <jb:value property="rootElementName" data="reader/@rootElementName" />
- <jb:value property="recordElementName" data="reader/@recordElementName" />
- <jb:value property="indent" data="reader/@indent" />
-
- <!-- only one of the following will be wired in... -->
- <jb:wiring property="singleBinding" beanIdRef="singleBinding" />
- <jb:wiring property="listBinding" beanIdRef="listBinding" />
- <jb:wiring property="mapBinding" beanIdRef="mapBinding" />
- </jb:bean>
- <jb:bean beanId="singleBinding" class="org.jboss.tools.smooks.model.csv.SingleBinding" createOnElement="reader/singleBinding">
- <jb:value property="beanId" data="reader/singleBinding/@beanId" />
- <jb:value property="beanClass" data="reader/singleBinding/@class" />
- </jb:bean>
- <jb:bean beanId="listBinding" class="org.jboss.tools.smooks.model.csv.ListBinding" createOnElement="reader/listBinding">
- <jb:value property="beanId" data="reader/listBinding/@beanId" />
- <jb:value property="beanClass" data="reader/listBinding/@class" />
- </jb:bean>
- <jb:bean beanId="mapBinding" class="org.jboss.tools.smooks.model.csv.MapBinding" createOnElement="reader/mapBinding">
- <jb:value property="beanId" data="reader/mapBinding/@beanId" />
- <jb:value property="beanClass" data="reader/mapBinding/@class" />
- <jb:value property="keyField" data="reader/mapBinding/@keyField" />
- </jb:bean>
-
- <!-- Writers (marshal)... -->
-
- <dmb:writer beanId="csvReader" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter">
- <param name="template">/org/jboss/tools/smooks/model/csv/v1_2/v1.2.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/csv/v1_2/v1.2.xml (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,42 @@
+<?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="csvReader" class="org.jboss.tools.smooks.model.csv.CSVReader" createOnElement="reader">
+ <jb:value property="fields" data="reader/@fields" />
+ <jb:value property="separator" data="reader/@separator" />
+ <jb:value property="quote" data="reader/@quote" />
+ <jb:value property="skipLines" data="reader/@skipLines" />
+ <jb:value property="rootElementName" data="reader/@rootElementName" />
+ <jb:value property="recordElementName" data="reader/@recordElementName" />
+ <jb:value property="indent" data="reader/@indent" />
+
+ <!-- only one of the following will be wired in... -->
+ <jb:wiring property="singleBinding" beanIdRef="singleBinding" />
+ <jb:wiring property="listBinding" beanIdRef="listBinding" />
+ <jb:wiring property="mapBinding" beanIdRef="mapBinding" />
+ </jb:bean>
+ <jb:bean beanId="singleBinding" class="org.jboss.tools.smooks.model.csv.SingleBinding" createOnElement="reader/singleBinding">
+ <jb:value property="beanId" data="reader/singleBinding/@beanId" />
+ <jb:value property="beanClass" data="reader/singleBinding/@class" />
+ </jb:bean>
+ <jb:bean beanId="listBinding" class="org.jboss.tools.smooks.model.csv.ListBinding" createOnElement="reader/listBinding">
+ <jb:value property="beanId" data="reader/listBinding/@beanId" />
+ <jb:value property="beanClass" data="reader/listBinding/@class" />
+ </jb:bean>
+ <jb:bean beanId="mapBinding" class="org.jboss.tools.smooks.model.csv.MapBinding" createOnElement="reader/mapBinding">
+ <jb:value property="beanId" data="reader/mapBinding/@beanId" />
+ <jb:value property="beanClass" data="reader/mapBinding/@class" />
+ <jb:value property="keyField" data="reader/mapBinding/@keyField" />
+ </jb:bean>
+
+ <!-- Writers (marshal)... -->
+
+ <dmb:writer beanId="csvReader" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter">
+ <param name="template">/org/jboss/tools/smooks/model/csv/v1_2/v1.2.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/csv/v1_3 (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,15 +0,0 @@
-<#if bean.singleBinding??>
- <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> >
- <${nsp}:singleBinding <@writeAttribs attribs="beanId,beanClass at class" bean=bean.singleBinding /> />
- </${nsp}:reader>
-<#elseif bean.listBinding??>
- <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> >
- <${nsp}:listBinding <@writeAttribs attribs="beanId,beanClass at class" bean=bean.listBinding /> />
- </${nsp}:reader>
-<#elseif bean.mapBinding??>
- <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> >
- <${nsp}:mapBinding <@writeAttribs attribs="beanId,beanClass at class,keyField" bean=bean.mapBinding /> />
- </${nsp}:reader>
-<#else>
- <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> />
-</#if>
\ No newline at end of file
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,15 @@
+<#if bean.singleBinding??>
+ <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> >
+ <${nsp}:singleBinding <@writeAttribs attribs="beanId,beanClass at class" bean=bean.singleBinding /> />
+ </${nsp}:reader>
+<#elseif bean.listBinding??>
+ <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> >
+ <${nsp}:listBinding <@writeAttribs attribs="beanId,beanClass at class" bean=bean.listBinding /> />
+ </${nsp}:reader>
+<#elseif bean.mapBinding??>
+ <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> >
+ <${nsp}:mapBinding <@writeAttribs attribs="beanId,beanClass at class,keyField" bean=bean.mapBinding /> />
+ </${nsp}:reader>
+<#else>
+ <${nsp}:reader <@writeAttribs attribs="fields,separator,quote,skipLines,rootElementName,recordElementName,indent,strict,validateHeader" /> />
+</#if>
\ No newline at end of file
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,44 +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">
-
- <!-- Binding configs (unmarshal)... -->
-
- <jb:bean beanId="csvReader" class="org.jboss.tools.smooks.model.csv.CSVReader" createOnElement="reader">
- <jb:value property="fields" data="reader/@fields" />
- <jb:value property="separator" data="reader/@separator" />
- <jb:value property="quote" data="reader/@quote" />
- <jb:value property="skipLines" data="reader/@skipLines" />
- <jb:value property="rootElementName" data="reader/@rootElementName" />
- <jb:value property="recordElementName" data="reader/@recordElementName" />
- <jb:value property="indent" data="reader/@indent" />
- <jb:value property="strict" data="reader/@strict" />
- <jb:value property="validateHeader" data="reader/@validateHeader" />
-
- <!-- only one of the following will be wired in... -->
- <jb:wiring property="singleBinding" beanIdRef="singleBinding" />
- <jb:wiring property="listBinding" beanIdRef="listBinding" />
- <jb:wiring property="mapBinding" beanIdRef="mapBinding" />
- </jb:bean>
- <jb:bean beanId="singleBinding" class="org.jboss.tools.smooks.model.csv.SingleBinding" createOnElement="reader/singleBinding">
- <jb:value property="beanId" data="reader/singleBinding/@beanId" />
- <jb:value property="beanClass" data="reader/singleBinding/@class" />
- </jb:bean>
- <jb:bean beanId="listBinding" class="org.jboss.tools.smooks.model.csv.ListBinding" createOnElement="reader/listBinding">
- <jb:value property="beanId" data="reader/listBinding/@beanId" />
- <jb:value property="beanClass" data="reader/listBinding/@class" />
- </jb:bean>
- <jb:bean beanId="mapBinding" class="org.jboss.tools.smooks.model.csv.MapBinding" createOnElement="reader/mapBinding">
- <jb:value property="beanId" data="reader/mapBinding/@beanId" />
- <jb:value property="beanClass" data="reader/mapBinding/@class" />
- <jb:value property="keyField" data="reader/mapBinding/@keyField" />
- </jb:bean>
-
- <!-- Writers (marshal)... -->
-
- <dmb:writer beanId="csvReader" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter">
- <param name="template">/org/jboss/tools/smooks/model/csv/v1_3/v1.3.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/csv/v1_3/v1.3.xml (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,44 @@
+<?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="csvReader" class="org.jboss.tools.smooks.model.csv.CSVReader" createOnElement="reader">
+ <jb:value property="fields" data="reader/@fields" />
+ <jb:value property="separator" data="reader/@separator" />
+ <jb:value property="quote" data="reader/@quote" />
+ <jb:value property="skipLines" data="reader/@skipLines" />
+ <jb:value property="rootElementName" data="reader/@rootElementName" />
+ <jb:value property="recordElementName" data="reader/@recordElementName" />
+ <jb:value property="indent" data="reader/@indent" />
+ <jb:value property="strict" data="reader/@strict" />
+ <jb:value property="validateHeader" data="reader/@validateHeader" />
+
+ <!-- only one of the following will be wired in... -->
+ <jb:wiring property="singleBinding" beanIdRef="singleBinding" />
+ <jb:wiring property="listBinding" beanIdRef="listBinding" />
+ <jb:wiring property="mapBinding" beanIdRef="mapBinding" />
+ </jb:bean>
+ <jb:bean beanId="singleBinding" class="org.jboss.tools.smooks.model.csv.SingleBinding" createOnElement="reader/singleBinding">
+ <jb:value property="beanId" data="reader/singleBinding/@beanId" />
+ <jb:value property="beanClass" data="reader/singleBinding/@class" />
+ </jb:bean>
+ <jb:bean beanId="listBinding" class="org.jboss.tools.smooks.model.csv.ListBinding" createOnElement="reader/listBinding">
+ <jb:value property="beanId" data="reader/listBinding/@beanId" />
+ <jb:value property="beanClass" data="reader/listBinding/@class" />
+ </jb:bean>
+ <jb:bean beanId="mapBinding" class="org.jboss.tools.smooks.model.csv.MapBinding" createOnElement="reader/mapBinding">
+ <jb:value property="beanId" data="reader/mapBinding/@beanId" />
+ <jb:value property="beanClass" data="reader/mapBinding/@class" />
+ <jb:value property="keyField" data="reader/mapBinding/@keyField" />
+ </jb:bean>
+
+ <!-- Writers (marshal)... -->
+
+ <dmb:writer beanId="csvReader" class="org.milyn.javabean.dynamic.serialize.freemarker.FreeMarkerBeanWriter">
+ <param name="template">/org/jboss/tools/smooks/model/csv/v1_3/v1.3.ftl</param>
+ </dmb:writer>
+
+</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/descriptor.properties
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,36 +0,0 @@
-############################################################################################
-#
-# 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.xml
-smooks11.order=0
-
- # csv v1.2
-csv12.namespace=http://www.milyn.org/xsd/smooks/csv-1.2.xsd
-csv12.schemaLocation=/META-INF/xsd/smooks/csv-1.2.xsd
-csv12.bindingConfigLocation=/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml
-
- # csv v1.3
-csv13.namespace=http://www.milyn.org/xsd/smooks/csv-1.3.xsd
-csv13.schemaLocation=/META-INF/xsd/smooks/csv-1.3.xsd
-csv13.bindingConfigLocation=/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml
-
- # 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
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties (from rev 22724, workspace/smooks-dmb/smooks/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 (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,36 @@
+############################################################################################
+#
+# 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.xml
+smooks11.order=0
+
+ # csv v1.2
+csv12.namespace=http://www.milyn.org/xsd/smooks/csv-1.2.xsd
+csv12.schemaLocation=/META-INF/xsd/smooks/csv-1.2.xsd
+csv12.bindingConfigLocation=/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml
+
+ # csv v1.3
+csv13.namespace=http://www.milyn.org/xsd/smooks/csv-1.3.xsd
+csv13.schemaLocation=/META-INF/xsd/smooks/csv-1.3.xsd
+csv13.bindingConfigLocation=/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml
+
+ # 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
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,100 +0,0 @@
-/**
- * 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.core.Component;
-import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
-
-import java.util.List;
-
-/**
- * Bean configuration.
- * <p/>
- * Corresponds to the top level <jb:bean> element.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
- at DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks/javabean-1.3.xsd", prefix = "jb13")
-public class Bean implements Component {
-
- private String beanId;
- private String beanClass;
- private String createOnElement;
- private String createOnElementNS;
- private List<Value> valueBindings;
- private List<Wiring> wireBindings;
- private List<Expression> expressionBindings;
-
- public String getBeanId() {
- return beanId;
- }
-
- public void setBeanId(String beanId) {
- this.beanId = beanId;
- }
-
- public String getBeanClass() {
- return beanClass;
- }
-
- public void setBeanClass(String beanClass) {
- this.beanClass = beanClass;
- }
-
- public String getCreateOnElement() {
- return createOnElement;
- }
-
- public void setCreateOnElement(String createOnElement) {
- this.createOnElement = createOnElement;
- }
-
- public String getCreateOnElementNS() {
- return createOnElementNS;
- }
-
- public void setCreateOnElementNS(String createOnElementNS) {
- this.createOnElementNS = createOnElementNS;
- }
-
- public List<Value> getValueBindings() {
- return valueBindings;
- }
-
- public void setValueBindings(List<Value> valueBindings) {
- this.valueBindings = valueBindings;
- }
-
- public List<Wiring> getWireBindings() {
- return wireBindings;
- }
-
- public void setWireBindings(List<Wiring> wireBindings) {
- this.wireBindings = wireBindings;
- }
-
- public List<Expression> getExpressionBindings() {
- return expressionBindings;
- }
-
- public void setExpressionBindings(List<Expression> expressionBindings) {
- this.expressionBindings = expressionBindings;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Bean.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,100 @@
+/**
+ * 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.core.Component;
+import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
+
+import java.util.List;
+
+/**
+ * Bean configuration.
+ * <p/>
+ * Corresponds to the top level <jb:bean> element.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+ at DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks/javabean-1.3.xsd", prefix = "jb13")
+public class Bean implements Component {
+
+ private String beanId;
+ private String beanClass;
+ private String createOnElement;
+ private String createOnElementNS;
+ private List<Value> valueBindings;
+ private List<Wiring> wireBindings;
+ private List<Expression> expressionBindings;
+
+ public String getBeanId() {
+ return beanId;
+ }
+
+ public void setBeanId(String beanId) {
+ this.beanId = beanId;
+ }
+
+ public String getBeanClass() {
+ return beanClass;
+ }
+
+ public void setBeanClass(String beanClass) {
+ this.beanClass = beanClass;
+ }
+
+ public String getCreateOnElement() {
+ return createOnElement;
+ }
+
+ public void setCreateOnElement(String createOnElement) {
+ this.createOnElement = createOnElement;
+ }
+
+ public String getCreateOnElementNS() {
+ return createOnElementNS;
+ }
+
+ public void setCreateOnElementNS(String createOnElementNS) {
+ this.createOnElementNS = createOnElementNS;
+ }
+
+ public List<Value> getValueBindings() {
+ return valueBindings;
+ }
+
+ public void setValueBindings(List<Value> valueBindings) {
+ this.valueBindings = valueBindings;
+ }
+
+ public List<Wiring> getWireBindings() {
+ return wireBindings;
+ }
+
+ public void setWireBindings(List<Wiring> wireBindings) {
+ this.wireBindings = wireBindings;
+ }
+
+ public List<Expression> getExpressionBindings() {
+ return expressionBindings;
+ }
+
+ public void setExpressionBindings(List<Expression> expressionBindings) {
+ this.expressionBindings = expressionBindings;
+ }
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Binding.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Binding.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Binding.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,46 +0,0 @@
-/**
- * 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;
-
-/**
- * Abstract base class for binding configuration sub types.
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public abstract class Binding {
-
- private String property;
- private String setterMethod;
-
- public String getProperty() {
- return property;
- }
-
- public void setProperty(String property) {
- this.property = property;
- }
-
- public String getSetterMethod() {
- return setterMethod;
- }
-
- public void setSetterMethod(String setterMethod) {
- this.setterMethod = setterMethod;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Binding.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Binding.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Binding.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Binding.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,46 @@
+/**
+ * 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;
+
+/**
+ * Abstract base class for binding configuration sub types.
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public abstract class Binding {
+
+ private String property;
+ private String setterMethod;
+
+ public String getProperty() {
+ return property;
+ }
+
+ public void setProperty(String property) {
+ this.property = property;
+ }
+
+ public String getSetterMethod() {
+ return setterMethod;
+ }
+
+ public void setSetterMethod(String setterMethod) {
+ this.setterMethod = setterMethod;
+ }
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/DecodeParam.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/DecodeParam.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/DecodeParam.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,47 +0,0 @@
-/**
- * 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;
-
-/**
- * Decode Parameter.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class DecodeParam {
-
- private String name;
- private String value;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/DecodeParam.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/DecodeParam.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/DecodeParam.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/DecodeParam.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,47 @@
+/**
+ * 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;
+
+/**
+ * Decode Parameter.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class DecodeParam {
+
+ private String name;
+ private String value;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Expression.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Expression.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Expression.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,56 +0,0 @@
-/**
- * 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;
-
-/**
- * Expression based binding configuration.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class Expression extends Binding {
-
- private String execOnElement;
- private String execOnElementNS;
- private String initVal;
-
- public String getExecOnElement() {
- return execOnElement;
- }
-
- public void setExecOnElement(String execOnElement) {
- this.execOnElement = execOnElement;
- }
-
- public String getExecOnElementNS() {
- return execOnElementNS;
- }
-
- public void setExecOnElementNS(String execOnElementNS) {
- this.execOnElementNS = execOnElementNS;
- }
-
- public String getInitVal() {
- return initVal;
- }
-
- public void setInitVal(String initVal) {
- this.initVal = initVal;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Expression.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Expression.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Expression.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Expression.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,56 @@
+/**
+ * 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;
+
+/**
+ * Expression based binding configuration.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class Expression extends Binding {
+
+ private String execOnElement;
+ private String execOnElementNS;
+ private String initVal;
+
+ public String getExecOnElement() {
+ return execOnElement;
+ }
+
+ public void setExecOnElement(String execOnElement) {
+ this.execOnElement = execOnElement;
+ }
+
+ public String getExecOnElementNS() {
+ return execOnElementNS;
+ }
+
+ public void setExecOnElementNS(String execOnElementNS) {
+ this.execOnElementNS = execOnElementNS;
+ }
+
+ public String getInitVal() {
+ return initVal;
+ }
+
+ public void setInitVal(String initVal) {
+ this.initVal = initVal;
+ }
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Value.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Value.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Value.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,76 +0,0 @@
-/**
- * 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 java.util.List;
-
-/**
- * Value binding configuration.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class Value extends Binding {
-
- private String data;
- private String dataNS;
- private String decoder;
- private String defaultVal;
- private List<DecodeParam> decodeParams;
-
- public String getData() {
- return data;
- }
-
- public void setData(String data) {
- this.data = data;
- }
-
- public String getDataNS() {
- return dataNS;
- }
-
- public void setDataNS(String dataNS) {
- this.dataNS = dataNS;
- }
-
- public String getDecoder() {
- return decoder;
- }
-
- public void setDecoder(String decoder) {
- this.decoder = decoder;
- }
-
- public String getDefaultVal() {
- return defaultVal;
- }
-
- public void setDefaultVal(String defaultVal) {
- this.defaultVal = defaultVal;
- }
-
- public List<DecodeParam> getDecodeParams() {
- return decodeParams;
- }
-
- public void setDecodeParams(List<DecodeParam> decodeParams) {
- this.decodeParams = decodeParams;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Value.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Value.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Value.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Value.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,76 @@
+/**
+ * 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 java.util.List;
+
+/**
+ * Value binding configuration.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class Value extends Binding {
+
+ private String data;
+ private String dataNS;
+ private String decoder;
+ private String defaultVal;
+ private List<DecodeParam> decodeParams;
+
+ public String getData() {
+ return data;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
+
+ public String getDataNS() {
+ return dataNS;
+ }
+
+ public void setDataNS(String dataNS) {
+ this.dataNS = dataNS;
+ }
+
+ public String getDecoder() {
+ return decoder;
+ }
+
+ public void setDecoder(String decoder) {
+ this.decoder = decoder;
+ }
+
+ public String getDefaultVal() {
+ return defaultVal;
+ }
+
+ public void setDefaultVal(String defaultVal) {
+ this.defaultVal = defaultVal;
+ }
+
+ public List<DecodeParam> getDecodeParams() {
+ return decodeParams;
+ }
+
+ public void setDecodeParams(List<DecodeParam> decodeParams) {
+ this.decodeParams = decodeParams;
+ }
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Wiring.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Wiring.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Wiring.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,56 +0,0 @@
-/**
- * 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;
-
-/**
- * Wiring binding configuration.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class Wiring extends Binding {
-
- private String beanIdRef;
- private String wireOnElement;
- private String wireOnElementNS;
-
- public String getBeanIdRef() {
- return beanIdRef;
- }
-
- public void setBeanIdRef(String beanIdRef) {
- this.beanIdRef = beanIdRef;
- }
-
- public String getWireOnElement() {
- return wireOnElement;
- }
-
- public void setWireOnElement(String wireOnElement) {
- this.wireOnElement = wireOnElement;
- }
-
- public String getWireOnElementNS() {
- return wireOnElementNS;
- }
-
- public void setWireOnElementNS(String wireOnElementNS) {
- this.wireOnElementNS = wireOnElementNS;
- }
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Wiring.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Wiring.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Wiring.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/Wiring.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,56 @@
+/**
+ * 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;
+
+/**
+ * Wiring binding configuration.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class Wiring extends Binding {
+
+ private String beanIdRef;
+ private String wireOnElement;
+ private String wireOnElementNS;
+
+ public String getBeanIdRef() {
+ return beanIdRef;
+ }
+
+ public void setBeanIdRef(String beanIdRef) {
+ this.beanIdRef = beanIdRef;
+ }
+
+ public String getWireOnElement() {
+ return wireOnElement;
+ }
+
+ public void setWireOnElement(String wireOnElement) {
+ this.wireOnElement = wireOnElement;
+ }
+
+ public String getWireOnElementNS() {
+ return wireOnElementNS;
+ }
+
+ public void setWireOnElementNS(String wireOnElementNS) {
+ this.wireOnElementNS = wireOnElementNS;
+ }
+}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1 (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,25 +0,0 @@
-<#assign numChildElemenst = (bean.valueBindings?size + bean.wireBindings?size + bean.expressionBindings?size) >
-<#if (numChildElemenst > 0)>
- <${nsp}:bindings <@writeAttribs attribs="beanId,beanClass at class,createOnElement,createOnElementNS"/>>
- <#list bean.valueBindings as valueBinding>
- <#assign numDecodeParams = (valueBinding.decodeParams?size) >
- <#if (numDecodeParams > 0)>
- <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,dataNS,decoder,defaultVal at default"/>>
- <#list valueBinding.decodeParams as 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 at default"/> />
- </#if>
- </#list>
- <#list bean.wireBindings as wireBinding>
- <${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement,wireOnElementNS"/> />
- </#list>
- <#list bean.expressionBindings as expressionBinding>
- <${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,execOnElementNS"/> />
- </#list>
- </${nsp}:bindings>
-<#else>
- <${nsp}:bindings <@writeAttribs attribs="beanId,beanClass at class,createOnElement,createOnElementNS"/> />
-</#if>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,25 @@
+<#assign numChildElemenst = (bean.valueBindings?size + bean.wireBindings?size + bean.expressionBindings?size) >
+<#if (numChildElemenst > 0)>
+ <${nsp}:bindings <@writeAttribs attribs="beanId,beanClass at class,createOnElement,createOnElementNS"/>>
+ <#list bean.valueBindings as valueBinding>
+ <#assign numDecodeParams = (valueBinding.decodeParams?size) >
+ <#if (numDecodeParams > 0)>
+ <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,dataNS,decoder,defaultVal at default"/>>
+ <#list valueBinding.decodeParams as 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 at default"/> />
+ </#if>
+ </#list>
+ <#list bean.wireBindings as wireBinding>
+ <${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement,wireOnElementNS"/> />
+ </#list>
+ <#list bean.expressionBindings as expressionBinding>
+ <${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,execOnElementNS"/> />
+ </#list>
+ </${nsp}:bindings>
+<#else>
+ <${nsp}:bindings <@writeAttribs attribs="beanId,beanClass at class,createOnElement,createOnElementNS"/> />
+</#if>
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,67 +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">
-
- <!-- 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:wiring property="valueBindings" beanIdRef="valueBindings" />
- <jb:wiring property="expressionBindings" beanIdRef="expressionBindings" />
- <jb:wiring property="wireBindings" beanIdRef="wireBindings" />
- </jb:bean>
-
- <jb:bean beanId="valueBindings" class="java.util.ArrayList" 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:wiring property="decodeParams" beanIdRef="decodeParams" />
- </jb:bean>
- <jb:bean beanId="decodeParams" class="java.util.ArrayList" 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="java.util.ArrayList" 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="java.util.ArrayList" 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
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,67 @@
+<?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:wiring property="valueBindings" beanIdRef="valueBindings" />
+ <jb:wiring property="expressionBindings" beanIdRef="expressionBindings" />
+ <jb:wiring property="wireBindings" beanIdRef="wireBindings" />
+ </jb:bean>
+
+ <jb:bean beanId="valueBindings" class="java.util.ArrayList" 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:wiring property="decodeParams" beanIdRef="decodeParams" />
+ </jb:bean>
+ <jb:bean beanId="decodeParams" class="java.util.ArrayList" 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="java.util.ArrayList" 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="java.util.ArrayList" 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
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2 (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,25 +0,0 @@
-<#assign numChildElemenst = (bean.valueBindings?size + bean.wireBindings?size + bean.expressionBindings?size) >
-<#if (numChildElemenst > 0)>
- <${nsp}:bean <@writeAttribs attribs="beanId,beanClass at class,createOnElement,createOnElementNS"/>>
- <#list bean.valueBindings as valueBinding>
- <#assign numDecodeParams = (valueBinding.decodeParams?size) >
- <#if (numDecodeParams > 0)>
- <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,dataNS,decoder,defaultVal at default"/>>
- <#list valueBinding.decodeParams as 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 at default"/> />
- </#if>
- </#list>
- <#list bean.wireBindings as wireBinding>
- <${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement,wireOnElementNS"/> />
- </#list>
- <#list bean.expressionBindings as expressionBinding>
- <${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,execOnElementNS,initVal"/> />
- </#list>
- </${nsp}:bean>
-<#else>
- <${nsp}:bean <@writeAttribs attribs="beanId,beanClass at class,createOnElement,createOnElementNS"/> />
-</#if>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,25 @@
+<#assign numChildElemenst = (bean.valueBindings?size + bean.wireBindings?size + bean.expressionBindings?size) >
+<#if (numChildElemenst > 0)>
+ <${nsp}:bean <@writeAttribs attribs="beanId,beanClass at class,createOnElement,createOnElementNS"/>>
+ <#list bean.valueBindings as valueBinding>
+ <#assign numDecodeParams = (valueBinding.decodeParams?size) >
+ <#if (numDecodeParams > 0)>
+ <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,dataNS,decoder,defaultVal at default"/>>
+ <#list valueBinding.decodeParams as 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 at default"/> />
+ </#if>
+ </#list>
+ <#list bean.wireBindings as wireBinding>
+ <${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement,wireOnElementNS"/> />
+ </#list>
+ <#list bean.expressionBindings as expressionBinding>
+ <${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,execOnElementNS,initVal"/> />
+ </#list>
+ </${nsp}:bean>
+<#else>
+ <${nsp}:bean <@writeAttribs attribs="beanId,beanClass at class,createOnElement,createOnElementNS"/> />
+</#if>
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,67 +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">
-
- <!-- 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:wiring property="valueBindings" beanIdRef="valueBindings" />
- <jb:wiring property="expressionBindings" beanIdRef="expressionBindings" />
- <jb:wiring property="wireBindings" beanIdRef="wireBindings" />
- </jb:bean>
-
- <jb:bean beanId="valueBindings" class="java.util.ArrayList" 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:wiring property="decodeParams" beanIdRef="decodeParams" />
- </jb:bean>
- <jb:bean beanId="decodeParams" class="java.util.ArrayList" 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="java.util.ArrayList" 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="java.util.ArrayList" 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
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,67 @@
+<?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:wiring property="valueBindings" beanIdRef="valueBindings" />
+ <jb:wiring property="expressionBindings" beanIdRef="expressionBindings" />
+ <jb:wiring property="wireBindings" beanIdRef="wireBindings" />
+ </jb:bean>
+
+ <jb:bean beanId="valueBindings" class="java.util.ArrayList" 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:wiring property="decodeParams" beanIdRef="decodeParams" />
+ </jb:bean>
+ <jb:bean beanId="decodeParams" class="java.util.ArrayList" 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="java.util.ArrayList" 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="java.util.ArrayList" 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
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3 (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,25 +0,0 @@
-<#assign numChildElemenst = (bean.valueBindings?size + bean.wireBindings?size + bean.expressionBindings?size) >
-<#if (numChildElemenst > 0)>
- <${nsp}:bean <@writeAttribs attribs="beanId,beanClass at class,createOnElement"/>>
- <#list bean.valueBindings as valueBinding>
- <#assign numDecodeParams = (valueBinding.decodeParams?size) >
- <#if (numDecodeParams > 0)>
- <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,decoder,defaultVal at default"/>>
- <#list valueBinding.decodeParams as 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 at default"/> />
- </#if>
- </#list>
- <#list bean.wireBindings as wireBinding>
- <${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement"/> />
- </#list>
- <#list bean.expressionBindings as expressionBinding>
- <${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,initVal"/> />
- </#list>
- </${nsp}:bean>
-<#else>
- <${nsp}:bean <@writeAttribs attribs="beanId,beanClass at class,createOnElement"/> />
-</#if>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.ftl 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,25 @@
+<#assign numChildElemenst = (bean.valueBindings?size + bean.wireBindings?size + bean.expressionBindings?size) >
+<#if (numChildElemenst > 0)>
+ <${nsp}:bean <@writeAttribs attribs="beanId,beanClass at class,createOnElement"/>>
+ <#list bean.valueBindings as valueBinding>
+ <#assign numDecodeParams = (valueBinding.decodeParams?size) >
+ <#if (numDecodeParams > 0)>
+ <${nsp}:value <@writeAttribs bean=valueBinding attribs="property,setterMethod,data,decoder,defaultVal at default"/>>
+ <#list valueBinding.decodeParams as 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 at default"/> />
+ </#if>
+ </#list>
+ <#list bean.wireBindings as wireBinding>
+ <${nsp}:wiring <@writeAttribs bean=wireBinding attribs="property,setterMethod,beanIdRef,wireOnElement"/> />
+ </#list>
+ <#list bean.expressionBindings as expressionBinding>
+ <${nsp}:expression <@writeAttribs bean=expressionBinding attribs="property,setterMethod,execOnElement,initVal"/> />
+ </#list>
+ </${nsp}:bean>
+<#else>
+ <${nsp}:bean <@writeAttribs attribs="beanId,beanClass at class,createOnElement"/> />
+</#if>
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,67 +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">
-
- <!-- 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:wiring property="valueBindings" beanIdRef="valueBindings" />
- <jb:wiring property="expressionBindings" beanIdRef="expressionBindings" />
- <jb:wiring property="wireBindings" beanIdRef="wireBindings" />
- </jb:bean>
-
- <jb:bean beanId="valueBindings" class="java.util.ArrayList" 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:wiring property="decodeParams" beanIdRef="decodeParams" />
- </jb:bean>
- <jb:bean beanId="decodeParams" class="java.util.ArrayList" 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="java.util.ArrayList" 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="java.util.ArrayList" 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
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,67 @@
+<?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:wiring property="valueBindings" beanIdRef="valueBindings" />
+ <jb:wiring property="expressionBindings" beanIdRef="expressionBindings" />
+ <jb:wiring property="wireBindings" beanIdRef="wireBindings" />
+ </jb:bean>
+
+ <jb:bean beanId="valueBindings" class="java.util.ArrayList" 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:wiring property="decodeParams" beanIdRef="decodeParams" />
+ </jb:bean>
+ <jb:bean beanId="decodeParams" class="java.util.ArrayList" 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="java.util.ArrayList" 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="java.util.ArrayList" 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
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/SmooksModelActivator.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/SmooksModelActivator.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/SmooksModelActivator.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,30 +0,0 @@
-/**
- * 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.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * Plugin Activator.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public class SmooksModelActivator extends Plugin {
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/SmooksModelActivator.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/SmooksModelActivator.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/SmooksModelActivator.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/plugin/SmooksModelActivator.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,30 @@
+/**
+ * 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.plugin;
+
+import org.eclipse.core.runtime.Plugin;
+
+/**
+ * Plugin Activator.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public class SmooksModelActivator extends Plugin {
+}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/.classpath 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-commons-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-edisax-parser-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-core-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-csv-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-edi-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-json-1.4-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/jaxen-1.1.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/mvel2-2.0.17.jar"/>
+ <classpathentry exported="true" kind="lib" path="libs/xstream-1.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="libs/freemarker-2.3.11.jar"/>
<classpathentry exported="true" kind="lib" path="libs/opencsv-1.8.jar"/>
<classpathentry exported="true" kind="lib" path="libs/jackson-core-lgpl-1.0.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-commons-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-edisax-parser-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-core-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-csv-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-edi-1.2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/milyn-smooks-json-1.2.1.jar" sourcepath="/Users/tfennelly/milyn/trunk/smooks-cartridges/json/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF 2010-06-10 15:48:17 UTC (rev 22726)
@@ -14,14 +14,18 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .,
libs/jackson-core-lgpl-1.0.1.jar,
- libs/milyn-commons-1.2.1.jar,
- libs/milyn-edisax-parser-1.2.1.jar,
- libs/milyn-smooks-core-1.2.1.jar,
- libs/milyn-smooks-csv-1.2.1.jar,
- libs/milyn-smooks-edi-1.2.1.jar,
- libs/milyn-smooks-json-1.2.1.jar,
libs/opencsv-1.8.jar,
- libs/freemarker-2.3.11.jar
+ libs/freemarker-2.3.11.jar,
+ libs/jaxen-1.1.1.jar,
+ libs/mvel2-2.0.17.jar,
+ libs/xstream-1.2.2.jar,
+ libs/milyn-commons-1.4-SNAPSHOT.jar,
+ libs/milyn-edisax-parser-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-core-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-csv-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-edi-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar,
+ libs/milyn-smooks-json-1.4-SNAPSHOT.jar
Bundle-Localization: plugin
Bundle-Vendor: %providerName
Export-Package: au.com.bytecode.opencsv,
@@ -37,7 +41,14 @@
org.milyn.delivery.sax,
org.milyn.io,
org.milyn.javabean,
+ org.milyn.javabean.context,
org.milyn.javabean.decoders,
+ org.milyn.javabean.dynamic,
+ org.milyn.javabean.dynamic.ext,
+ org.milyn.javabean.dynamic.resolvers,
+ org.milyn.javabean.dynamic.serialize,
+ org.milyn.javabean.dynamic.serialize.freemarker,
+ org.milyn.javabean.dynamic.visitor,
org.milyn.json,
org.milyn.payload,
org.milyn.smooks.edi,
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/build.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,13 +1,17 @@
bin.includes = META-INF/,\
libs/jackson-core-lgpl-1.0.1.jar,\
- libs/milyn-commons-1.2.1.jar,\
- libs/milyn-edisax-parser-1.2.1.jar,\
- libs/milyn-smooks-core-1.2.1.jar,\
- libs/milyn-smooks-csv-1.2.1.jar,\
- libs/milyn-smooks-edi-1.2.1.jar,\
- libs/milyn-smooks-json-1.2.1.jar,\
libs/opencsv-1.8.jar,\
plugin.properties,\
libs/freemarker-2.3.11.jar,\
- about.html
+ about.html,\
+ libs/jaxen-1.1.1.jar,\
+ libs/mvel2-2.0.17.jar,\
+ libs/xstream-1.2.2.jar,\
+ libs/milyn-commons-1.4-SNAPSHOT.jar,\
+ libs/milyn-edisax-parser-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-core-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-csv-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-edi-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar,\
+ libs/milyn-smooks-json-1.4-SNAPSHOT.jar
jars.compile.order =
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/getsmooks-build.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,68 @@
+<project name="Get-Smooks" default="smooks.dependencies.get" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+
+ <property name="smooks.version" value="1.4-SNAPSHOT"/>
+
+ <description>
+ Script for pulling Smooks v${smooks.version} jars from the maven repo.
+ </description>
+
+ <property environment="env"/>
+ <property name="maven.ant.version" value="2.0.9"/>
+ <property name="maven.dir" value="org/apache/maven/maven-ant-tasks/${maven.ant.version}"/>
+ <property name="maven.jar" value="maven-ant-tasks-${maven.ant.version}.jar"/>
+ <pathconvert targetos="unix" property="maven.repo.dir">
+ <path>
+ <pathelement location="${user.home}/.m2/repository"/>
+ </path>
+ </pathconvert>
+ <pathconvert targetos="unix" property="maven.ant.repo.dir">
+ <path>
+ <pathelement location="${maven.repo.dir}/${maven.dir}"/>
+ </path>
+ </pathconvert>
+ <condition property="maven.exists.locally">
+ <available file="${maven.ant.repo.dir}/${maven.jar}"/>
+ </condition>
+
+ <target name="smooks.dependencies.get" depends="maven.get">
+
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpath="${maven.ant.repo.dir}/${maven.jar}"/>
+ <artifact:remoteRepository id="codehaus.m2.snapshots" url="http://snapshots.repository.codehaus.org" />
+ <artifact:dependencies filesetId="dependencies">
+
+ <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-csv" />
+ <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-edi" />
+ <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-javabean"/>
+ <dependency groupId="org.milyn" version="${smooks.version}" artifactId="milyn-smooks-json"/>
+
+ <remoteRepository refid="codehaus.m2.snapshots" />
+ </artifact:dependencies>
+
+ <tstamp>
+ <format property="get.time" pattern="MM-dd-yyyy-hh-mm-ss"/>
+ </tstamp>
+
+ <property name="todir" value="libs" />
+ <antcall target="copy.dependencies">
+ <reference refid="dependencies" />
+ </antcall>
+ <delete>
+ <fileset dir="./${todir}" includes="commons*.jar,jta*.jar,xerces*.jar,xpp*.jar,xml-apis*.jar,junit*,log4j*,hsqldb*,servlet-api*,xalan*,jbossall-client*,jboss-j2ee*,jdom*,cglib-full*,cglib-nodep*,struts*,mockejb*,mockrunner*,commons-beanutils*,commons-digester*,commons-fileupload*,commons-validator*,oro*,xmlunit*,hibernate-core-*,ibatis-sqlmap-*,dom4j-*,ant-*,javassist-3.10.0.GA.jar" />
+ </delete>
+ </target>
+
+ <target name="maven.get" unless="maven.exists.locally">
+ <mkdir dir="${maven.ant.repo.dir}"/>
+ <get src="http://repo1.maven.org/maven2/${maven.dir}/${maven.jar}" dest="${maven.ant.repo.dir}/${maven.jar}"
+ usetimestamp="true"/>
+ </target>
+
+ <target name="copy.dependencies">
+ <mkdir dir="./${todir}" />
+ <copy todir="./${todir}">
+ <fileset refid="dependencies"/>
+ <mapper type="flatten"/>
+ </copy>
+ </target>
+
+</project>
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/jaxen-1.1.1.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/jaxen-1.1.1.jar)
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.2.1.jar
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-commons-1.4-SNAPSHOT.jar)
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.2.1.jar
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-SNAPSHOT.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-edisax-parser-1.4-SNAPSHOT.jar)
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.2.1.jar
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-core-1.4-SNAPSHOT.jar)
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.2.1.jar
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-csv-1.4-SNAPSHOT.jar)
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.2.1.jar
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-SNAPSHOT.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-edi-1.4-SNAPSHOT.jar)
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-javabean-1.4-SNAPSHOT.jar)
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.2.1.jar
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-SNAPSHOT.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/milyn-smooks-json-1.4-SNAPSHOT.jar)
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/mvel2-2.0.17.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/mvel2-2.0.17.jar)
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.runtime/libs/xstream-1.2.2.jar (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.runtime/libs/xstream-1.2.2.jar)
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/ModelBuilder.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/ModelBuilder.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/ModelBuilder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,272 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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) 2005-2006, JBoss Inc.
- */
-package org.jboss.tools.smooks.templating.model;
-
-import java.util.Properties;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.milyn.xml.DomUtils;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-
-/**
- * Abstract message model builder.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public abstract class ModelBuilder {
-
- public static final String NAMESPACE = "http://www.jboss.org/xsd/tools/smooks"; // TODO: Make same as JBT eclipse extension namespace ?? //$NON-NLS-1$
- public static final String REQUIRED = "#required"; //$NON-NLS-1$
- public static final String OPTIONAL = "#optional"; //$NON-NLS-1$
-
- private static final String HIDDEN_ELEMENT = "hidden"; //$NON-NLS-1$
-
- public static enum ElementType {
- simple,
- complex
- }
-
- private Properties namespaces = new Properties();
-
- /**
- * Build the message model.
- * @return The message model.
- * @throws ModelBuilderException Error building model.
- */
- public abstract Document buildModel() throws ModelBuilderException;
-
- /**
- * Get the namespace prefix-to-URI mappings for this model.
- * @return The namespace prefix-to-URI mappings for this model.
- */
- public Properties getNamespaces() {
- return namespaces;
- }
-
-
-
- /**
- * Mark a fragment as being hidden.
- * <p/>
- * When hidden, it is illegal to attempt a mapping onto a fragment.
- *
- * @param fragment The fragment to be marked as hidden.
- */
- public static void hideFragment(Element fragment) {
- fragment.setAttributeNS(NAMESPACE, HIDDEN_ELEMENT, "true"); //$NON-NLS-1$
- }
-
- /**
- * Unmark a fragment as being hidden.
- * <p/>
- * When hidden, it is illegal to attempt a mapping onto a fragment.
- *
- * @param fragment The fragment to be unmarked as hidden.
- */
- public static void unhideFragment(Element fragment) {
- fragment.removeAttributeNS(NAMESPACE, HIDDEN_ELEMENT);
- }
-
- /**
- * Is the specified node marked as being hidden.
- * <p/>
- * When hidden, it is illegal to attempt a mapping onto a fragment.
- *
- * @return True if the node is hidden, otherwise false.
- */
- public static boolean isHidden(Node node) {
- if(node != null) {
- switch(node.getNodeType()) {
- case Node.ATTRIBUTE_NODE :
- return isHidden(node.getParentNode());
- case Node.ELEMENT_NODE :
- if(((Element)node).getAttributeNS(NAMESPACE, HIDDEN_ELEMENT).equals("true")) { //$NON-NLS-1$
- return true;
- }
- return isHidden(node.getParentNode());
- }
- }
-
- return false;
- }
-
- /**
- * Is the specified node required.
- * <p/>
- * For an Element node, this means does it have a minOccurs > 0. For an Attr node,
- * it means is its value set to "#REQUIRED".
- *
- * @return True if the node is hidden, otherwise false.
- */
- public static boolean isRequired(Node node) {
- if(node != null) {
- switch(node.getNodeType()) {
- case Node.ATTRIBUTE_NODE :
- return (REQUIRED.equals(node.getTextContent()) || XMLConstants.XML_NS_URI.equals(node.getNamespaceURI()));
- case Node.ELEMENT_NODE :
- if(getMinOccurs((Element) node) > 0) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Is the specified node in the reserved namespace.
- *
- * @return True if the node is in the reserved namespace, otherwise false.
- */
- public static boolean isInReservedNamespace(Node node) {
- if(node != null) {
- return NAMESPACE.equals(node.getNamespaceURI());
- }
-
- return false;
- }
-
- protected Document createModelInstance() throws ModelBuilderException {
- DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder;
-
- try {
- builder = builderFactory.newDocumentBuilder();
- } catch (ParserConfigurationException e) {
- throw new ModelBuilderException("Error constructing DOM DocumentBuilder.", e); //$NON-NLS-1$
- }
-
- return builder.newDocument();
- }
-
- public static void setMinMax(Element element, int minOccurs, int maxOccurs) {
- element.setAttributeNS(NAMESPACE, "smk:minOccurs", Integer.toString(minOccurs)); //$NON-NLS-1$
- element.setAttributeNS(NAMESPACE, "smk:maxOccurs", Integer.toString(maxOccurs)); //$NON-NLS-1$
- }
-
- public static Node getParentNode(Node node) {
- if(node.getNodeType() == Node.ATTRIBUTE_NODE) {
- return ((Attr)node).getOwnerElement();
- } else {
- return node.getParentNode();
- }
- }
-
- public static int getMinOccurs(Element element) {
- String minOccurs = element.getAttributeNS(NAMESPACE, "minOccurs"); //$NON-NLS-1$
-
- if(minOccurs.equals("")) { //$NON-NLS-1$
- return 1;
- }
-
- return Integer.parseInt(minOccurs);
- }
-
- public static int getMaxOccurs(Element element) {
- String maxOccurs = element.getAttributeNS(NAMESPACE, "maxOccurs"); //$NON-NLS-1$
-
- if(maxOccurs.equals("")) { //$NON-NLS-1$
- return 1;
- }
-
- return Integer.parseInt(maxOccurs);
- }
-
- public static boolean isCollection(Element element) {
- int maxOccurs = getMaxOccurs(element);
-
- return (maxOccurs > 1 || maxOccurs == -1);
- }
-
- public static void setElementType(Element element, ElementType type) {
- element.setAttributeNS(NAMESPACE, "smk:elementType", type.toString()); //$NON-NLS-1$
- }
-
- public static ElementType getElementType(Element element) {
- String elementType = element.getAttributeNS(NAMESPACE, "elementType"); //$NON-NLS-1$
-
- if(elementType == null || elementType.length() == 0) {
- return null;
- }
-
- return ElementType.valueOf(elementType);
- }
-
- /**
- * Create a compositor Element.
- * @param document Owner Document node.
- * @return The compositor Element.
- */
- public static Element createCompositor(Document document) {
- return document.createElementNS(NAMESPACE, "smk:compositor"); //$NON-NLS-1$
- }
-
- /**
- * Is the supplied DOM node the compositor Element.
- * @param node The DOM node to test.
- * @return True if the node is the compositor element, otherwise false.
- */
- public static boolean isCompositor(Node node) {
- if(node.getNodeType() == Node.ELEMENT_NODE) {
- if(DomUtils.getName((Element)node).equals("compositor")) { //$NON-NLS-1$
- if(NAMESPACE.equals(node.getNamespaceURI())) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Turn on/off enforcement of collection sub-mapping rules.
- * <p/>
- * If turned on, the collection mapping must be made on the model collection element (having maxOccurs > 1)
- * before mappings can be made on sub elements.
- *
- * @param element The model element.
- * @param enforce True if enforcement is to be turned on, otherwise false.
- */
- public static void setEnforceCollectionSubMappingRules(Element element, boolean enforce) {
- element.setAttributeNS(NAMESPACE, "smk:enforceCollectionSubMappingRules", Boolean.toString(enforce)); //$NON-NLS-1$
- }
-
- /**
- * Is collection sub-mapping rules turned on for the supplied model element.
- * @param element The model element.
- * @return True if enforcement is turned on, otherwise false.
- * @see #setEnforceCollectionSubMappingRules(Element, boolean)
- */
- public static boolean getEnforceCollectionSubMappingRules(Element element) {
- String enforce = element.getAttributeNS(NAMESPACE, "enforceCollectionSubMappingRules"); //$NON-NLS-1$
-
- if(enforce == null || enforce.length() == 0) {
- return true;
- }
-
- return !enforce.equals("false"); //$NON-NLS-1$
- }
-}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/ModelNodeResolver.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/ModelNodeResolver.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/ModelNodeResolver.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -54,7 +54,7 @@
StringBuilder pathBuilder = new StringBuilder();
while(node != null && node.getNodeType() != Node.DOCUMENT_NODE) {
- if(!ModelBuilder.isInReservedNamespace(node)) {
+ if(!TemplatingModelBuilder.isInReservedNamespace(node)) {
if(pathBuilder.length() > 0) {
pathBuilder.insert(0, '/'); //$NON-NLS-1$
}
@@ -76,7 +76,7 @@
}
}
- node = ModelBuilder.getParentNode(node);
+ node = TemplatingModelBuilder.getParentNode(node);
}
return pathBuilder.toString();
@@ -85,7 +85,7 @@
private void buildModelNodeMap(Element element, String parentPath) {
String elementPath = parentPath;
- if(!ModelBuilder.isInReservedNamespace(element)) {
+ if(!TemplatingModelBuilder.isInReservedNamespace(element)) {
String elNS = element.getNamespaceURI();
if(parentPath.length() > 0) {
@@ -104,7 +104,7 @@
int attrCount = attributes.getLength();
for(int i = 0; i < attrCount; i++) {
Attr attribute = (Attr) attributes.item(i);
- if(!ModelBuilder.isInReservedNamespace(attribute)) {
+ if(!TemplatingModelBuilder.isInReservedNamespace(attribute)) {
String attrNS = attribute.getNamespaceURI();
if(attrNS != null && attrNS.length() > 0) {
modelNodeMap.put(elementPath + "/@" + getPrefix(attrNS) + ":" + attribute.getName(), attribute); //$NON-NLS-1$ //$NON-NLS-2$
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/TemplatingModelBuilder.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/TemplatingModelBuilder.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/TemplatingModelBuilder.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/TemplatingModelBuilder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,272 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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) 2005-2006, JBoss Inc.
+ */
+package org.jboss.tools.smooks.templating.model;
+
+import java.util.Properties;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.milyn.xml.DomUtils;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.ParserConfigurationException;
+
+/**
+ * Abstract message model builder.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public abstract class TemplatingModelBuilder {
+
+ public static final String NAMESPACE = "http://www.jboss.org/xsd/tools/smooks"; // TODO: Make same as JBT eclipse extension namespace ?? //$NON-NLS-1$
+ public static final String REQUIRED = "#required"; //$NON-NLS-1$
+ public static final String OPTIONAL = "#optional"; //$NON-NLS-1$
+
+ private static final String HIDDEN_ELEMENT = "hidden"; //$NON-NLS-1$
+
+ public static enum ElementType {
+ simple,
+ complex
+ }
+
+ private Properties namespaces = new Properties();
+
+ /**
+ * Build the message model.
+ * @return The message model.
+ * @throws ModelBuilderException Error building model.
+ */
+ public abstract Document buildModel() throws ModelBuilderException;
+
+ /**
+ * Get the namespace prefix-to-URI mappings for this model.
+ * @return The namespace prefix-to-URI mappings for this model.
+ */
+ public Properties getNamespaces() {
+ return namespaces;
+ }
+
+
+
+ /**
+ * Mark a fragment as being hidden.
+ * <p/>
+ * When hidden, it is illegal to attempt a mapping onto a fragment.
+ *
+ * @param fragment The fragment to be marked as hidden.
+ */
+ public static void hideFragment(Element fragment) {
+ fragment.setAttributeNS(NAMESPACE, HIDDEN_ELEMENT, "true"); //$NON-NLS-1$
+ }
+
+ /**
+ * Unmark a fragment as being hidden.
+ * <p/>
+ * When hidden, it is illegal to attempt a mapping onto a fragment.
+ *
+ * @param fragment The fragment to be unmarked as hidden.
+ */
+ public static void unhideFragment(Element fragment) {
+ fragment.removeAttributeNS(NAMESPACE, HIDDEN_ELEMENT);
+ }
+
+ /**
+ * Is the specified node marked as being hidden.
+ * <p/>
+ * When hidden, it is illegal to attempt a mapping onto a fragment.
+ *
+ * @return True if the node is hidden, otherwise false.
+ */
+ public static boolean isHidden(Node node) {
+ if(node != null) {
+ switch(node.getNodeType()) {
+ case Node.ATTRIBUTE_NODE :
+ return isHidden(node.getParentNode());
+ case Node.ELEMENT_NODE :
+ if(((Element)node).getAttributeNS(NAMESPACE, HIDDEN_ELEMENT).equals("true")) { //$NON-NLS-1$
+ return true;
+ }
+ return isHidden(node.getParentNode());
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Is the specified node required.
+ * <p/>
+ * For an Element node, this means does it have a minOccurs > 0. For an Attr node,
+ * it means is its value set to "#REQUIRED".
+ *
+ * @return True if the node is hidden, otherwise false.
+ */
+ public static boolean isRequired(Node node) {
+ if(node != null) {
+ switch(node.getNodeType()) {
+ case Node.ATTRIBUTE_NODE :
+ return (REQUIRED.equals(node.getTextContent()) || XMLConstants.XML_NS_URI.equals(node.getNamespaceURI()));
+ case Node.ELEMENT_NODE :
+ if(getMinOccurs((Element) node) > 0) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Is the specified node in the reserved namespace.
+ *
+ * @return True if the node is in the reserved namespace, otherwise false.
+ */
+ public static boolean isInReservedNamespace(Node node) {
+ if(node != null) {
+ return NAMESPACE.equals(node.getNamespaceURI());
+ }
+
+ return false;
+ }
+
+ protected Document createModelInstance() throws ModelBuilderException {
+ DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder builder;
+
+ try {
+ builder = builderFactory.newDocumentBuilder();
+ } catch (ParserConfigurationException e) {
+ throw new ModelBuilderException("Error constructing DOM DocumentBuilder.", e); //$NON-NLS-1$
+ }
+
+ return builder.newDocument();
+ }
+
+ public static void setMinMax(Element element, int minOccurs, int maxOccurs) {
+ element.setAttributeNS(NAMESPACE, "smk:minOccurs", Integer.toString(minOccurs)); //$NON-NLS-1$
+ element.setAttributeNS(NAMESPACE, "smk:maxOccurs", Integer.toString(maxOccurs)); //$NON-NLS-1$
+ }
+
+ public static Node getParentNode(Node node) {
+ if(node.getNodeType() == Node.ATTRIBUTE_NODE) {
+ return ((Attr)node).getOwnerElement();
+ } else {
+ return node.getParentNode();
+ }
+ }
+
+ public static int getMinOccurs(Element element) {
+ String minOccurs = element.getAttributeNS(NAMESPACE, "minOccurs"); //$NON-NLS-1$
+
+ if(minOccurs.equals("")) { //$NON-NLS-1$
+ return 1;
+ }
+
+ return Integer.parseInt(minOccurs);
+ }
+
+ public static int getMaxOccurs(Element element) {
+ String maxOccurs = element.getAttributeNS(NAMESPACE, "maxOccurs"); //$NON-NLS-1$
+
+ if(maxOccurs.equals("")) { //$NON-NLS-1$
+ return 1;
+ }
+
+ return Integer.parseInt(maxOccurs);
+ }
+
+ public static boolean isCollection(Element element) {
+ int maxOccurs = getMaxOccurs(element);
+
+ return (maxOccurs > 1 || maxOccurs == -1);
+ }
+
+ public static void setElementType(Element element, ElementType type) {
+ element.setAttributeNS(NAMESPACE, "smk:elementType", type.toString()); //$NON-NLS-1$
+ }
+
+ public static ElementType getElementType(Element element) {
+ String elementType = element.getAttributeNS(NAMESPACE, "elementType"); //$NON-NLS-1$
+
+ if(elementType == null || elementType.length() == 0) {
+ return null;
+ }
+
+ return ElementType.valueOf(elementType);
+ }
+
+ /**
+ * Create a compositor Element.
+ * @param document Owner Document node.
+ * @return The compositor Element.
+ */
+ public static Element createCompositor(Document document) {
+ return document.createElementNS(NAMESPACE, "smk:compositor"); //$NON-NLS-1$
+ }
+
+ /**
+ * Is the supplied DOM node the compositor Element.
+ * @param node The DOM node to test.
+ * @return True if the node is the compositor element, otherwise false.
+ */
+ public static boolean isCompositor(Node node) {
+ if(node.getNodeType() == Node.ELEMENT_NODE) {
+ if(DomUtils.getName((Element)node).equals("compositor")) { //$NON-NLS-1$
+ if(NAMESPACE.equals(node.getNamespaceURI())) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Turn on/off enforcement of collection sub-mapping rules.
+ * <p/>
+ * If turned on, the collection mapping must be made on the model collection element (having maxOccurs > 1)
+ * before mappings can be made on sub elements.
+ *
+ * @param element The model element.
+ * @param enforce True if enforcement is to be turned on, otherwise false.
+ */
+ public static void setEnforceCollectionSubMappingRules(Element element, boolean enforce) {
+ element.setAttributeNS(NAMESPACE, "smk:enforceCollectionSubMappingRules", Boolean.toString(enforce)); //$NON-NLS-1$
+ }
+
+ /**
+ * Is collection sub-mapping rules turned on for the supplied model element.
+ * @param element The model element.
+ * @return True if enforcement is turned on, otherwise false.
+ * @see #setEnforceCollectionSubMappingRules(Element, boolean)
+ */
+ public static boolean getEnforceCollectionSubMappingRules(Element element) {
+ String enforce = element.getAttributeNS(NAMESPACE, "enforceCollectionSubMappingRules"); //$NON-NLS-1$
+
+ if(enforce == null || enforce.length() == 0) {
+ return true;
+ }
+
+ return !enforce.equals("false"); //$NON-NLS-1$
+ }
+}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/csv/CSVModelBuilder.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/csv/CSVModelBuilder.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/csv/CSVModelBuilder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -20,7 +20,7 @@
package org.jboss.tools.smooks.templating.model.csv;
import org.eclipse.core.runtime.Assert;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.model.ModelBuilderException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -29,7 +29,7 @@
* CSV Model Builder.
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
-public class CSVModelBuilder extends ModelBuilder {
+public class CSVModelBuilder extends TemplatingModelBuilder {
public static final String CSV_RECORD_ELEMENT = "csv-record"; //$NON-NLS-1$
private String[] csvFields;
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XMLSampleModelBuilder.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XMLSampleModelBuilder.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XMLSampleModelBuilder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -38,7 +38,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.model.ModelBuilderException;
import org.jboss.tools.smooks.templating.template.xml.XMLFreeMarkerTemplateBuilder;
import org.milyn.xml.DomUtils;
@@ -50,7 +50,7 @@
*
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
-public class XMLSampleModelBuilder extends ModelBuilder {
+public class XMLSampleModelBuilder extends TemplatingModelBuilder {
private static DocumentBuilder docBuilder;
private Document model;
@@ -115,7 +115,7 @@
if(childCount > 0) {
// Has child elements, therefore it's a "complex" element type...
- ModelBuilder.setElementType(element, ElementType.complex);
+ TemplatingModelBuilder.setElementType(element, ElementType.complex);
for(int i = 0; i < childCount; i++) {
Node child = children.item(i);
@@ -128,7 +128,7 @@
}
} else {
// Has no child elements, therefore it's a "simple" element type...
- ModelBuilder.setElementType(element, ElementType.simple);
+ TemplatingModelBuilder.setElementType(element, ElementType.simple);
}
}
@@ -147,19 +147,19 @@
Element earlierOccurance = childElementByNames.get(elementName);
// Mark every element as being optional and possibly being multiple...
- ModelBuilder.setMinMax(childElement, 0, -1);
+ TemplatingModelBuilder.setMinMax(childElement, 0, -1);
if(earlierOccurance != null) {
// According to the sample XML, this element is definitely a
// collection item because it exists more than once, so lets mark it
// such that sub mappings on this element require this collection to be mapped beforehand...
- ModelBuilder.setEnforceCollectionSubMappingRules(earlierOccurance, true);
+ TemplatingModelBuilder.setEnforceCollectionSubMappingRules(earlierOccurance, true);
// And remove the duplicates...
removeableChildren.add(childElement);
} else {
// We've no way of knowing whether or not this element is a collection
// item or not, so lets not enforce the collection sub mapping rules...
- ModelBuilder.setEnforceCollectionSubMappingRules(childElement, false);
+ TemplatingModelBuilder.setEnforceCollectionSubMappingRules(childElement, false);
}
configureModelElementCardinality(childElement);
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XSDModelBuilder.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XSDModelBuilder.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/model/xml/XSDModelBuilder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -31,7 +31,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.model.ModelBuilderException;
import org.jboss.tools.smooks.templating.template.xml.XMLFreeMarkerTemplateBuilder;
@@ -56,7 +56,7 @@
*
* @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
*/
-public class XSDModelBuilder extends ModelBuilder {
+public class XSDModelBuilder extends TemplatingModelBuilder {
private Map<String, XSDElementDeclaration> elements = new LinkedHashMap<String, XSDElementDeclaration>();
private Map<String, XSDTypeDefinition> types = new LinkedHashMap<String, XSDTypeDefinition>();
@@ -207,17 +207,17 @@
parent.appendChild(element);
if(typeDef instanceof XSDComplexTypeDefinition) {
- ModelBuilder.setElementType(element, ElementType.complex);
+ TemplatingModelBuilder.setElementType(element, ElementType.complex);
processComplexType(document, element, (XSDComplexTypeDefinition) typeDef);
} else if(typeDef instanceof XSDSimpleTypeDefinition) {
XSDSimpleTypeDefinition simpleTypeDef = (XSDSimpleTypeDefinition) typeDef;
XSDTypeDefinition loadedType = types.get(simpleTypeDef.getName());
if(loadedType instanceof XSDComplexTypeDefinition) {
- ModelBuilder.setElementType(element, ElementType.complex);
+ TemplatingModelBuilder.setElementType(element, ElementType.complex);
processComplexType(document, element, (XSDComplexTypeDefinition) loadedType);
} else {
- ModelBuilder.setElementType(element, ElementType.simple);
+ TemplatingModelBuilder.setElementType(element, ElementType.simple);
}
} else if(typeDef != null) {
System.out.println("?? " + typeDef); //$NON-NLS-1$
@@ -256,7 +256,7 @@
String compositorType = compositor.getName();
if(particles.size() > 1 && compositorType.equals("choice")) { //$NON-NLS-1$
- Element compositorEl = ModelBuilder.createCompositor(document);
+ Element compositorEl = TemplatingModelBuilder.createCompositor(document);
compositorEl.setAttribute("type", compositorType); //$NON-NLS-1$
setMinMax(compositorEl, minOccurs, maxOccurs);
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/TemplateBuilder.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/TemplateBuilder.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/TemplateBuilder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -34,7 +34,7 @@
import javax.xml.xpath.XPathFactory;
import org.eclipse.core.runtime.Assert;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.model.ModelBuilderException;
import org.jboss.tools.smooks.templating.model.ModelNodeResolver;
import org.jboss.tools.smooks.templating.template.exception.InvalidMappingException;
@@ -56,7 +56,7 @@
*/
public abstract class TemplateBuilder {
- private ModelBuilder modelBuilder;
+ private TemplatingModelBuilder modelBuilder;
private Document model;
private List<Mapping> mappings = new ArrayList<Mapping>();
private XPathFactory xpathFactory = XPathFactory.newInstance();
@@ -70,7 +70,7 @@
* @throws ModelBuilderException
* Error building model.
*/
- public TemplateBuilder(ModelBuilder modelBuilder) throws ModelBuilderException {
+ public TemplateBuilder(TemplatingModelBuilder modelBuilder) throws ModelBuilderException {
Assert.isNotNull(modelBuilder, "modelBuilder"); //$NON-NLS-1$
this.modelBuilder = modelBuilder;
this.model = modelBuilder.buildModel();
@@ -112,13 +112,13 @@
}
/**
- * Get the {@link ModelBuilder} instance associated with this
+ * Get the {@link TemplatingModelBuilder} instance associated with this
* {@link TemplateBuilder}.
*
- * @return The {@link ModelBuilder} instance associated with this
+ * @return The {@link TemplatingModelBuilder} instance associated with this
* {@link TemplateBuilder}.
*/
- public ModelBuilder getModelBuilder() {
+ public TemplatingModelBuilder getModelBuilder() {
return modelBuilder;
}
@@ -187,7 +187,7 @@
for (Node hiddenNode : hideNodes) {
if (hiddenNode.getNodeType() == Node.ELEMENT_NODE) {
if (!isOnMappingPath((Element) hiddenNode)) {
- ModelBuilder.unhideFragment((Element) hiddenNode);
+ TemplatingModelBuilder.unhideFragment((Element) hiddenNode);
showNodes.add(hiddenNode);
}
}
@@ -198,19 +198,19 @@
}
private void addHideNodes(Node modelPath, Mapping mapping) {
- Node parent = ModelBuilder.getParentNode(modelPath);
+ Node parent = TemplatingModelBuilder.getParentNode(modelPath);
while (parent != null) {
- if (ModelBuilder.isCompositor(parent)) {
+ if (TemplatingModelBuilder.isCompositor(parent)) {
Element compositor = (Element) parent;
- int maxOccurs = ModelBuilder.getMaxOccurs(compositor);
+ int maxOccurs = TemplatingModelBuilder.getMaxOccurs(compositor);
int numElementsOnMappingPath = getNumElementsOnMappingPath(compositor);
if (numElementsOnMappingPath == maxOccurs) {
hideUnmappedPaths(compositor, mapping);
}
}
- parent = ModelBuilder.getParentNode(parent);
+ parent = TemplatingModelBuilder.getParentNode(parent);
}
}
@@ -224,7 +224,7 @@
Element nodeToHide = (Element) child;
if (!isOnMappingPath(nodeToHide)) {
mapping.addHideNode(nodeToHide);
- ModelBuilder.hideFragment(nodeToHide);
+ TemplatingModelBuilder.hideFragment(nodeToHide);
}
}
}
@@ -264,11 +264,11 @@
throw new InvalidMappingException(
"Unsupported XML target node mapping. Support XML elements and attributes only."); //$NON-NLS-1$
}
- if (ModelBuilder.NAMESPACE.equals(mappingNode.getNamespaceURI())) {
+ if (TemplatingModelBuilder.NAMESPACE.equals(mappingNode.getNamespaceURI())) {
throw new InvalidMappingException(
- "Unsupported XML target node mapping. Cannot map to a reserved model node from the '" + ModelBuilder.NAMESPACE + "' namespace."); //$NON-NLS-1$ //$NON-NLS-2$
+ "Unsupported XML target node mapping. Cannot map to a reserved model node from the '" + TemplatingModelBuilder.NAMESPACE + "' namespace."); //$NON-NLS-1$ //$NON-NLS-2$
}
- if (ModelBuilder.isHidden(mappingNode)) {
+ if (TemplatingModelBuilder.isHidden(mappingNode)) {
throw new InvalidMappingException(
"Illegal XML target node mapping for node '" + mappingNode + "'. This node (or one of it's ancestors) is hidden."); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -278,7 +278,7 @@
Element collectionElement = getNearestCollectionElement(mappingNode);
if (collectionElement != null) {
CollectionMapping parentCollectionMapping = getCollectionMapping(collectionElement);
- if (parentCollectionMapping == null && ModelBuilder.getEnforceCollectionSubMappingRules(collectionElement)) {
+ if (parentCollectionMapping == null && TemplatingModelBuilder.getEnforceCollectionSubMappingRules(collectionElement)) {
throw new UnmappedCollectionNodeException(collectionElement);
}
}
@@ -299,12 +299,12 @@
while (nextNode != null) {
if (nextNode.getNodeType() == Node.ELEMENT_NODE) {
- if(ModelBuilder.isCollection((Element) nextNode)) {
+ if(TemplatingModelBuilder.isCollection((Element) nextNode)) {
return (Element) nextNode;
}
}
- nextNode = ModelBuilder.getParentNode(nextNode);
+ nextNode = TemplatingModelBuilder.getParentNode(nextNode);
}
return null;
@@ -347,11 +347,11 @@
// it's attributes and
// child elements) i.e. it is not a parent of any of the mappings.
- if (ModelBuilder.isInReservedNamespace(element)) {
+ if (TemplatingModelBuilder.isInReservedNamespace(element)) {
return false;
- } else if (ModelBuilder.isHidden(element)) {
+ } else if (TemplatingModelBuilder.isHidden(element)) {
return false;
- } else if (ModelBuilder.getMinOccurs(element) == 0 && !isOnMappingPath(element)) {
+ } else if (TemplatingModelBuilder.getMinOccurs(element) == 0 && !isOnMappingPath(element)) {
return false;
}
@@ -375,7 +375,7 @@
if (element == pathNode) {
return true;
}
- pathNode = ModelBuilder.getParentNode(pathNode);
+ pathNode = TemplatingModelBuilder.getParentNode(pathNode);
}
}
@@ -404,8 +404,8 @@
if (child.getNodeType() == Node.ELEMENT_NODE) {
Node targetModelNode = modelNodeResolver.resolveNodeMapping(child);
- String srcPath = element.getAttributeNS(ModelBuilder.NAMESPACE, "srcPath"); //$NON-NLS-1$
- String collectionItemName = element.getAttributeNS(ModelBuilder.NAMESPACE, "collectionItemName"); //$NON-NLS-1$
+ String srcPath = element.getAttributeNS(TemplatingModelBuilder.NAMESPACE, "srcPath"); //$NON-NLS-1$
+ String collectionItemName = element.getAttributeNS(TemplatingModelBuilder.NAMESPACE, "collectionItemName"); //$NON-NLS-1$
addCollectionMapping(srcPath, (Element) targetModelNode, collectionItemName);
@@ -435,7 +435,7 @@
}
public static void writeListStart(StringWriter writer, String srcPath, String collectionItemName) {
- writer.write("<smk:list smk:srcPath=\"" + srcPath + "\" smk:collectionItemName=\"" + collectionItemName + "\" xmlns:smk=\"" + ModelBuilder.NAMESPACE + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ writer.write("<smk:list smk:srcPath=\"" + srcPath + "\" smk:collectionItemName=\"" + collectionItemName + "\" xmlns:smk=\"" + TemplatingModelBuilder.NAMESPACE + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
public static void writeListEnd(StringWriter writer) {
@@ -443,7 +443,7 @@
}
public static boolean isListElement(Element element) {
- if (ModelBuilder.isInReservedNamespace(element)) {
+ if (TemplatingModelBuilder.isInReservedNamespace(element)) {
if (DomUtils.getName(element).equals("list")) { //$NON-NLS-1$
return true;
}
@@ -473,7 +473,7 @@
public String getNamespaceURI(String prefix) {
if (prefix.equals("smk")) { //$NON-NLS-1$
- return ModelBuilder.NAMESPACE;
+ return TemplatingModelBuilder.NAMESPACE;
} else {
return namespaces.getProperty(prefix);
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilder.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilder.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -26,7 +26,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.model.ModelBuilderException;
import org.jboss.tools.smooks.templating.template.*;
import org.jboss.tools.smooks.templating.template.exception.TemplateBuilderException;
@@ -59,7 +59,7 @@
* @param includeFieldNames True if field names are to be added at the start of the generated message, otherwise false.
* @throws ModelBuilderException Error building model.
*/
- public CSVFreeMarkerTemplateBuilder(ModelBuilder modelBuilder, char separatorChar, char quoteChar, boolean includeFieldNames) throws ModelBuilderException {
+ public CSVFreeMarkerTemplateBuilder(TemplatingModelBuilder modelBuilder, char separatorChar, char quoteChar, boolean includeFieldNames) throws ModelBuilderException {
super(modelBuilder);
this.separatorChar = separatorChar;
this.quoteChar = quoteChar;
@@ -77,7 +77,7 @@
* @throws ModelBuilderException Error building model.
* @throws TemplateBuilderException Error adding mappings extracted from template.
*/
- public CSVFreeMarkerTemplateBuilder(ModelBuilder modelBuilder, char separatorChar, char quoteChar, boolean includeFieldNames, String ftlTemplate) throws ModelBuilderException, TemplateBuilderException {
+ public CSVFreeMarkerTemplateBuilder(TemplatingModelBuilder modelBuilder, char separatorChar, char quoteChar, boolean includeFieldNames, String ftlTemplate) throws ModelBuilderException, TemplateBuilderException {
this(modelBuilder, separatorChar, quoteChar, includeFieldNames);
addMappings(ftlTemplate);
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/xml/XMLFreeMarkerTemplateBuilder.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/xml/XMLFreeMarkerTemplateBuilder.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/xml/XMLFreeMarkerTemplateBuilder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -33,10 +33,10 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.model.ModelBuilderException;
import org.jboss.tools.smooks.templating.model.ModelNodeResolver;
-import org.jboss.tools.smooks.templating.model.ModelBuilder.ElementType;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder.ElementType;
import org.jboss.tools.smooks.templating.model.xml.XSDModelBuilder;
import org.jboss.tools.smooks.templating.template.*;
import org.jboss.tools.smooks.templating.template.exception.InvalidMappingException;
@@ -63,13 +63,13 @@
* <p/>
* This constructor is used when an existing template doesn't exist i.e. for creating new
* templates with a new set of mappings. When creating an {@link XMLFreeMarkerTemplateBuilder} instance to incorporate
- * mappings from an existing template, use the {@link #XMLFreeMarkerTemplateBuilder(ModelBuilder, String)}
+ * mappings from an existing template, use the {@link #XMLFreeMarkerTemplateBuilder(TemplatingModelBuilder, String)}
* constructor.
*
- * @param modelBuilder The {@link ModelBuilder} instance that describes the XML model (e.g. {@link XSDModelBuilder}).
- * @throws ModelBuilderException Invalid {@link ModelBuilder} instance.
+ * @param modelBuilder The {@link TemplatingModelBuilder} instance that describes the XML model (e.g. {@link XSDModelBuilder}).
+ * @throws ModelBuilderException Invalid {@link TemplatingModelBuilder} instance.
*/
- public XMLFreeMarkerTemplateBuilder(ModelBuilder modelBuilder) throws ModelBuilderException {
+ public XMLFreeMarkerTemplateBuilder(TemplatingModelBuilder modelBuilder) throws ModelBuilderException {
super(modelBuilder);
}
@@ -79,12 +79,12 @@
* Used to construct an {@link XMLFreeMarkerTemplateBuilder} instance to incorporate mappings from an
* existing FreeMarker template.
*
- * @param modelBuilder The {@link ModelBuilder} instance that describes the XML model (e.g. {@link XSDModelBuilder}).
+ * @param modelBuilder The {@link TemplatingModelBuilder} instance that describes the XML model (e.g. {@link XSDModelBuilder}).
* @param ftlTemplate FreeMarker template from which to extract existing {@link ValueMapping mappings}.
- * @throws ModelBuilderException Invalid {@link ModelBuilder} instance.
+ * @throws ModelBuilderException Invalid {@link TemplatingModelBuilder} instance.
* @throws TemplateBuilderException Error processing FreeMarker template.
*/
- public XMLFreeMarkerTemplateBuilder(ModelBuilder modelBuilder, String ftlTemplate) throws ModelBuilderException, TemplateBuilderException {
+ public XMLFreeMarkerTemplateBuilder(TemplatingModelBuilder modelBuilder, String ftlTemplate) throws ModelBuilderException, TemplateBuilderException {
super(modelBuilder);
addMappings(ftlTemplate);
}
@@ -125,7 +125,7 @@
*/
private void writeElement(Element element, int indent, boolean addNewline, Writer templateWriter) {
try {
- if(ModelBuilder.isInReservedNamespace(element)) {
+ if(TemplatingModelBuilder.isInReservedNamespace(element)) {
writeElementChildren(element, indent, templateWriter);
} else if(assertAddNodeToTemplate(element)) {
if(addNewline) {
@@ -171,12 +171,12 @@
for(int i = 0; i < attributes.getLength(); i++) {
Attr attribute = (Attr) attributes.item(i);
- if(!ModelBuilder.isInReservedNamespace(attribute)) {
+ if(!TemplatingModelBuilder.isInReservedNamespace(attribute)) {
Mapping mapping = getMapping(attribute);
if(mapping != null) {
writeAttribute(attribute.getNodeName(), FreeMarkerUtil.toFreeMarkerVariable((ValueMapping)mapping), templateWriter); //$NON-NLS-1$
- } else if(ModelBuilder.isRequired(attribute)) {
+ } else if(TemplatingModelBuilder.isRequired(attribute)) {
writeAttribute(attribute.getNodeName(), attribute.getValue(), templateWriter);
}
}
@@ -213,16 +213,16 @@
if(children.getLength() == 0) {
Mapping mapping = getMapping(element);
- if(ModelBuilder.getElementType(element) == ElementType.simple) {
+ if(TemplatingModelBuilder.getElementType(element) == ElementType.simple) {
templateWriter.write(">"); //$NON-NLS-1$
if(mapping != null) {
templateWriter.write(FreeMarkerUtil.toFreeMarkerVariable((ValueMapping)mapping));
} else {
- templateWriter.write(ModelBuilder.REQUIRED);
+ templateWriter.write(TemplatingModelBuilder.REQUIRED);
}
}
} else {
- if(!ModelBuilder.isInReservedNamespace(element)) {
+ if(!TemplatingModelBuilder.isInReservedNamespace(element)) {
templateWriter.write(">"); //$NON-NLS-1$
}
for(int i = 0; i < children.getLength(); i++) {
@@ -232,7 +232,7 @@
numElementsWritten++;
}
}
- if(!ModelBuilder.isInReservedNamespace(element)) {
+ if(!TemplatingModelBuilder.isInReservedNamespace(element)) {
templateWriter.write('\n'); //$NON-NLS-1$
}
}
@@ -241,7 +241,7 @@
}
private void writeElementEnd(Element element, boolean hasChildren, Writer templateWriter) throws IOException {
- if(hasChildren || ModelBuilder.getElementType(element) == ElementType.simple) {
+ if(hasChildren || TemplatingModelBuilder.getElementType(element) == ElementType.simple) {
templateWriter.write("</"); //$NON-NLS-1$
templateWriter.write(element.getNodeName());
templateWriter.write(">"); //$NON-NLS-1$
@@ -295,7 +295,7 @@
private void addMappings(Element element, ModelNodeResolver modelNodeResolver) throws TemplateBuilderException {
if(TemplateBuilder.isListElement(element)) {
addCollectionMapping(element, modelNodeResolver);
- } else if(!ModelBuilder.isInReservedNamespace(element)) {
+ } else if(!TemplatingModelBuilder.isInReservedNamespace(element)) {
String elementText = DomUtils.getAllText(element, false);
// Handle the element itself...
@@ -309,7 +309,7 @@
for(int i = 0; i < attribCount; i++) {
Attr attribute = (Attr) attributes.item(i);
- if(!ModelBuilder.isInReservedNamespace(attribute)) {
+ if(!TemplatingModelBuilder.isInReservedNamespace(attribute)) {
String attrValue = attribute.getValue();
if(FreeMarkerUtil.isDollarVariable(attrValue)) {
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/RootModel.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/RootModel.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/RootModel.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -9,10 +9,10 @@
public class RootModel extends AbstractSmooksGraphicalModel{
- public RootModel() {
- super(null);
- }
-
+ private RootModel targetContainerModel = null;
+
+ private RootModel sourceContainerModel = null;
+
public static final String ADD_CHILDREN = "__pro_add_children"; //$NON-NLS-1$
public static final String REMOVE_CHILDREN = "__pro_remove_children"; //$NON-NLS-1$
@@ -21,6 +21,37 @@
private List<AbstractSmooksGraphicalModel> children;
+
+ public RootModel() {
+ super(null);
+ }
+
+
+
+ public RootModel getTargetContainerModel() {
+ return targetContainerModel;
+ }
+
+
+
+ public void setTargetContainerModel(RootModel targetContainerModel) {
+ this.targetContainerModel = targetContainerModel;
+ }
+
+
+
+ public RootModel getSourceContainerModel() {
+ return sourceContainerModel;
+ }
+
+
+
+ public void setSourceContainerModel(RootModel sourceContainerModel) {
+ this.sourceContainerModel = sourceContainerModel;
+ }
+
+
+
public List<AbstractSmooksGraphicalModel> getChildren() {
if (children == null) {
children = new ArrayList<AbstractSmooksGraphicalModel>();
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/RootEditPart.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/RootEditPart.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/RootEditPart.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -8,12 +8,15 @@
import java.util.List;
import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayout;
import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.ToolbarLayout;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.GraphicalViewer;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.jboss.tools.smooks.gef.common.RootModel;
import org.jboss.tools.smooks.gef.tree.editpolicy.RootPanelXYLayoutEditPolicy;
+import org.jboss.tools.smooks.graphical.figures.FillLayout;
/**
* @author DartPeng
@@ -26,8 +29,11 @@
*/
@Override
protected IFigure createFigure() {
+
FreeformLayer layer = new FreeformLayer();
- layer.setLayoutManager(new FreeformLayout());
+ ToolbarLayout tl = new ToolbarLayout();
+ tl.setVertical(true);
+ layer.setLayoutManager(new FillLayout(((GraphicalViewer)((GraphicalEditPart)this).getViewer()).getControl()));
return layer;
}
@@ -60,7 +66,7 @@
*/
@Override
protected void createEditPolicies() {
- this.installEditPolicy(EditPolicy.LAYOUT_ROLE, new RootPanelXYLayoutEditPolicy());
+// this.installEditPolicy(EditPolicy.LAYOUT_ROLE, new RootPanelXYLayoutEditPolicy());
}
protected List<?> getModelChildren(){
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksEditFactory.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksEditFactory.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksEditFactory.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -25,6 +25,8 @@
import org.jboss.tools.smooks.gef.tree.model.ValueBindingConnection;
import org.jboss.tools.smooks.graphical.editors.editparts.InputDataContainerEditPart;
import org.jboss.tools.smooks.graphical.editors.editparts.InputDataTreeNodeEditPart;
+import org.jboss.tools.smooks.graphical.editors.editparts.InputSourceContainerEditPart;
+import org.jboss.tools.smooks.graphical.editors.editparts.OutputContainerEditPart;
import org.jboss.tools.smooks.graphical.editors.editparts.ResourceConfigEditFactory;
import org.jboss.tools.smooks.graphical.editors.editparts.SmooksRootEditPart;
import org.jboss.tools.smooks.graphical.editors.editparts.TriggerConnectionEditPart;
@@ -34,6 +36,8 @@
import org.jboss.tools.smooks.graphical.editors.model.AbstractResourceConfigGraphModel;
import org.jboss.tools.smooks.graphical.editors.model.InputDataContianerModel;
import org.jboss.tools.smooks.graphical.editors.model.InputDataTreeNodeModel;
+import org.jboss.tools.smooks.graphical.editors.model.InputSourceContainerModel;
+import org.jboss.tools.smooks.graphical.editors.model.OutputTargetModel;
/**
* @author Dart
@@ -41,14 +45,13 @@
*/
public class SmooksEditFactory extends SmooksGEFEditFactory implements EditPartFactory {
private ResourceConfigEditFactory resourceConfigFactory;
-
+
private boolean displayInput = true;
public SmooksEditFactory() {
super();
resourceConfigFactory = new ResourceConfigEditFactory();
}
-
/**
* @return the displayInput
@@ -57,21 +60,27 @@
return displayInput;
}
-
-
/**
- * @param displayInput the displayInput to set
+ * @param displayInput
+ * the displayInput to set
*/
public void setDisplayInput(boolean displayInput) {
this.displayInput = displayInput;
}
-
-
public EditPart createEditPart(EditPart context, Object model) {
EditPart editPart = null;
+
if (model instanceof RootModel) {
- editPart = new SmooksRootEditPart();
+ if (model instanceof OutputTargetModel) {
+ editPart = new OutputContainerEditPart();
+ }
+ if (model instanceof InputSourceContainerModel) {
+ editPart = new InputSourceContainerEditPart();
+ }
+ if (editPart == null) {
+ editPart = new SmooksRootEditPart();
+ }
}
if (model.getClass() == TreeNodeModel.class) {
editPart = new TreeNodeEditPart();
@@ -86,20 +95,19 @@
editPart = new InputDataContainerEditPart();
}
- if (model instanceof AbstractResourceConfigGraphModel
- || model instanceof AbstractResourceConfigChildNodeGraphModel) {
+ if (model instanceof AbstractResourceConfigGraphModel || model instanceof AbstractResourceConfigChildNodeGraphModel) {
editPart = resourceConfigFactory.createEditPart(model);
}
if (model.getClass() == TreeNodeConnection.class) {
editPart = new TreeNodeConnectionEditPart();
}
- if(model.getClass() == TriggerConnection.class){
+ if (model.getClass() == TriggerConnection.class) {
editPart = new TriggerConnectionEditPart();
}
- if(model.getClass() == ValueBindingConnection.class){
+ if (model.getClass() == ValueBindingConnection.class) {
editPart = new ValueBindingConnectionEditPart();
}
- if(model.getClass() == BeanReferenceConnection.class){
+ if (model.getClass() == BeanReferenceConnection.class) {
editPart = new BeanReferenceConnectionEditPart();
}
if (editPart != null) {
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -51,6 +51,7 @@
import org.eclipse.gef.commands.CommandStackEvent;
import org.eclipse.gef.commands.CommandStackEventListener;
import org.eclipse.gef.dnd.TemplateTransferDropTargetListener;
+import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.gef.editparts.FreeformGraphicalRootEditPart;
import org.eclipse.gef.ui.actions.SelectionAction;
import org.eclipse.gef.ui.parts.GraphicalEditor;
@@ -64,6 +65,10 @@
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
@@ -96,12 +101,16 @@
import org.jboss.tools.smooks.graphical.actions.AutoLayoutAction;
import org.jboss.tools.smooks.graphical.editors.autolayout.IAutoLayout;
import org.jboss.tools.smooks.graphical.editors.commands.IgnoreException;
+import org.jboss.tools.smooks.graphical.editors.editparts.InputSourceContainerEditPart;
+import org.jboss.tools.smooks.graphical.editors.editparts.OutputContainerEditPart;
import org.jboss.tools.smooks.graphical.editors.editparts.RightClickSelectMarqueeDragTraker;
import org.jboss.tools.smooks.graphical.editors.editparts.SmooksGraphUtil;
import org.jboss.tools.smooks.graphical.editors.model.IValidatableModel;
import org.jboss.tools.smooks.graphical.editors.model.InputDataContianerModel;
import org.jboss.tools.smooks.graphical.editors.model.InputDataRootModel;
import org.jboss.tools.smooks.graphical.editors.model.InputDataTreeNodeModel;
+import org.jboss.tools.smooks.graphical.editors.model.InputSourceContainerModel;
+import org.jboss.tools.smooks.graphical.editors.model.OutputTargetModel;
import org.jboss.tools.smooks.graphical.editors.process.TaskType;
import org.jboss.tools.smooks.model.javabean12.BeanType;
import org.jboss.tools.smooks.model.javabean12.Javabean12Package;
@@ -114,8 +123,8 @@
* @author Dart
*
*/
-public class SmooksGraphicalEditorPart extends GraphicalEditor implements ISelectionChangedListener,
- ISourceSynchronizeListener, IGraphicalEditorPart, ITaskNodeProvider, ISmooksModelValidateListener {
+public class SmooksGraphicalEditorPart extends GraphicalEditor implements ISelectionChangedListener, ISourceSynchronizeListener,
+ IGraphicalEditorPart, ITaskNodeProvider, ISmooksModelValidateListener {
private CommandStackListener emfCommandStackListener = null;
@@ -186,8 +195,7 @@
private void createEMFCommandStackListener() {
emfCommandStackListener = new org.eclipse.emf.common.command.CommandStackListener() {
public void commandStackChanged(EventObject event) {
- final Command mostRecentCommand = ((org.eclipse.emf.common.command.CommandStack) event.getSource())
- .getMostRecentCommand();
+ final Command mostRecentCommand = ((org.eclipse.emf.common.command.CommandStack) event.getSource()).getMostRecentCommand();
final EventObject fe = event;
getEditorSite().getShell().getDisplay().asyncExec(new Runnable() {
public void run() {
@@ -197,10 +205,8 @@
rawCommand = ((CommandWrapper) rawCommand).getCommand();
}
int commandType = EXECUTE_COMMAND;
- Command undoCommand = ((org.eclipse.emf.common.command.CommandStack) fe.getSource())
- .getUndoCommand();
- Command redoCommand = ((org.eclipse.emf.common.command.CommandStack) fe.getSource())
- .getRedoCommand();
+ Command undoCommand = ((org.eclipse.emf.common.command.CommandStack) fe.getSource()).getUndoCommand();
+ Command redoCommand = ((org.eclipse.emf.common.command.CommandStack) fe.getSource()).getRedoCommand();
if (undoCommand != null || rawCommand.equals(undoCommand)) {
commandType = EXECUTE_COMMAND;
}
@@ -215,8 +221,8 @@
command = ((CommandWrapper) command).getCommand();
}
handleInputParamChange(command);
- if (command instanceof SetCommand || command instanceof AddCommand
- || command instanceof DeleteCommand || command instanceof RemoveCommand) {
+ if (command instanceof SetCommand || command instanceof AddCommand || command instanceof DeleteCommand
+ || command instanceof RemoveCommand) {
refershRecentAffectedModel(command, command.getAffectedObjects(), commandType);
}
}
@@ -224,8 +230,7 @@
if (rawCommand instanceof SetCommand || rawCommand instanceof AddCommand
|| rawCommand instanceof DeleteCommand || rawCommand instanceof RemoveCommand) {
handleInputParamChange(rawCommand);
- refershRecentAffectedModel(rawCommand, mostRecentCommand.getAffectedObjects(),
- commandType);
+ refershRecentAffectedModel(rawCommand, mostRecentCommand.getAffectedObjects(), commandType);
}
}
}
@@ -266,6 +271,7 @@
mainComposite.setLayout(fillLayout);
super.createPartControl(mainComposite);
return;
+
}
super.createPartControl(parent);
}
@@ -288,8 +294,7 @@
@Override
public void dispose() {
if (smooksModelProvider != null) {
- smooksModelProvider.getEditingDomain().getCommandStack()
- .removeCommandStackListener(emfCommandStackListener);
+ smooksModelProvider.getEditingDomain().getCommandStack().removeCommandStackListener(emfCommandStackListener);
}
super.dispose();
}
@@ -424,8 +429,7 @@
getSelectionActions().add(autoLayout.getId());
}
- private void deleteRelatedConnection(AbstractSmooksGraphicalModel effecedNode, EStructuralFeature feature,
- SetCommand command) {
+ private void deleteRelatedConnection(AbstractSmooksGraphicalModel effecedNode, EStructuralFeature feature, SetCommand command) {
EObject data = (EObject) AdapterFactoryEditingDomain.unwrap(effecedNode.getData());
if (feature.equals(SmooksUIUtils.getBeanIDRefFeature(data))) {
@@ -435,7 +439,8 @@
TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator.next();
AbstractSmooksGraphicalModel target = treeNodeConnection.getTargetNode();
Object refValue = command.getValue();
- if(refValue == null) continue;
+ if (refValue == null)
+ continue;
String refID = refValue.toString();
Object targetModel = AdapterFactoryEditingDomain.unwrap(target.getData());
if (targetModel instanceof EObject) {
@@ -531,7 +536,7 @@
AbstractSmooksGraphicalModel graphModel = createGraphModel(childModel);
if (graphModel == null)
continue;
- root.addTreeNode(graphModel);
+ root.getTargetContainerModel().addTreeNode(graphModel);
applyGraphicalInformation(graphModel);
Collection<TreeNodeConnection> connections = createAllConnection(graphModel);
expandConnectedModels(connections);
@@ -552,7 +557,7 @@
if (graphModel == null)
continue;
AbstractSmooksGraphicalModel.disconnectAllConnections(graphModel);
- root.removeTreeNode(graphModel);
+ root.getTargetContainerModel().removeTreeNode(graphModel);
}
}
} else {
@@ -579,7 +584,7 @@
if (graphModel == null)
continue;
try {
- root.addTreeNode(graphModel);
+ root.getTargetContainerModel().addTreeNode(graphModel);
} catch (Throwable t) {
t.printStackTrace();
}
@@ -618,7 +623,7 @@
object2 = AdapterFactoryEditingDomain.unwrap(object2);
AbstractSmooksGraphicalModel gmodel = findGraphicalModel(object2);
if (gmodel != null) {
- root.removeTreeNode(gmodel);
+ root.getTargetContainerModel().removeTreeNode(gmodel);
break;
}
}
@@ -661,7 +666,7 @@
if (graphModel == null)
continue;
node = graphModel;
- root.addTreeNode(graphModel);
+ root.getTargetContainerModel().addTreeNode(graphModel);
Collection<TreeNodeConnection> connections = createAllConnection(graphModel);
expandConnectedModels(connections);
applyGraphicalInformation(graphModel);
@@ -708,7 +713,23 @@
super.configureGraphicalViewer();
getGraphicalViewer().setEditDomain(editDomain);
getGraphicalViewer().setEditPartFactory(createEdtiPartFactory());
+ getGraphicalViewer().getControl().addControlListener(new ControlListener() {
+ public void controlResized(ControlEvent e) {
+ }
+
+ public void controlMoved(ControlEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+ });
+ getGraphicalViewer().getControl().addPaintListener(new PaintListener() {
+
+ public void paintControl(PaintEvent e) {
+ // ((AbstractGraphicalEditPart)getGraphicalViewer().getRootEditPart()).getFigure().getLayoutManager().layout(null);
+ }
+ });
+
getGraphicalViewer().setRootEditPart(new FreeformGraphicalRootEditPart() {
public DragTracker getDragTracker(Request req) {
return new RightClickSelectMarqueeDragTraker();
@@ -719,8 +740,7 @@
(TransferDropTargetListener) new TemplateTransferDropTargetListener(getGraphicalViewer()));
GraphicalViewerKeyHandler keyHandler = new GraphicalViewerKeyHandler(getGraphicalViewer());
- keyHandler.put(org.eclipse.gef.KeyStroke.getPressed(SWT.DEL, 0), this.getActionRegistry().getAction(
- ActionFactory.DELETE.getId()));
+ keyHandler.put(org.eclipse.gef.KeyStroke.getPressed(SWT.DEL, 0), this.getActionRegistry().getAction(ActionFactory.DELETE.getId()));
ContextMenuProvider provider = getContextMenuProvider();
getGraphicalViewer().setContextMenu(provider);
@@ -745,6 +765,9 @@
protected List<AbstractSmooksGraphicalModel> createInputDataGraphModel() {
List<AbstractSmooksGraphicalModel> inputGraphModel = new ArrayList<AbstractSmooksGraphicalModel>();
if (inputDataList != null && root != null) {
+ InputSourceContainerModel tcontainer = new InputSourceContainerModel();
+ root.setSourceContainerModel(tcontainer);
+ root.addTreeNode(tcontainer);
for (Iterator<?> iterator = inputDataList.iterator(); iterator.hasNext();) {
Object object = (Object) iterator.next();
ITreeContentProvider contentProvider = new XMLStructuredDataContentProvider();
@@ -758,9 +781,9 @@
}
containerModel.getChildren().add((IXMLStructuredObject) object);
if (containerModel != null) {
- TreeContainerModel container = new InputDataContianerModel(containerModel, contentProvider,
- labelProvider, getSmooksModelProvider());
- root.addTreeNode(container);
+ TreeContainerModel container = new InputDataContianerModel(containerModel, contentProvider, labelProvider,
+ getSmooksModelProvider());
+ tcontainer.addTreeNode(container);
inputGraphModel.add(container);
}
}
@@ -785,8 +808,10 @@
Object obj = smooksModelProvider.getSmooksModel();
if (obj == null)
return;
- AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) smooksModelProvider
- .getEditingDomain();
+ OutputTargetModel targetContainer = new OutputTargetModel();
+ root.addTreeNode(targetContainer);
+ root.setTargetContainerModel(targetContainer);
+ AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) smooksModelProvider.getEditingDomain();
if (inputDataList != null && obj != null && obj instanceof DocumentRoot && editingDomain != null) {
createInputDataGraphModel();
SmooksResourceListType listType = ((DocumentRoot) obj).getSmooksResourceList();
@@ -795,7 +820,7 @@
Object object = (Object) iterator.next();
AbstractSmooksGraphicalModel gmodel = createGraphModel(object);
if (gmodel != null) {
- root.addTreeNode(gmodel);
+ targetContainer.addTreeNode(gmodel);
}
}
getGraphicalViewer().setContents(root);
@@ -832,7 +857,15 @@
protected List<TreeNodeConnection> createConnectionModel() {
List<TreeNodeConnection> connections = new ArrayList<TreeNodeConnection>();
if (root != null) {
- createConnection(root.getChildren(), connections);
+ List<AbstractSmooksGraphicalModel> children = new ArrayList<AbstractSmooksGraphicalModel>();
+ List<?> containers = root.getChildren();
+ for (Iterator<?> iterator = containers.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if (object instanceof RootModel) {
+ children.addAll(((RootModel) object).getChildren());
+ }
+ }
+ createConnection(children, connections);
}
return connections;
}
@@ -870,30 +903,12 @@
List<TreeNodeConnection> cs = new ArrayList<TreeNodeConnection>();
if (connectionModelFactory != null) {
if (connectionModelFactory.hasConnection(model)) {
- Collection<TreeNodeConnection> cList = connectionModelFactory.createConnection(inputDataList,
- getSmooksResourceList(), root, model);
+ Collection<TreeNodeConnection> cList = connectionModelFactory.createConnection(inputDataList, getSmooksResourceList(),
+ root, model);
if (cList != null) {
cs.addAll(cList);
}
}
- // if (connectionModelFactory.hasBeanIDConnection(model)) {
- // Collection<TreeNodeConnection> c =
- // connectionModelFactory.createBeanIDReferenceConnection(
- // getSmooksResourceList(), root, model);
- // if (c != null) {
- // cs.addAll(c);
- // }
- // }
- // // for xsl template
- //
- // if (connectionModelFactory.hasXSLConnection(model)) {
- // Collection<TreeNodeConnection> c =
- // connectionModelFactory.createXSLConnection(inputDataList, root,
- // model);
- // if (c != null) {
- // cs.addAll(c);
- // }
- // }
}
if (cs.isEmpty())
return null;
@@ -962,16 +977,14 @@
public void createConnection(List<AbstractSmooksGraphicalModel> children, List<TreeNodeConnection> connections) {
for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
AbstractSmooksGraphicalModel abstractSmooksGraphicalModel = (AbstractSmooksGraphicalModel) iterator.next();
- if (!(abstractSmooksGraphicalModel instanceof InputDataContianerModel)) {
- if (canCreateConnection(abstractSmooksGraphicalModel)) {
- Collection<TreeNodeConnection> c = createConnection(abstractSmooksGraphicalModel);
- if (c != null) {
- connections.addAll(c);
- }
+ if (canCreateConnection(abstractSmooksGraphicalModel)) {
+ Collection<TreeNodeConnection> c = createConnection(abstractSmooksGraphicalModel);
+ if (c != null) {
+ connections.addAll(c);
}
- List<AbstractSmooksGraphicalModel> cchildren = abstractSmooksGraphicalModel.getChildren();
- createConnection(cchildren, connections);
}
+ List<AbstractSmooksGraphicalModel> cchildren = abstractSmooksGraphicalModel.getChildren();
+ createConnection(cchildren, connections);
}
}
@@ -1033,21 +1046,15 @@
}
EditPart rootEditPart = getGraphicalViewer().getContents();
if (rootEditPart != null) {
- List<?> childrenEditPart = rootEditPart.getChildren();
+ List<?> containers = rootEditPart.getChildren();
+ List<?> childrenEditPart = new ArrayList();
+ for (Iterator iterator = containers.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ childrenEditPart.addAll(((EditPart)object).getChildren());
+ }
for (Iterator<?> iterator = childrenEditPart.iterator(); iterator.hasNext();) {
Object object = (Object) iterator.next();
-// Object model = ((EditPart) object).getModel();
-// if (object instanceof InputDataContainerEditPart || model instanceof XSLTemplateGraphicalModel) {
- SmooksUIUtils.expandGraphTree(expanedTreeNodeList, (TreeNodeEditPart) object);
-// }
- // if(model instanceof XSLTemplateGraphicalModel){
- // ((TreeNodeEditPart) object).expandNode();
- // if(!((TreeNodeEditPart) object).getChildren().isEmpty()){
- // SmooksUIUtils.expandGraphTree(expanedTreeNodeList,
- // (TreeNodeEditPart) ((TreeNodeEditPart)
- // object).getChildren().get(0));
- // }
- // }
+ SmooksUIUtils.expandGraphTree(expanedTreeNodeList, (TreeNodeEditPart) object);
}
}
@@ -1061,6 +1068,7 @@
@Override
protected void initializeGraphicalViewer() {
initGraphicalModel();
+ ((GraphicalEditPart) getGraphicalViewer().getRootEditPart()).getFigure().validate();
}
protected void applyGraphicalInformation(AbstractSmooksGraphicalModel graphicalModel) {
@@ -1126,9 +1134,12 @@
Node node = (Node) nodeMap.get(part);
figureList.add(part);
graphAnimation.recordInit(part);
- IMoveableModel graphicalModel = (IMoveableModel) part.getModel();
- map.put(graphicalModel, new Point(node.x, node.y));
- graphAnimation.recordFinal(part, new Rectangle(node.x, node.y, 0, 0));
+ Object gm = part.getModel();
+ if (gm instanceof IMoveableModel) {
+ IMoveableModel graphicalModel = (IMoveableModel) gm;
+ map.put(graphicalModel, new Point(node.x, node.y));
+ graphAnimation.recordFinal(part, new Rectangle(node.x, node.y, 0, 0));
+ }
}
IEditorSite editorSite = getEditorSite();
@@ -1188,7 +1199,17 @@
return graph;
}
EditPart rootEditorPart = this.getGraphicalViewer().getContents();
- List<?> children = rootEditorPart.getChildren();
+
+ List<?> containers = rootEditorPart.getChildren();
+ List children = new ArrayList();
+ for (Iterator iterator = containers.iterator(); iterator.hasNext();) {
+ Object c = (Object) iterator.next();
+ if (c instanceof OutputContainerEditPart || c instanceof InputSourceContainerEditPart) {
+ children.addAll(((AbstractGraphicalEditPart) c).getChildren());
+ }
+ // children.add(c);
+ }
+
// HashMap<Object, Edge> edgeMap = new HashMap<Object, Edge>();
for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
Object object = (Object) iterator.next();
@@ -1308,8 +1329,8 @@
public void selectionChanged(SelectionChangedEvent event) {
updateActions(getSelectionActions());
- ISelectionProvider provider = ((SmooksTaskDetailsEditorSite)getSite()).getMultiPageEditor().getSite().getSelectionProvider();
- if(provider != null){
+ ISelectionProvider provider = ((SmooksTaskDetailsEditorSite) getSite()).getMultiPageEditor().getSite().getSelectionProvider();
+ if (provider != null) {
provider.setSelection(event.getSelection());
}
}
@@ -1356,8 +1377,7 @@
List<AbstractSmooksGraphicalModel> children = root.getChildren();
// remove all input data graph model
for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
- AbstractSmooksGraphicalModel abstractSmooksGraphicalModel = (AbstractSmooksGraphicalModel) iterator
- .next();
+ AbstractSmooksGraphicalModel abstractSmooksGraphicalModel = (AbstractSmooksGraphicalModel) iterator.next();
if (abstractSmooksGraphicalModel instanceof InputDataContianerModel) {
inputs.add((InputDataContianerModel) abstractSmooksGraphicalModel);
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -47,6 +47,7 @@
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -141,7 +142,7 @@
private GraphViewer processGraphViewer;
- private ScrolledPageBook pageBook;
+// private ScrolledPageBook pageBook;
private Map<String, Object> registedTaskPages = new HashMap<String, Object>();
@@ -152,7 +153,11 @@
private ProcessType process;
private Map<Object, String> smooksModelIdMap = new HashMap<Object, String>();
+
+ private Map<String,Object> detailsControlMap = new HashMap<String, Object>();
+ private Composite detailsContentsComposite;
+
public SmooksProcessGraphicalEditor(FormEditor editor, String id, String title, ISmooksModelProvider provider) {
super(editor, id, title);
this.smooksModelProvider = provider;
@@ -533,14 +538,17 @@
Section section = toolkit.createSection(taskDetailsComposite, Section.TITLE_BAR);
section.setText(Messages.SmooksProcessGraphicalEditor_TaskConfigurationSectionTitle);
- pageBook = new ScrolledPageBook(section);
- pageBook.setBackground(toolkit.getColors().getBackground());
- section.setClient(pageBook);
+ detailsContentsComposite = toolkit.createComposite(section);
+ section.setClient(detailsContentsComposite);
+// pageBook = new ScrolledPageBook(section);
+ section.setLayout(new FillLayout());
+// pageBook.setBackground(toolkit.getColors().getBackground());
+// section.setClient(pageBook);
- Composite emptyComposite = pageBook.createPage(emptyKey);
- emptyComposite.setLayout(new FillLayout());
- createEmptyTaskPanel(emptyComposite, toolkit);
- pageBook.showPage(emptyKey);
+// Composite emptyComposite = pageBook.createPage(emptyKey);
+// emptyComposite.setLayout(new FillLayout());
+// createEmptyTaskPanel(emptyComposite, toolkit);
+// pageBook.showPage(emptyKey);
}
/*
@@ -575,7 +583,7 @@
createTaskDetailsSection(toolkit, sashForm);
- sashForm.setWeights(new int[] { 3, 7 });
+ sashForm.setWeights(new int[] { 2, 8 });
validateEnd(null);
}
@@ -891,20 +899,45 @@
}
public Object getActiveEditorPage() {
- if (pageBook != null) {
- Control control = pageBook.getCurrentPage();
- return control.getData();
+ if(detailsContentsComposite != null){
+ Control[] controls = detailsContentsComposite.getChildren();
+ for (int i = 0; i < controls.length; i++) {
+ Control control = controls[i];
+ if( control.isVisible()){
+ return control.getData();
+ }
+ }
}
+// if (pageBook != null) {
+// Control control = pageBook.getCurrentPage();
+// return control.getData();
+// }
return null;
}
+
+ private void showEmptyPage(){
+ Control[] childrens = detailsContentsComposite.getChildren();
+ for (int i = 0; i < childrens.length; i++) {
+ Control child = childrens[i];
+ GridData gd = new GridData();
+ gd.exclude = true;
+ child.setLayoutData(gd);
+ child.setVisible(false);
+ child.setBounds(new Rectangle(0, 0, 0, 0));
+ }
+ detailsContentsComposite.setLayout(new GridLayout());
+ detailsContentsComposite.layout(false);
+ }
protected void showTaskControl(Object model) {
- if (pageBook == null)
+ if (detailsContentsComposite == null)
return;
- if (model == null)
- pageBook.showEmptyPage();
+ if (model == null){
+ showEmptyPage();
+ }
final Object finalModel = model;
- pageBook.getShell().getDisplay().syncExec(new Runnable() {
+ detailsContentsComposite.setLayout(new FillLayout());
+ detailsContentsComposite.getShell().getDisplay().syncExec(new Runnable() {
/*
* (non-Javadoc)
@@ -929,34 +962,60 @@
}
}
if (id != null) {
- if (!pageBook.hasPage(id)) {
- Composite parent = pageBook.createPage(id);
+ if (!detailsControlMap.containsKey(id)) {
+// Composite parent = pageBook.createPage(id);
+ Control[] childrens = detailsContentsComposite.getChildren();
+ for (int i = 0; i < childrens.length; i++) {
+ Control child = childrens[i];
+ child.setVisible(false);
+ child.setBounds(new Rectangle(0, 0, 0, 0));
+ if(child.getLayoutData() instanceof GridData){
+ ((GridData)child.getLayoutData()).exclude = true;
+ }
+ }
Object page = getRegisteTaskPage(id);
if (page != null && page instanceof IEditorPart) {
try {
- parent.setLayout(new FillLayout());
-
+ detailsContentsComposite.setLayout(new GridLayout());
+ Composite contentParent = toolkit.createComposite(detailsContentsComposite);
+ contentParent.setLayout(new FillLayout());
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ contentParent.setLayoutData(gd);
ITaskNodeProvider nodeProvider = (ITaskNodeProvider) ((IEditorPart) page)
.getAdapter(ITaskNodeProvider.class);
if (nodeProvider != null) {
nodeProvider.setTaskType((TaskType) finalModel);
}
- createTaskPage((IEditorPart) page, parent);
- pageBook.showPage(id);
- parent.setData(page);
+ createTaskPage((IEditorPart) page, contentParent);
+ detailsContentsComposite.layout(false);
+ contentParent.setData(page);
+ detailsControlMap.put(id, contentParent);
} catch (Throwable e) {
e.printStackTrace();
- pageBook.removePage(id);
- pageBook.showPage(emptyKey);
+ detailsControlMap.remove(id);
+ showEmptyPage();
}
} else {
- Control control = createTaskPanel(parent, toolkit, id);
+ for (int i = 0; i < childrens.length; i++) {
+ Control child = childrens[i];
+ child.setVisible(false);
+ child.setBounds(new Rectangle(0, 0, 0, 0));
+ if(child.getLayoutData() instanceof GridData){
+ ((GridData)child.getLayoutData()).exclude = true;
+ }
+ }
+ Control control = createTaskPanel(detailsContentsComposite, toolkit, id);
if (control != null) {
- pageBook.showPage(id);
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ control.setLayoutData(gd);
+ detailsContentsComposite.layout(false);
+ detailsControlMap.put(id, control);
} else {
- pageBook.removePage(id);
- pageBook.showPage(emptyKey);
+ detailsControlMap.remove(id);
+ showEmptyPage();
+// pageBook.removePage(id);
+// pageBook.showPage(emptyKey);
}
}
} else {
@@ -966,17 +1025,115 @@
if (nodeProvider != null) {
nodeProvider.setTaskType((TaskType) finalModel);
}
- pageBook.showPage(id);
+ Control[] childrens = detailsContentsComposite.getChildren();
+ for (int i = 0; i < childrens.length; i++) {
+ Control child = childrens[i];
+ GridData gd = new GridData();
+ gd.exclude = true;
+ child.setLayoutData(gd);
+ child.setVisible(false);
+ child.setBounds(new Rectangle(0, 0, 0, 0));
+ }
+ detailsContentsComposite.setLayout(new GridLayout());
+
+ Control contentParent = (Control)detailsControlMap.get(id);
+ contentParent.setVisible(true);
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ contentParent.setLayoutData(gd);
+ detailsContentsComposite.layout(false);
}
}
} else {
- // pageBook.showEmptyPage();
+ showEmptyPage();
}
}
});
updateGlobalActions();
}
+
+// protected void showTaskControl(Object model) {
+// if (pageBook == null)
+// return;
+// if (model == null){
+// pageBook.showEmptyPage();
+// }
+// final Object finalModel = model;
+// pageBook.setLayout(new FillLayout());
+// pageBook.setAlwaysShowScrollBars(false);
+// pageBook.getShell().getDisplay().syncExec(new Runnable() {
+//
+// /*
+// * (non-Javadoc)
+// *
+// * @see java.lang.Runnable#run()
+// */
+// public void run() {
+// FormToolkit toolkit = ((AbstractSmooksFormEditor) smooksModelProvider).getToolkit();
+// if (finalModel instanceof TaskType) {
+// String id = ((TaskType) finalModel).getId();
+// if (!isSingltonEditor(id)) {
+// String idref = generateTaskSpecailID((TaskType) finalModel);
+// if (idref != null) {
+// // idref = id + "_" + idref;
+// if (getRegisteTaskPage(idref) == null) {
+// IEditorPart editor = createEditorPart(finalModel);
+// registeTaskDetailsPage(editor, idref);
+// }
+// id = idref;
+// } else {
+// id = id + "_unknown"; //$NON-NLS-1$
+// }
+// }
+// if (id != null) {
+// if (!pageBook.hasPage(id)) {
+// Composite parent = pageBook.createPage(id);
+// Object page = getRegisteTaskPage(id);
+// if (page != null && page instanceof IEditorPart) {
+// try {
+// parent.setLayout(new FillLayout());
+//
+// ITaskNodeProvider nodeProvider = (ITaskNodeProvider) ((IEditorPart) page)
+// .getAdapter(ITaskNodeProvider.class);
+// if (nodeProvider != null) {
+// nodeProvider.setTaskType((TaskType) finalModel);
+// }
+// createTaskPage((IEditorPart) page, parent);
+// pageBook.showPage(id);
+// parent.setData(page);
+//
+// } catch (Throwable e) {
+// e.printStackTrace();
+// pageBook.removePage(id);
+// pageBook.showPage(emptyKey);
+// }
+// } else {
+// Control control = createTaskPanel(parent, toolkit, id);
+// if (control != null) {
+// pageBook.showPage(id);
+// } else {
+// pageBook.removePage(id);
+// pageBook.showPage(emptyKey);
+// }
+// }
+// } else {
+// Object page = getRegisteTaskPage(id);
+// ITaskNodeProvider nodeProvider = (ITaskNodeProvider) ((IEditorPart) page)
+// .getAdapter(ITaskNodeProvider.class);
+// if (nodeProvider != null) {
+// nodeProvider.setTaskType((TaskType) finalModel);
+// }
+// pageBook.showPage(id);
+// }
+// }
+// } else {
+// // pageBook.showEmptyPage();
+// }
+// }
+//
+// });
+// updateGlobalActions();
+// }
protected IEditorSite createSite(IEditorPart editor) {
return new SmooksTaskDetailsEditorSite(this.getEditor(), editor, this);
@@ -1014,16 +1171,22 @@
}
registedTaskPages.clear();
- if (pageBook != null) {
- List<TaskTypeDescriptor> tasks = TaskTypeManager.getAllTaskList();
- for (Iterator<?> iterator = tasks.iterator(); iterator.hasNext();) {
- TaskTypeDescriptor taskTypeDescriptor = (TaskTypeDescriptor) iterator.next();
- pageBook.removePage(taskTypeDescriptor.getId(), true);
+ if (detailsContentsComposite != null) {
+ Control[] controls = detailsContentsComposite.getChildren();
+ for (int i = 0; i < controls.length; i++) {
+ Control c = controls[i];
+ c.dispose();
}
- for (Iterator<String> iterator = smooksModelIdMap.values().iterator(); iterator.hasNext();) {
- String id = (String) iterator.next();
- pageBook.removePage(id, true);
- }
+ detailsControlMap.clear();
+// List<TaskTypeDescriptor> tasks = TaskTypeManager.getAllTaskList();
+// for (Iterator<?> iterator = tasks.iterator(); iterator.hasNext();) {
+// TaskTypeDescriptor taskTypeDescriptor = (TaskTypeDescriptor) iterator.next();
+// pageBook.removePage(taskTypeDescriptor.getId(), true);
+// }
+// for (Iterator<String> iterator = smooksModelIdMap.values().iterator(); iterator.hasNext();) {
+// String id = (String) iterator.next();
+// pageBook.removePage(id, true);
+// }
}
List<TaskTypeDescriptor> tasks = TaskTypeManager.getAllTaskList();
@@ -1034,49 +1197,9 @@
this.registeTaskDetailsPage(part, taskTypeDescriptor.getId());
}
}
-
- // registedTaskPages.clear();
- // Collection<Object> editors = registedTaskPages.values();
- // for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();)
- // {
- // Object object = (Object) iterator.next();
- // if (object instanceof ISmooksGraphChangeListener) {
- // ((ISourceSynchronizeListener) object).sourceChange(model);
- // }
- // }
}
- // public void graphChanged(SmooksGraphicsExtType extType) {
- // Collection<Object> editors = registedTaskPages.values();
- // for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) {
- // Object object = (Object) iterator.next();
- // if (object instanceof ISmooksGraphChangeListener) {
- // ((ISmooksGraphChangeListener) object).graphChanged(extType);
- // }
- // }
- // }
- // public void graphPropertyChange(EStructuralFeature featre, Object value)
- // {
- // Collection<Object> editors = registedTaskPages.values();
- // for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) {
- // Object object = (Object) iterator.next();
- // if (object instanceof ISmooksGraphChangeListener) {
- // ((ISmooksGraphChangeListener) object).graphPropertyChange(featre, value);
- // }
- // }
- // }
-
- // public void inputTypeChanged(SmooksGraphicsExtType extType) {
- // Collection<Object> editors = registedTaskPages.values();
- // for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) {
- // Object object = (Object) iterator.next();
- // if (object instanceof ISmooksGraphChangeListener) {
- // ((ISmooksGraphChangeListener) object).inputTypeChanged(extType);
- // }
- // }
- // }
-
public void propertyChanged(Object source, int propId) {
this.firePropertyChange(propId);
if (propId == PROP_DIRTY) {
@@ -1266,7 +1389,7 @@
private void disposeTaskDetails(Object deleteTask) {
final Object finalModel = deleteTask;
- pageBook.getShell().getDisplay().syncExec(new Runnable() {
+ detailsContentsComposite.getShell().getDisplay().syncExec(new Runnable() {
/*
* (non-Javadoc)
@@ -1284,12 +1407,19 @@
id = id + "_unknown"; //$NON-NLS-1$
}
if (id != null) {
- if (pageBook.hasPage(id)) {
- pageBook.removePage(id);
+ if(detailsControlMap.containsKey(id)){
+ ((Control)detailsControlMap.get(id)).dispose();
+ detailsControlMap.remove(id);
Object registPage = getRegisteTaskPage(id);
removeTaskDetailsPage((IEditorPart) registPage, id);
} else {
}
+// if (pageBook.hasPage(id)) {
+// pageBook.removePage(id);
+// Object registPage = getRegisteTaskPage(id);
+// removeTaskDetailsPage((IEditorPart) registPage, id);
+// } else {
+// }
}
}
} else {
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/autolayout/JavaMappingAutoLayout.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/autolayout/JavaMappingAutoLayout.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/autolayout/JavaMappingAutoLayout.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -64,7 +64,7 @@
input_y = cha;
}
inputNode.y = input_y;
- java_x = inputNode.x + inputNode.width + INPUT_JAVA_WIDTH;
+ java_x = inputNode.x ;
}
for (Iterator<?> iterator = javaNodes.iterator(); iterator.hasNext();) {
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputSourceContainerEditPart.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputSourceContainerEditPart.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputSourceContainerEditPart.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputSourceContainerEditPart.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,91 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.graphical.editors.editparts;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.DragTracker;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.jboss.tools.smooks.gef.common.RootModel;
+import org.jboss.tools.smooks.gef.tree.editpolicy.RootPanelXYLayoutEditPolicy;
+import org.jboss.tools.smooks.gef.tree.editpolicy.SmooksRootEditPartLayoutEditPolicy;
+import org.jboss.tools.smooks.graphical.figures.ContainerFigure;
+import org.jboss.tools.smooks.graphical.figures.SourceContainerFigure;
+
+/**
+ * @author Dart
+ *
+ */
+public class InputSourceContainerEditPart extends AbstractGraphicalEditPart implements PropertyChangeListener{
+
+ /* (non-Javadoc)
+ * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure()
+ */
+ @Override
+ protected IFigure createFigure() {
+ IFigure fi = new SourceContainerFigure();
+ fi.setBounds(new Rectangle(10,50,400,300));
+ return fi;
+ }
+
+ @Override
+ public IFigure getContentPane() {
+ return ((ContainerFigure)getFigure()).getContentsPane();
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#activate()
+ */
+ @Override
+ public void activate() {
+ ((RootModel)getModel()).addPropertyChangeListener(this);
+ super.activate();
+ }
+
+
+
+ /* (non-Javadoc)
+ * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#deactivate()
+ */
+ @Override
+ public void deactivate() {
+ super.deactivate();
+ ((RootModel)getModel()).removePropertyChangeListener(this);
+ }
+
+ @Override
+ public DragTracker getDragTracker(Request request) {
+ return new RightClickSelectMarqueeDragTraker();
+// return super.getDragTracker(request);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies()
+ */
+ @Override
+ protected void createEditPolicies() {
+ this.installEditPolicy(EditPolicy.LAYOUT_ROLE, new RootPanelXYLayoutEditPolicy());
+ this.installEditPolicy(EditPolicy.LAYOUT_ROLE, new SmooksRootEditPartLayoutEditPolicy());
+ }
+
+ protected List<?> getModelChildren(){
+ RootModel list = (RootModel) getModel();
+ return list.getChildren();
+ }
+
+
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ if(evt.getPropertyName().equals(RootModel.ADD_CHILDREN) || evt.getPropertyName().equals(RootModel.REMOVE_CHILDREN)){
+ this.refreshChildren();
+ }
+ }
+}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/OutputContainerEditPart.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/OutputContainerEditPart.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/OutputContainerEditPart.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/OutputContainerEditPart.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,94 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.graphical.editors.editparts;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.DragTracker;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.jboss.tools.smooks.gef.common.RootModel;
+import org.jboss.tools.smooks.gef.tree.editpolicy.RootPanelXYLayoutEditPolicy;
+import org.jboss.tools.smooks.gef.tree.editpolicy.SmooksRootEditPartLayoutEditPolicy;
+import org.jboss.tools.smooks.graphical.figures.ContainerFigure;
+import org.jboss.tools.smooks.graphical.figures.TargetContainerFigure;
+
+/**
+ * @author Dart
+ *
+ */
+public class OutputContainerEditPart extends AbstractGraphicalEditPart implements PropertyChangeListener{
+
+ /* (non-Javadoc)
+ * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure()
+ */
+ @Override
+ protected IFigure createFigure() {
+ IFigure fi = new TargetContainerFigure();
+ fi.setBounds(new Rectangle(500,50,400,300));
+ return fi;
+ }
+
+ @Override
+ public IFigure getContentPane() {
+ return ((ContainerFigure)getFigure()).getContentsPane();
+ }
+
+
+
+ @Override
+ public DragTracker getDragTracker(Request request) {
+ return new RightClickSelectMarqueeDragTraker();
+// return super.getDragTracker(request);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#activate()
+ */
+ @Override
+ public void activate() {
+ ((RootModel)getModel()).addPropertyChangeListener(this);
+ super.activate();
+ }
+
+
+
+ /* (non-Javadoc)
+ * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#deactivate()
+ */
+ @Override
+ public void deactivate() {
+ super.deactivate();
+ ((RootModel)getModel()).removePropertyChangeListener(this);
+ }
+
+
+
+ /* (non-Javadoc)
+ * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies()
+ */
+ @Override
+ protected void createEditPolicies() {
+ this.installEditPolicy(EditPolicy.LAYOUT_ROLE, new RootPanelXYLayoutEditPolicy());
+ this.installEditPolicy(EditPolicy.LAYOUT_ROLE, new SmooksRootEditPartLayoutEditPolicy());
+ }
+
+ protected List<?> getModelChildren(){
+ RootModel list = (RootModel) getModel();
+ return list.getChildren();
+ }
+
+
+
+ public void propertyChange(PropertyChangeEvent evt) {
+ if(evt.getPropertyName().equals(RootModel.ADD_CHILDREN) || evt.getPropertyName().equals(RootModel.REMOVE_CHILDREN)){
+ this.refreshChildren();
+ }
+ }
+}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -90,15 +90,25 @@
public static AbstractSmooksGraphicalModel findSmooksGraphModel(RootModel root, Object object) {
if (root != null && object != null) {
- List<?> children = root.getChildren();
+
+ List<?> rc = root.getChildren();
+ List<AbstractSmooksGraphicalModel> children = new ArrayList();
+ for (Iterator iterator = rc.iterator(); iterator.hasNext();) {
+ Object object2 = (Object) iterator.next();
+ if(object2 instanceof RootModel){
+ children.addAll( ((RootModel)object2).getChildren());
+ }
+ }
for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
AbstractSmooksGraphicalModel child = (AbstractSmooksGraphicalModel) iterator.next();
-// if (child instanceof InputDataContianerModel) {
-// continue;
-// }
- AbstractSmooksGraphicalModel model = findGraphicalModel(child, object);
- if (model != null) {
- return model;
+ if(child instanceof RootModel){
+ AbstractSmooksGraphicalModel result = findSmooksGraphModel((RootModel)child, object);
+ if(result != null) return result;
+ }else{
+ AbstractSmooksGraphicalModel model = findGraphicalModel(child, object);
+ if (model != null) {
+ return model;
+ }
}
}
}
@@ -144,7 +154,12 @@
break;
}
}
- List<AbstractSmooksGraphicalModel> children = graphRoot.getChildren();
+ List<AbstractSmooksGraphicalModel> containers = graphRoot.getChildren();
+ List<AbstractSmooksGraphicalModel> children = new ArrayList<AbstractSmooksGraphicalModel>();
+ for (Iterator<?> iterator = containers.iterator(); iterator.hasNext();) {
+ AbstractSmooksGraphicalModel abstractSmooksGraphicalModel = (AbstractSmooksGraphicalModel) iterator.next();
+ children.addAll(abstractSmooksGraphicalModel.getChildren());
+ }
if (model != null) {
AbstractSmooksGraphicalModel parentGraph = null;
for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksRootEditPart.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksRootEditPart.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksRootEditPart.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -11,6 +11,7 @@
package org.jboss.tools.smooks.graphical.editors.editparts;
import org.eclipse.gef.DefaultEditDomain;
+import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.GraphicalViewer;
import org.eclipse.ui.IEditorPart;
@@ -34,7 +35,14 @@
*/
@Override
protected void createEditPolicies() {
- this.installEditPolicy(EditPolicy.LAYOUT_ROLE, new SmooksRootEditPartLayoutEditPolicy());
+ this.installEditPolicy(EditPolicy.LAYOUT_ROLE, new SmooksRootEditPartLayoutEditPolicy(){
+
+ @Override
+ protected EditPolicy createChildEditPolicy(EditPart child) {
+ return null;
+ }
+
+ });
}
protected IEditorPart getEditorPart() {
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputSourceContainerModel.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputSourceContainerModel.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputSourceContainerModel.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputSourceContainerModel.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,11 @@
+package org.jboss.tools.smooks.graphical.editors.model;
+
+import org.jboss.tools.smooks.gef.common.RootModel;
+
+public class InputSourceContainerModel extends RootModel{
+
+ public InputSourceContainerModel() {
+ super();
+ }
+
+}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/OutputTargetModel.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/OutputTargetModel.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/OutputTargetModel.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/OutputTargetModel.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,18 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.graphical.editors.model;
+
+import org.jboss.tools.smooks.gef.common.RootModel;
+
+/**
+ * @author Dart
+ *
+ */
+public class OutputTargetModel extends RootModel{
+
+ public OutputTargetModel() {
+ super();
+ }
+
+}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerAttrModel.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerAttrModel.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerAttrModel.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -15,7 +15,7 @@
import org.jboss.tools.smooks.configuration.editors.xml.AbstractXMLObject;
import org.jboss.tools.smooks.configuration.editors.xml.TagPropertyObject;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.template.Mapping;
import org.jboss.tools.smooks.templating.template.ValueMapping;
import org.jboss.tools.smooks.templating.template.TemplateBuilder;
@@ -47,7 +47,7 @@
public boolean isRequired() {
Attr element = this.getReferenceAttibute();
if (element != null) {
- return ModelBuilder.isRequired(element);
+ return TemplatingModelBuilder.isRequired(element);
}
return false;
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerModelAnalyzer.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerModelAnalyzer.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerModelAnalyzer.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -24,7 +24,7 @@
import org.jboss.tools.smooks.configuration.editors.xml.TagObject;
import org.jboss.tools.smooks.configuration.editors.xml.TagPropertyObject;
import org.jboss.tools.smooks.configuration.editors.xml.XMLUtils;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -120,7 +120,7 @@
if (element != null) {
Node parentNode = element.getParentNode();
if (parentNode instanceof Element) {
- if (ModelBuilder.isCompositor(parentNode)) {
+ if (TemplatingModelBuilder.isCompositor(parentNode)) {
return true;
}
}
@@ -134,7 +134,7 @@
return null;
boolean canAdd = false;
TagObject tag = null;
- if (ModelBuilder.isCompositor(element)) {
+ if (TemplatingModelBuilder.isCompositor(element)) {
tag = parentTag;
} else {
tag = getChildTagByName(element.getNodeName(), parentTag, ignoreNodeNames);
@@ -207,7 +207,7 @@
localName = name;
}
- if(ModelBuilder.isInReservedNamespace(attr)) {
+ if(TemplatingModelBuilder.isInReservedNamespace(attr)) {
continue;
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateModelLabelProvider.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateModelLabelProvider.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateModelLabelProvider.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -15,7 +15,7 @@
import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
import org.jboss.tools.smooks.configuration.editors.xml.XMLStructuredDataLabelProvider;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -41,7 +41,7 @@
}
Node modelNode = ((FreemarkerTemplateXMLModel) element).getModelNode();
if (((FreemarkerTemplateXMLModel) element).isManyOccurs()) {
- if(modelNode instanceof Element && ModelBuilder.getEnforceCollectionSubMappingRules((Element) modelNode)) {
+ if(modelNode instanceof Element && TemplatingModelBuilder.getEnforceCollectionSubMappingRules((Element) modelNode)) {
return imageRegistry.get(GraphicsConstants.IMAGE_XSL_FOREACH);
}
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateXMLModel.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateXMLModel.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerTemplateXMLModel.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -17,7 +17,7 @@
import org.jboss.tools.smooks.configuration.editors.xml.AbstractXMLObject;
import org.jboss.tools.smooks.configuration.editors.xml.TagObject;
import org.jboss.tools.smooks.configuration.editors.xml.TagPropertyObject;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.template.Mapping;
import org.jboss.tools.smooks.templating.template.ValueMapping;
import org.jboss.tools.smooks.templating.template.TemplateBuilder;
@@ -67,7 +67,7 @@
return false;
}
if (element != null) {
- return ModelBuilder.isRequired(element);
+ return TemplatingModelBuilder.isRequired(element);
}
return false;
}
@@ -75,7 +75,7 @@
public boolean isManyOccurs() {
Element refElement = this.getReferenceElement();
if (refElement != null) {
- return ModelBuilder.isCollection(refElement);
+ return TemplatingModelBuilder.isCollection(refElement);
}
return false;
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/javamapping/JavaBeanChildGraphModel.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -56,7 +56,7 @@
import org.jboss.tools.smooks.model.javabean12.Javabean12Package;
import org.jboss.tools.smooks.model.javabean12.ValueType;
import org.jboss.tools.smooks.model.javabean12.WiringType;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.template.TemplateBuilder;
import org.jboss.tools.smooks.templating.template.ValueMapping;
import org.w3c.dom.Element;
@@ -179,7 +179,7 @@
if (iFreemarkerTemplateModel.isManyOccurs() && pgm.getTargetConnections().isEmpty()) {
Node modelNode = iFreemarkerTemplateModel.getModelNode();
if (modelNode instanceof Element) {
- return !ModelBuilder.getEnforceCollectionSubMappingRules((Element) modelNode);
+ return !TemplatingModelBuilder.getEnforceCollectionSubMappingRules((Element) modelNode);
} else {
return false;
}
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -33,7 +33,7 @@
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateXMLModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerXMLNodeGraphicalModel;
import org.jboss.tools.smooks.model.freemarker.Freemarker;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.model.ModelBuilderException;
import org.jboss.tools.smooks.templating.model.csv.CSVModelBuilder;
import org.jboss.tools.smooks.templating.model.xml.XMLSampleModelBuilder;
@@ -147,7 +147,7 @@
String filePath = SmooksModelUtils.getFreemarkerXMLFilePath(freemarker);
String rootName = SmooksModelUtils.getFreemarkerXMLRootName(freemarker);
String newFilePath = SmooksUIUtils.parseFilePath(filePath);
- ModelBuilder builder;
+ TemplatingModelBuilder builder;
if (SmooksModelUtils.KEY_XML_FILE_TYPE_XSD.equals(fileType)) {
builder = new XSDModelBuilder(URI.createFileURI(newFilePath));
Modified: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java 2010-06-10 15:26:14 UTC (rev 22725)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/SmooksFreemarkerTemplateGraphicalEditor.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -29,7 +29,7 @@
import org.jboss.tools.smooks.graphical.editors.model.freemarker.FreemarkerTemplateGraphicalModel;
import org.jboss.tools.smooks.graphical.editors.model.freemarker.IFreemarkerTemplateModel;
import org.jboss.tools.smooks.model.freemarker.Freemarker;
-import org.jboss.tools.smooks.templating.model.ModelBuilder;
+import org.jboss.tools.smooks.templating.model.TemplatingModelBuilder;
import org.jboss.tools.smooks.templating.template.TemplateBuilder;
import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
import org.w3c.dom.Element;
@@ -163,7 +163,7 @@
if (data instanceof IFreemarkerTemplateModel) {
Node modelNode = ((IFreemarkerTemplateModel) data).getModelNode();
if(modelNode instanceof Element) {
- return ModelBuilder.getEnforceCollectionSubMappingRules((Element) modelNode);
+ return TemplatingModelBuilder.getEnforceCollectionSubMappingRules((Element) modelNode);
}
}
return true;
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures)
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerBorder.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerBorder.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerBorder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,54 +0,0 @@
-/**
- *
- */
-package org.jboss.tools.smooks.graphical.figures;
-
-import org.eclipse.draw2d.AbstractBorder;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
-
-/**
- * @author Dart
- *
- */
-public class ContainerBorder extends AbstractBorder {
- protected static Insets insets = new Insets(2,2,2,2);
- /* (non-Javadoc)
- * @see org.eclipse.draw2d.Border#getInsets(org.eclipse.draw2d.IFigure)
- */
- public Insets getInsets(IFigure figure) {
- return insets;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.draw2d.Border#paint(org.eclipse.draw2d.IFigure, org.eclipse.draw2d.Graphics, org.eclipse.draw2d.geometry.Insets)
- */
- public void paint(IFigure figure, Graphics g, Insets insets) {
- Rectangle r = figure.getBounds().getCropped(insets);
-
- g.setForegroundColor(GraphicsConstants.TB_BG_CORLOR);
- g.setBackgroundColor(GraphicsConstants.TB_BG_CORLOR);
-
- //Draw the sides of the border
- g.fillRectangle(r.x, r.y + 2, r.width, 6);
- g.fillRectangle(r.x, r.bottom() - 8, r.width, 6);
- g.fillRectangle(r.x, r.y + 2, 6, r.height - 4);
- g.fillRectangle(r.right() - 6, r.y + 2, 6, r.height - 4);
-
-// //Outline the border
-// g.setForegroundColor(ColorConstants.red);
-// g.drawLine(r.x, r.y + 2, r.right() - 1, r.y + 2);
-// g.drawLine(r.x, r.bottom() - 3, r.right() - 1, r.bottom() - 3);
-// g.drawLine(r.x, r.y + 2, r.x, r.bottom() - 3);
-// g.drawLine(r.right() - 1, r.bottom() - 3, r.right() - 1, r.y + 2);
-//
-// r.crop(new Insets(1, 1, 0, 0));
-// r.expand(1, 1);
-// r.crop(getInsets(figure));
- }
-
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerBorder.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerBorder.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerBorder.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerBorder.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,54 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.graphical.figures;
+
+import org.eclipse.draw2d.AbstractBorder;
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Insets;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
+
+/**
+ * @author Dart
+ *
+ */
+public class ContainerBorder extends AbstractBorder {
+ protected static Insets insets = new Insets(2,2,2,2);
+ /* (non-Javadoc)
+ * @see org.eclipse.draw2d.Border#getInsets(org.eclipse.draw2d.IFigure)
+ */
+ public Insets getInsets(IFigure figure) {
+ return insets;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.draw2d.Border#paint(org.eclipse.draw2d.IFigure, org.eclipse.draw2d.Graphics, org.eclipse.draw2d.geometry.Insets)
+ */
+ public void paint(IFigure figure, Graphics g, Insets insets) {
+ Rectangle r = figure.getBounds().getCropped(insets);
+
+ g.setForegroundColor(GraphicsConstants.TB_BG_CORLOR);
+ g.setBackgroundColor(GraphicsConstants.TB_BG_CORLOR);
+
+ //Draw the sides of the border
+ g.fillRectangle(r.x, r.y + 2, r.width, 6);
+ g.fillRectangle(r.x, r.bottom() - 8, r.width, 6);
+ g.fillRectangle(r.x, r.y + 2, 6, r.height - 4);
+ g.fillRectangle(r.right() - 6, r.y + 2, 6, r.height - 4);
+
+// //Outline the border
+// g.setForegroundColor(ColorConstants.red);
+// g.drawLine(r.x, r.y + 2, r.right() - 1, r.y + 2);
+// g.drawLine(r.x, r.bottom() - 3, r.right() - 1, r.bottom() - 3);
+// g.drawLine(r.x, r.y + 2, r.x, r.bottom() - 3);
+// g.drawLine(r.right() - 1, r.bottom() - 3, r.right() - 1, r.y + 2);
+//
+// r.crop(new Insets(1, 1, 0, 0));
+// r.expand(1, 1);
+// r.crop(getInsets(figure));
+ }
+
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerFigure.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerFigure.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerFigure.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,59 +0,0 @@
-/**
- *
- */
-package org.jboss.tools.smooks.graphical.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.FreeformViewport;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author Dart
- *
- */
-public class ContainerFigure extends Figure {
-
- private FreeformLayer pane;
-
-
-
- public ContainerFigure() {
- super();
- this.setBorder(new ContainerBorder());
- ScrollPane scrollpane = new ScrollPane();
- pane = new FreeformLayer();
- pane.setLayoutManager(new FreeformLayout());
- setLayoutManager(new StackLayout());
- add(scrollpane);
- scrollpane.setViewport(new FreeformViewport());
- scrollpane.setContents(pane);
-
- setBackgroundColor(ColorConstants.listBackground);
- setOpaque(true);
- }
-
- public IFigure getContentsPane(){
- return pane;
- }
-
- @Override
- public Dimension getPreferredSize(int wHint, int hHint) {
- return new Dimension(400,500);
- }
-
- protected void paintFigure(Graphics graphics) {
- Rectangle rect = getBounds().getCopy();
- rect.crop(new Insets(2,0,2,0));
- graphics.fillRectangle(rect);
- }
-
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerFigure.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerFigure.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerFigure.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/ContainerFigure.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,59 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.graphical.figures;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.Figure;
+import org.eclipse.draw2d.FreeformLayer;
+import org.eclipse.draw2d.FreeformLayout;
+import org.eclipse.draw2d.FreeformViewport;
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.ScrollPane;
+import org.eclipse.draw2d.StackLayout;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Insets;
+import org.eclipse.draw2d.geometry.Rectangle;
+
+/**
+ * @author Dart
+ *
+ */
+public class ContainerFigure extends Figure {
+
+ private FreeformLayer pane;
+
+
+
+ public ContainerFigure() {
+ super();
+ this.setBorder(new ContainerBorder());
+ ScrollPane scrollpane = new ScrollPane();
+ pane = new FreeformLayer();
+ pane.setLayoutManager(new FreeformLayout());
+ setLayoutManager(new StackLayout());
+ add(scrollpane);
+ scrollpane.setViewport(new FreeformViewport());
+ scrollpane.setContents(pane);
+
+ setBackgroundColor(ColorConstants.listBackground);
+ setOpaque(true);
+ }
+
+ public IFigure getContentsPane(){
+ return pane;
+ }
+
+ @Override
+ public Dimension getPreferredSize(int wHint, int hHint) {
+ return new Dimension(400,500);
+ }
+
+ protected void paintFigure(Graphics graphics) {
+ Rectangle rect = getBounds().getCopy();
+ rect.crop(new Insets(2,0,2,0));
+ graphics.fillRectangle(rect);
+ }
+
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/FillLayout.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/FillLayout.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/FillLayout.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,66 +0,0 @@
-/**
- *
- */
-package org.jboss.tools.smooks.graphical.figures;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @author Dart
- *
- */
-public class FillLayout extends AbstractLayout {
-
- private Control canvas;
-
- public FillLayout(Control canvas) {
- this.canvas = canvas;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.draw2d.AbstractLayout#calculatePreferredSize(org.eclipse.
- * draw2d.IFigure, int, int)
- */
- @Override
- protected Dimension calculatePreferredSize(IFigure container, int wHint, int hHint) {
- return container.getPreferredSize(wHint, hHint);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.LayoutManager#layout(org.eclipse.draw2d.IFigure)
- */
- public void layout(IFigure container) {
- List<?> children = container.getChildren();
- for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
- IFigure child = (IFigure) iterator.next();
-
- Rectangle rect = container.getBounds();// getClientArea(Rectangle.SINGLETON);
- if (canvas != null) {
- rect = new Rectangle(canvas.getBounds().x, canvas.getBounds().y, canvas.getBounds().width, canvas.getBounds().height);
- }
- int cw = rect.width / 3 ;
- int ch = rect.height - 60 ;
- cw = Math.min(cw, 800);
- ch = Math.min(ch, 800);
- int x = 30;
- int y = 30;
- if (child instanceof TargetContainerFigure) {
- x = cw*2 - 30;
- }
- child.setBounds(new Rectangle(x, y, cw, ch));
- }
- }
-
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/FillLayout.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/FillLayout.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/FillLayout.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/FillLayout.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,66 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.graphical.figures;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.draw2d.AbstractLayout;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * @author Dart
+ *
+ */
+public class FillLayout extends AbstractLayout {
+
+ private Control canvas;
+
+ public FillLayout(Control canvas) {
+ this.canvas = canvas;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.draw2d.AbstractLayout#calculatePreferredSize(org.eclipse.
+ * draw2d.IFigure, int, int)
+ */
+ @Override
+ protected Dimension calculatePreferredSize(IFigure container, int wHint, int hHint) {
+ return container.getPreferredSize(wHint, hHint);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.draw2d.LayoutManager#layout(org.eclipse.draw2d.IFigure)
+ */
+ public void layout(IFigure container) {
+ List<?> children = container.getChildren();
+ for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
+ IFigure child = (IFigure) iterator.next();
+
+ Rectangle rect = container.getBounds();// getClientArea(Rectangle.SINGLETON);
+ if (canvas != null) {
+ rect = new Rectangle(canvas.getBounds().x, canvas.getBounds().y, canvas.getBounds().width, canvas.getBounds().height);
+ }
+ int cw = rect.width / 3 ;
+ int ch = rect.height - 60 ;
+ cw = Math.min(cw, 800);
+ ch = Math.min(ch, 800);
+ int x = 30;
+ int y = 30;
+ if (child instanceof TargetContainerFigure) {
+ x = cw*2 - 30;
+ }
+ child.setBounds(new Rectangle(x, y, cw, ch));
+ }
+ }
+
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/SourceContainerFigure.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/SourceContainerFigure.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/SourceContainerFigure.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,12 +0,0 @@
-/**
- *
- */
-package org.jboss.tools.smooks.graphical.figures;
-
-/**
- * @author Dart
- *
- */
-public class SourceContainerFigure extends ContainerFigure {
-
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/SourceContainerFigure.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/SourceContainerFigure.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/SourceContainerFigure.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/SourceContainerFigure.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,12 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.graphical.figures;
+
+/**
+ * @author Dart
+ *
+ */
+public class SourceContainerFigure extends ContainerFigure {
+
+}
Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/TargetContainerFigure.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/TargetContainerFigure.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/TargetContainerFigure.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,12 +0,0 @@
-/**
- *
- */
-package org.jboss.tools.smooks.graphical.figures;
-
-/**
- * @author Dart
- *
- */
-public class TargetContainerFigure extends ContainerFigure {
-
-}
Copied: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/TargetContainerFigure.java (from rev 22724, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/TargetContainerFigure.java)
===================================================================
--- branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/TargetContainerFigure.java (rev 0)
+++ branches/smooks-dmb/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/figures/TargetContainerFigure.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,12 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.graphical.figures;
+
+/**
+ * @author Dart
+ *
+ */
+public class TargetContainerFigure extends ContainerFigure {
+
+}
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.classpath
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/.classpath 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.classpath 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.1.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.classpath (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/.classpath)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.classpath (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.classpath 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.1.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/.project 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.jboss.tools.smooks.model.test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/.project)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.project 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.smooks.model.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.settings (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/.settings)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/.settings/org.eclipse.jdt.core.prefs 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.settings/org.eclipse.jdt.core.prefs 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,8 +0,0 @@
-#Fri Dec 11 09:53:23 MST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.settings/org.eclipse.jdt.core.prefs (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/.settings/org.eclipse.jdt.core.prefs 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,8 @@
+#Fri Dec 11 09:53:23 MST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/META-INF)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.jboss.tools.smooks.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.jboss.tools.smooks.runtime,
- org.eclipse.core.runtime,
- org.jboss.tools.smooks.model
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/META-INF/MANIFEST.MF 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name.0
+Bundle-SymbolicName: org.jboss.tools.smooks.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.jboss.tools.smooks.runtime,
+ org.eclipse.core.runtime,
+ org.jboss.tools.smooks.model
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/build.properties
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/build.properties 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/build.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,7 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
- plugin.properties,\
- projects/,\
- lib/xmlunit-1.1.jar,\
- .
-source.. = src/
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/build.properties (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/build.properties)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/build.properties (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/build.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,7 @@
+output.. = bin/
+bin.includes = META-INF/,\
+ plugin.properties,\
+ projects/,\
+ lib/xmlunit-1.1.jar,\
+ .
+source.. = src/
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/lib (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/lib)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/lib/xmlunit-1.1.jar
===================================================================
(Binary files differ)
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/lib/xmlunit-1.1.jar (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/lib/xmlunit-1.1.jar)
===================================================================
(Binary files differ)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/plugin.properties
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/plugin.properties 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/plugin.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,3 +0,0 @@
-#Properties file for org.jboss.tools.smooks.test
-Bundle-Vendor.0 = JBoss by Red Hat
-Bundle-Name.0 = Smooks Tools Model Test Plug-in
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/plugin.properties (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/plugin.properties)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/plugin.properties (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/plugin.properties 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,3 @@
+#Properties file for org.jboss.tools.smooks.test
+Bundle-Vendor.0 = JBoss by Red Hat
+Bundle-Name.0 = Smooks Tools Model Test Plug-in
\ No newline at end of file
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/pom.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/pom.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/pom.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,14 +0,0 @@
-<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.model.test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/pom.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/pom.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/pom.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/pom.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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.model.test</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/resources (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/resources)
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src)
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org)
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss)
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools)
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks)
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,70 +0,0 @@
-/**
- * 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.SmooksModelBuilder;
-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 at jboss.com">tom.fennelly at jboss.com</a>
- */
-public abstract class SmooksModelTestCase extends TestCase {
-
- protected SmooksModelBuilder smooksModelBuilder;
-
- public SmooksModelTestCase() throws IOException, SAXException {
- smooksModelBuilder = new SmooksModelBuilder();
- }
-
- public SmooksModelBuilder getSmooksModelBuilder() {
- return smooksModelBuilder;
- }
-
- public void setReportPath(String reportPath) {
- smooksModelBuilder.getModelBuilder().setReportPath(reportPath);
- }
-
- 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);
- XMLUnit.setIgnoreWhitespace( true );
- XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString()));
- }
-}
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java (from rev 22724, workspace/smooks-dmb/smooks/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 (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/SmooksModelTestCase.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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;
+
+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.SmooksModelBuilder;
+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 at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public abstract class SmooksModelTestCase extends TestCase {
+
+ protected SmooksModelBuilder smooksModelBuilder;
+
+ public SmooksModelTestCase() throws IOException, SAXException {
+ smooksModelBuilder = new SmooksModelBuilder();
+ }
+
+ public SmooksModelBuilder getSmooksModelBuilder() {
+ return smooksModelBuilder;
+ }
+
+ public void setReportPath(String reportPath) {
+ smooksModelBuilder.getModelBuilder().setReportPath(reportPath);
+ }
+
+ 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);
+ XMLUnit.setIgnoreWhitespace( true );
+ XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream(messageFile)), new StringReader(modelWriter.toString()));
+ }
+}
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,74 +0,0 @@
-/**
- * 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 at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class ParamsTest extends SmooksModelTestCase {
-
- public ParamsTest() throws IOException, SAXException {
- super();
- }
-
- public void test_manual() {
- Params params = new Params();
- 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");
-
- Params 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");
-
- Params params = model.getModelRoot().getParams();
-
- assertTrue(params.getFilterType() == StreamFilterType.DOM);
-
- params.setFilterType(StreamFilterType.SAX);
- assertModelEquals(model, "v1_1/config-01.xml");
- }
-}
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java (from rev 22724, workspace/smooks-dmb/smooks/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 (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/ParamsTest.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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 at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class ParamsTest extends SmooksModelTestCase {
+
+ public ParamsTest() throws IOException, SAXException {
+ super();
+ }
+
+ public void test_manual() {
+ Params params = new Params();
+ 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");
+
+ Params 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");
+
+ Params params = model.getModelRoot().getParams();
+
+ assertTrue(params.getFilterType() == StreamFilterType.DOM);
+
+ params.setFilterType(StreamFilterType.SAX);
+ assertModelEquals(model, "v1_1/config-01.xml");
+ }
+}
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1 (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,10 +0,0 @@
-<?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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,10 +0,0 @@
-<?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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/core/v1_1/config-02.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,93 +0,0 @@
-/**
- * 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.csv;
-
-import org.custommonkey.xmlunit.XMLAssert;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.jboss.tools.smooks.model.SmooksModel;
-import org.jboss.tools.smooks.model.SmooksModelTestCase;
-import org.milyn.javabean.dynamic.Model;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-/**
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class CSVReader_1_2_Test extends SmooksModelTestCase {
-
- public CSVReader_1_2_Test() throws IOException, SAXException {
- super();
- }
-
- public void test_01() throws IOException, SAXException {
- test("v1_2/csv-config-01.xml");
- }
-
- public void test_02() throws IOException, SAXException {
- test("v1_2/csv-config-02.xml");
- }
-
- public void test_03() throws IOException, SAXException {
- test("v1_2/csv-config-03.xml");
- }
-
- public void test_04() throws IOException, SAXException {
- test("v1_2/csv-config-04.xml");
- }
-
- public void test_programmatic_build() throws IOException, SAXException {
- SmooksModel smooksModel = new SmooksModel();
- Model<SmooksModel> model = new Model<SmooksModel>(smooksModel, getSmooksModelBuilder().getModelBuilder());
- CSVReader csvReader = new CSVReader();
-
- // Populate it...
- csvReader.setFields("name,address,age");
- csvReader.setRootElementName("people");
- csvReader.setRecordElementName("person");
- csvReader.setIndent(true);
-
- // Set strict on the model... should have no effect as it's not supported in v1.2...
- csvReader.setStrict(true);
-
- // Need to register all the "namespace root" bean instances...
- model.registerBean(csvReader).setNamespace("http://www.milyn.org/xsd/smooks/csv-1.2.xsd").setNamespacePrefix("csv12");
-
- // Add it in the appropriate place in the object graph....
- smooksModel.getReaders().add(csvReader);
-
- ListBinding listBinding = new ListBinding();
- listBinding.setBeanId("beanX");
- listBinding.setBeanClass("com.acme.XClass");
-
- // Add the ListBinding to the CSVReader, but no need to add it to the model since it is
- // not a "namespace root" object...
- csvReader.setListBinding(listBinding);
-
- StringWriter modelWriter = new StringWriter();
- model.writeModel(modelWriter);
-// System.out.println(modelWriter);
- XMLUnit.setIgnoreWhitespace( true );
- XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream("v1_2/csv-config-03.xml")), new StringReader(modelWriter.toString()));
- }
-}
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,93 @@
+/**
+ * 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.csv;
+
+import org.custommonkey.xmlunit.XMLAssert;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.jboss.tools.smooks.model.SmooksModel;
+import org.jboss.tools.smooks.model.SmooksModelTestCase;
+import org.milyn.javabean.dynamic.Model;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+/**
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class CSVReader_1_2_Test extends SmooksModelTestCase {
+
+ public CSVReader_1_2_Test() throws IOException, SAXException {
+ super();
+ }
+
+ public void test_01() throws IOException, SAXException {
+ test("v1_2/csv-config-01.xml");
+ }
+
+ public void test_02() throws IOException, SAXException {
+ test("v1_2/csv-config-02.xml");
+ }
+
+ public void test_03() throws IOException, SAXException {
+ test("v1_2/csv-config-03.xml");
+ }
+
+ public void test_04() throws IOException, SAXException {
+ test("v1_2/csv-config-04.xml");
+ }
+
+ public void test_programmatic_build() throws IOException, SAXException {
+ SmooksModel smooksModel = new SmooksModel();
+ Model<SmooksModel> model = new Model<SmooksModel>(smooksModel, getSmooksModelBuilder().getModelBuilder());
+ CSVReader csvReader = new CSVReader();
+
+ // Populate it...
+ csvReader.setFields("name,address,age");
+ csvReader.setRootElementName("people");
+ csvReader.setRecordElementName("person");
+ csvReader.setIndent(true);
+
+ // Set strict on the model... should have no effect as it's not supported in v1.2...
+ csvReader.setStrict(true);
+
+ // Need to register all the "namespace root" bean instances...
+ model.registerBean(csvReader).setNamespace("http://www.milyn.org/xsd/smooks/csv-1.2.xsd").setNamespacePrefix("csv12");
+
+ // Add it in the appropriate place in the object graph....
+ smooksModel.getReaders().add(csvReader);
+
+ ListBinding listBinding = new ListBinding();
+ listBinding.setBeanId("beanX");
+ listBinding.setBeanClass("com.acme.XClass");
+
+ // Add the ListBinding to the CSVReader, but no need to add it to the model since it is
+ // not a "namespace root" object...
+ csvReader.setListBinding(listBinding);
+
+ StringWriter modelWriter = new StringWriter();
+ model.writeModel(modelWriter);
+// System.out.println(modelWriter);
+ XMLUnit.setIgnoreWhitespace( true );
+ XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream("v1_2/csv-config-03.xml")), new StringReader(modelWriter.toString()));
+ }
+}
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,94 +0,0 @@
-/**
- * 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.csv;
-
-import org.custommonkey.xmlunit.XMLAssert;
-import org.custommonkey.xmlunit.XMLUnit;
-import org.jboss.tools.smooks.model.SmooksModel;
-import org.jboss.tools.smooks.model.SmooksModelTestCase;
-import org.milyn.javabean.dynamic.Model;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-/**
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class CSVReader_1_3_Test extends SmooksModelTestCase {
-
- public CSVReader_1_3_Test() throws IOException, SAXException {
- super();
- }
-
- public void test_01() throws IOException, SAXException {
- test("v1_3/csv-config-01.xml");
- }
-
- public void test_02() throws IOException, SAXException {
- test("v1_3/csv-config-02.xml");
- }
-
- public void test_03() throws IOException, SAXException {
- test("v1_3/csv-config-03.xml");
- }
-
- public void test_04() throws IOException, SAXException {
- test("v1_3/csv-config-04.xml");
- }
-
- public void test_05() throws IOException, SAXException {
- test("v1_3/csv-config-05.xml");
- }
-
- public void test_programmatic_build() throws IOException, SAXException {
- SmooksModel smooksModel = new SmooksModel();
- Model<SmooksModel> model = new Model<SmooksModel>(smooksModel, getSmooksModelBuilder().getModelBuilder());
- CSVReader csvReader = new CSVReader();
-
- // Populate it...
- csvReader.setFields("name,address,age");
- csvReader.setRootElementName("people");
- csvReader.setRecordElementName("person");
- csvReader.setIndent(true);
-
- // Need to register all the "namespace root" bean instances...
- model.registerBean(csvReader);
-
- // Add it in the appropriate place in the object graph....
- smooksModel.getReaders().add(csvReader);
-
- ListBinding listBinding = new ListBinding();
- listBinding.setBeanId("beanX");
- listBinding.setBeanClass("com.acme.XClass");
-
- // Add the ListBinding to the CSVReader, but no need to add it to the model since it is
- // not a "namespace root" object...
- csvReader.setListBinding(listBinding);
-
- StringWriter modelWriter = new StringWriter();
- model.writeModel(modelWriter);
-// System.out.println(modelWriter);
- XMLUnit.setIgnoreWhitespace( true );
- XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream("v1_3/csv-config-03.xml")), new StringReader(modelWriter.toString()));
- }
-}
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,94 @@
+/**
+ * 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.csv;
+
+import org.custommonkey.xmlunit.XMLAssert;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.jboss.tools.smooks.model.SmooksModel;
+import org.jboss.tools.smooks.model.SmooksModelTestCase;
+import org.milyn.javabean.dynamic.Model;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
+/**
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class CSVReader_1_3_Test extends SmooksModelTestCase {
+
+ public CSVReader_1_3_Test() throws IOException, SAXException {
+ super();
+ }
+
+ public void test_01() throws IOException, SAXException {
+ test("v1_3/csv-config-01.xml");
+ }
+
+ public void test_02() throws IOException, SAXException {
+ test("v1_3/csv-config-02.xml");
+ }
+
+ public void test_03() throws IOException, SAXException {
+ test("v1_3/csv-config-03.xml");
+ }
+
+ public void test_04() throws IOException, SAXException {
+ test("v1_3/csv-config-04.xml");
+ }
+
+ public void test_05() throws IOException, SAXException {
+ test("v1_3/csv-config-05.xml");
+ }
+
+ public void test_programmatic_build() throws IOException, SAXException {
+ SmooksModel smooksModel = new SmooksModel();
+ Model<SmooksModel> model = new Model<SmooksModel>(smooksModel, getSmooksModelBuilder().getModelBuilder());
+ CSVReader csvReader = new CSVReader();
+
+ // Populate it...
+ csvReader.setFields("name,address,age");
+ csvReader.setRootElementName("people");
+ csvReader.setRecordElementName("person");
+ csvReader.setIndent(true);
+
+ // Need to register all the "namespace root" bean instances...
+ model.registerBean(csvReader);
+
+ // Add it in the appropriate place in the object graph....
+ smooksModel.getReaders().add(csvReader);
+
+ ListBinding listBinding = new ListBinding();
+ listBinding.setBeanId("beanX");
+ listBinding.setBeanClass("com.acme.XClass");
+
+ // Add the ListBinding to the CSVReader, but no need to add it to the model since it is
+ // not a "namespace root" object...
+ csvReader.setListBinding(listBinding);
+
+ StringWriter modelWriter = new StringWriter();
+ model.writeModel(modelWriter);
+// System.out.println(modelWriter);
+ XMLUnit.setIgnoreWhitespace( true );
+ XMLAssert.assertXMLEqual(new InputStreamReader(getClass().getResourceAsStream("v1_3/csv-config-03.xml")), new StringReader(modelWriter.toString()));
+ }
+}
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2 (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
- xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
-
- <params>
- <param name="stream.filter.type">SAX</param>
- </params>
-
- <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true"/>
-
-</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
+
+ <params>
+ <param name="stream.filter.type">SAX</param>
+ </params>
+
+ <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true"/>
+
+</smooks-resource-list>
\ No newline at end of file
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-02.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-02.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-02.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
- xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
-
- <!-- CSV Reader config... -->
- <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
- <csv:singleBinding beanId="beanX" class="com.acme.XClass" />
- </csv:reader>
-
-</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-02.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-02.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-02.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-02.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
+
+ <!-- CSV Reader config... -->
+ <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
+ <csv:singleBinding beanId="beanX" class="com.acme.XClass" />
+ </csv:reader>
+
+</smooks-resource-list>
\ No newline at end of file
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-03.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-03.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-03.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
- xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
-
- <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
- <csv:listBinding beanId="beanX" class="com.acme.XClass" />
- </csv:reader>
-
-</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-03.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-03.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-03.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-03.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
+
+ <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
+ <csv:listBinding beanId="beanX" class="com.acme.XClass" />
+ </csv:reader>
+
+</smooks-resource-list>
\ No newline at end of file
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
- xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
-
- <!-- params... -->
- <params>
- <param name="stream.filter.type">DOM</param>
- <!-- x... -->
- <param name="x">xxx</param>
- </params>
-
- <!-- CSV Reader config... -->
- <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
- <csv:mapBinding beanId="beanX" class="com.acme.XClass" keyField="name" />
- </csv:reader>
-
-</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_2/csv-config-04.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.2.xsd">
+
+ <!-- params... -->
+ <params>
+ <param name="stream.filter.type">DOM</param>
+ <!-- x... -->
+ <param name="x">xxx</param>
+ </params>
+
+ <!-- CSV Reader config... -->
+ <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
+ <csv:mapBinding beanId="beanX" class="com.acme.XClass" keyField="name" />
+ </csv:reader>
+
+</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3 (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-01.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-01.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
- xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.3.xsd">
-
- <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true"/>
-
-</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-01.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-01.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-01.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.3.xsd">
+
+ <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true"/>
+
+</smooks-resource-list>
\ No newline at end of file
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-02.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-02.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-02.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
- xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.3.xsd">
-
- <!-- CSV Reader config... -->
- <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
- <csv:singleBinding beanId="beanX" class="com.acme.XClass" />
- </csv:reader>
-
-</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-02.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-02.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-02.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-02.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.3.xsd">
+
+ <!-- CSV Reader config... -->
+ <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
+ <csv:singleBinding beanId="beanX" class="com.acme.XClass" />
+ </csv:reader>
+
+</smooks-resource-list>
\ No newline at end of file
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-03.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-03.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-03.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
- xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.3.xsd">
-
- <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
- <csv:listBinding beanId="beanX" class="com.acme.XClass" />
- </csv:reader>
-
-</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-03.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-03.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-03.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-03.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.3.xsd">
+
+ <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
+ <csv:listBinding beanId="beanX" class="com.acme.XClass" />
+ </csv:reader>
+
+</smooks-resource-list>
\ No newline at end of file
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
- xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.3.xsd">
-
- <params>
- <param name="stream.filter.type">SAX</param>
- </params>
-
- <!-- CSV Reader config... -->
- <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
- <csv:mapBinding beanId="beanX" class="com.acme.XClass" keyField="name" />
- </csv:reader>
-
-</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-04.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
+ xmlns:csv="http://www.milyn.org/xsd/smooks/csv-1.3.xsd">
+
+ <params>
+ <param name="stream.filter.type">SAX</param>
+ </params>
+
+ <!-- CSV Reader config... -->
+ <csv:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
+ <csv:mapBinding beanId="beanX" class="com.acme.XClass" keyField="name" />
+ </csv:reader>
+
+</smooks-resource-list>
\ No newline at end of file
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-05.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-05.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-05.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.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">
-
- <!-- Mixing configs from 2 versions of the same namespace... -->
-
- <!-- 1.2 config -->
- <csv12:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
- <csv12:mapBinding beanId="beanX" class="com.acme.XClass" keyField="name" />
- </csv12:reader>
-
- <!-- 1.3 config -->
- <csv13:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
- <csv13:mapBinding beanId="beanX" class="com.acme.XClass" keyField="name" />
- </csv13:reader>
-
-</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-05.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-05.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-05.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/v1_3/csv-config-05.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.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">
+
+ <!-- Mixing configs from 2 versions of the same namespace... -->
+
+ <!-- 1.2 config -->
+ <csv12:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
+ <csv12:mapBinding beanId="beanX" class="com.acme.XClass" keyField="name" />
+ </csv12:reader>
+
+ <!-- 1.3 config -->
+ <csv13:reader fields="name,address,age" rootElementName="people" recordElementName="person" indent="true">
+ <csv13:mapBinding beanId="beanX" class="com.acme.XClass" keyField="name" />
+ </csv13:reader>
+
+</smooks-resource-list>
\ No newline at end of file
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,57 +0,0 @@
-/**
- * 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 at gmail.com">tom.fennelly at gmail.com</a>
- */
-public class BeanTest extends SmooksModelTestCase {
-
- public BeanTest() throws IOException, SAXException {
- super();
- }
-
- 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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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.javabean;
+
+import org.jboss.tools.smooks.model.SmooksModelTestCase;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+public class BeanTest extends SmooksModelTestCase {
+
+ public BeanTest() throws IOException, SAXException {
+ super();
+ }
+
+ 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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1 (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,55 +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.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">
- <jb:wiring property="header" beanIdRef="header" />
- <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">
- <jb:value property="date" decoder="Date" data="header/date" dataNS="http://boohoo">
- <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" />
- <jb:value property="customerName" data="header/customer" />
- <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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_1/config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,55 @@
+<?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">
+ <jb:wiring property="header" beanIdRef="header" />
+ <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">
+ <jb:value property="date" decoder="Date" data="header/date" dataNS="http://boohoo">
+ <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" />
+ <jb:value property="customerName" data="header/customer" />
+ <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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2 (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,55 +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.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">
- <jb:wiring property="header" beanIdRef="header" />
- <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">
- <jb:value property="date" decoder="Date" data="header/date" dataNS="http://boohoo">
- <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" />
- <jb:value property="customerName" data="header/customer" />
- <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" />
- <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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,55 @@
+<?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">
+ <jb:wiring property="header" beanIdRef="header" />
+ <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">
+ <jb:value property="date" decoder="Date" data="header/date" dataNS="http://boohoo">
+ <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" />
+ <jb:value property="customerName" data="header/customer" />
+ <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" />
+ <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
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,28 +0,0 @@
-<?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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_2/config-02.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3 (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3)
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,55 +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.3.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">
- <jb:wiring property="header" beanIdRef="header" />
- <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">
- <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" />
- <jb:value property="customerName" data="header/customer" />
- <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" />
- <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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-01.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -0,0 +1,55 @@
+<?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"
+ 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">
+ <jb:wiring property="header" beanIdRef="header" />
+ <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">
+ <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" />
+ <jb:value property="customerName" data="header/customer" />
+ <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" />
+ <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
Deleted: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml 2010-06-10 15:12:46 UTC (rev 22724)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -1,41 +0,0 @@
-<?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
Copied: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml (from rev 22724, workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml)
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml (rev 0)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/v1_3/config-02.xml 2010-06-10 15:48:17 UTC (rev 22726)
@@ -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
More information about the jbosstools-commits
mailing list