[jbosstools-commits] JBoss Tools SVN: r22579 - in workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model: src/org/jboss/tools/smooks/model and 6 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Sat Jun 5 04:24:46 EDT 2010
Author: tfennelly
Date: 2010-06-05 04:24:45 -0400 (Sat, 05 Jun 2010)
New Revision: 22579
Added:
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties
Removed:
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/META-INF/org/
Modified:
workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/SmooksModel.java
workspace/smooks-dmb/smooks/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/csv/v1_2/v1.2.xml
workspace/smooks-dmb/smooks/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/javabean/v1_1/v1.1.xml
workspace/smooks-dmb/smooks/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_3/v1.3.xml
Log:
fixed tests
Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/SmooksModel.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/SmooksModel.java 2010-06-05 08:04:44 UTC (rev 22578)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/SmooksModel.java 2010-06-05 08:24:45 UTC (rev 22579)
@@ -33,7 +33,7 @@
@DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks-1.1.xsd")
public class SmooksModel {
- public static final String MODEL_DESCRIPTOR = "META-INF/org/jboss/tools/smooks/model/descriptor.properties";
+ public static final String MODEL_DESCRIPTOR = "org/jboss/tools/smooks/model/descriptor.properties";
private List<Reader> readers = new ArrayList<Reader>();
private List<Bean> beans = new ArrayList<Bean>();
Modified: workspace/smooks-dmb/smooks/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-05 08:04:44 UTC (rev 22578)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/v1.1.xml 2010-06-05 08:24:45 UTC (rev 22579)
@@ -6,15 +6,15 @@
<!--
Main Smooks model bean.
-->
- <jb:bean beanId="smooksModel" class="org.smooks.model.core.SmooksModel" createOnElement="#document">
+ <jb:bean beanId="smooksModel" class="org.jboss.tools.smooks.model.core.SmooksModel" createOnElement="#document">
<jb:wiring property="readers" beanIdRef="readers" />
<jb:wiring property="beans" beanIdRef="beans" />
</jb:bean>
<jb:bean beanId="readers" class="java.util.ArrayList" createOnElement="#document">
- <jb:wiring beanType="org.smooks.model.core.Reader" />
+ <jb:wiring beanType="org.jboss.tools.smooks.model.core.Reader" />
</jb:bean>
<jb:bean beanId="beans" class="java.util.ArrayList" createOnElement="#document">
- <jb:wiring beanType="org.smooks.model.javabean.Bean" />
+ <jb:wiring beanType="org.jboss.tools.smooks.model.javabean.Bean" />
</jb:bean>
<!--
Modified: workspace/smooks-dmb/smooks/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-05 08:04:44 UTC (rev 22578)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_2/v1.2.xml 2010-06-05 08:24:45 UTC (rev 22579)
@@ -5,7 +5,7 @@
<!-- Binding configs (unmarshal)... -->
- <jb:bean beanId="csvReader" class="org.smooks.model.csv.CSVReader" createOnElement="reader">
+ <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" />
@@ -19,15 +19,15 @@
<jb:wiring property="listBinding" beanIdRef="listBinding" />
<jb:wiring property="mapBinding" beanIdRef="mapBinding" />
</jb:bean>
- <jb:bean beanId="singleBinding" class="org.smooks.model.csv.SingleBinding" createOnElement="reader/singleBinding">
+ <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.smooks.model.csv.ListBinding" createOnElement="reader/listBinding">
+ <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.smooks.model.csv.MapBinding" createOnElement="reader/mapBinding">
+ <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" />
Modified: workspace/smooks-dmb/smooks/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-05 08:04:44 UTC (rev 22578)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/csv/v1_3/v1.3.xml 2010-06-05 08:24:45 UTC (rev 22579)
@@ -5,7 +5,7 @@
<!-- Binding configs (unmarshal)... -->
- <jb:bean beanId="csvReader" class="org.smooks.model.csv.CSVReader" createOnElement="reader">
+ <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" />
@@ -21,15 +21,15 @@
<jb:wiring property="listBinding" beanIdRef="listBinding" />
<jb:wiring property="mapBinding" beanIdRef="mapBinding" />
</jb:bean>
- <jb:bean beanId="singleBinding" class="org.smooks.model.csv.SingleBinding" createOnElement="reader/singleBinding">
+ <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.smooks.model.csv.ListBinding" createOnElement="reader/listBinding">
+ <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.smooks.model.csv.MapBinding" createOnElement="reader/mapBinding">
+ <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" />
Added: workspace/smooks-dmb/smooks/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 (rev 0)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/descriptor.properties 2010-06-05 08:24:45 UTC (rev 22579)
@@ -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
Modified: workspace/smooks-dmb/smooks/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-05 08:04:44 UTC (rev 22578)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_1/v1.1.xml 2010-06-05 08:24:45 UTC (rev 22579)
@@ -5,7 +5,7 @@
<!-- Binding configs (unmarshal)... -->
- <jb:bean beanId="javaBean" class="org.smooks.model.javabean.Bean" createOnElement="bindings">
+ <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" />
@@ -19,7 +19,7 @@
<jb:bean beanId="valueBindings" class="java.util.ArrayList" createOnElement="bindings">
<jb:wiring beanIdRef="valueBinding" />
</jb:bean>
- <jb:bean beanId="valueBinding" class="org.smooks.model.javabean.Value" createOnElement="bindings/value">
+ <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" />
@@ -31,7 +31,7 @@
<jb:bean beanId="decodeParams" class="java.util.ArrayList" createOnElement="bindings/value">
<jb:wiring beanIdRef="decodeParam" />
</jb:bean>
- <jb:bean beanId="decodeParam" class="org.smooks.model.javabean.DecodeParam" createOnElement="bindings/value/decodeParam">
+ <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>
@@ -39,7 +39,7 @@
<jb:bean beanId="expressionBindings" class="java.util.ArrayList" createOnElement="bindings">
<jb:wiring beanIdRef="expressionBinding" />
</jb:bean>
- <jb:bean beanId="expressionBinding" class="org.smooks.model.javabean.Expression" createOnElement="bindings/expression">
+ <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" />
@@ -50,7 +50,7 @@
<jb:bean beanId="wireBindings" class="java.util.ArrayList" createOnElement="bindings">
<jb:wiring beanIdRef="wireBinding" />
</jb:bean>
- <jb:bean beanId="wireBinding" class="org.smooks.model.javabean.Wiring" createOnElement="bindings/wiring">
+ <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" />
Modified: workspace/smooks-dmb/smooks/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-05 08:04:44 UTC (rev 22578)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_2/v1.2.xml 2010-06-05 08:24:45 UTC (rev 22579)
@@ -5,7 +5,7 @@
<!-- Binding configs (unmarshal)... -->
- <jb:bean beanId="javaBean" class="org.smooks.model.javabean.Bean" createOnElement="bean">
+ <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" />
@@ -19,7 +19,7 @@
<jb:bean beanId="valueBindings" class="java.util.ArrayList" createOnElement="bean">
<jb:wiring beanIdRef="valueBinding" />
</jb:bean>
- <jb:bean beanId="valueBinding" class="org.smooks.model.javabean.Value" createOnElement="bean/value">
+ <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" />
@@ -31,7 +31,7 @@
<jb:bean beanId="decodeParams" class="java.util.ArrayList" createOnElement="bean/value">
<jb:wiring beanIdRef="decodeParam" />
</jb:bean>
- <jb:bean beanId="decodeParam" class="org.smooks.model.javabean.DecodeParam" createOnElement="bean/value/decodeParam">
+ <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>
@@ -39,7 +39,7 @@
<jb:bean beanId="expressionBindings" class="java.util.ArrayList" createOnElement="bean">
<jb:wiring beanIdRef="expressionBinding" />
</jb:bean>
- <jb:bean beanId="expressionBinding" class="org.smooks.model.javabean.Expression" createOnElement="bean/expression">
+ <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" />
@@ -50,7 +50,7 @@
<jb:bean beanId="wireBindings" class="java.util.ArrayList" createOnElement="bean">
<jb:wiring beanIdRef="wireBinding" />
</jb:bean>
- <jb:bean beanId="wireBinding" class="org.smooks.model.javabean.Wiring" createOnElement="bean/wiring">
+ <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" />
Modified: workspace/smooks-dmb/smooks/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-05 08:04:44 UTC (rev 22578)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/javabean/v1_3/v1.3.xml 2010-06-05 08:24:45 UTC (rev 22579)
@@ -5,7 +5,7 @@
<!-- Binding configs (unmarshal)... -->
- <jb:bean beanId="javaBean" class="org.smooks.model.javabean.Bean" createOnElement="bean">
+ <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" />
@@ -19,7 +19,7 @@
<jb:bean beanId="valueBindings" class="java.util.ArrayList" createOnElement="bean">
<jb:wiring beanIdRef="valueBinding" />
</jb:bean>
- <jb:bean beanId="valueBinding" class="org.smooks.model.javabean.Value" createOnElement="bean/value">
+ <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" />
@@ -31,7 +31,7 @@
<jb:bean beanId="decodeParams" class="java.util.ArrayList" createOnElement="bean/value">
<jb:wiring beanIdRef="decodeParam" />
</jb:bean>
- <jb:bean beanId="decodeParam" class="org.smooks.model.javabean.DecodeParam" createOnElement="bean/value/decodeParam">
+ <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>
@@ -39,7 +39,7 @@
<jb:bean beanId="expressionBindings" class="java.util.ArrayList" createOnElement="bean">
<jb:wiring beanIdRef="expressionBinding" />
</jb:bean>
- <jb:bean beanId="expressionBinding" class="org.smooks.model.javabean.Expression" createOnElement="bean/expression">
+ <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" />
@@ -50,7 +50,7 @@
<jb:bean beanId="wireBindings" class="java.util.ArrayList" createOnElement="bean">
<jb:wiring beanIdRef="wireBinding" />
</jb:bean>
- <jb:bean beanId="wireBinding" class="org.smooks.model.javabean.Wiring" createOnElement="bean/wiring">
+ <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" />
More information about the jbosstools-commits
mailing list