commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject svn commit: r676122 - in /commons/proper/scxml/branches/J6: ./ src/main/java/org/apache/commons/scxml/ src/main/java/org/apache/commons/scxml/io/ src/main/java/org/apache/commons/scxml/model/ src/test/java/org/apache/commons/scxml/ src/test/java/org/ap...
Date Sat, 12 Jul 2008 03:15:46 GMT
Author: rahul
Date: Fri Jul 11 20:15:45 2008
New Revision: 676122

URL: http://svn.apache.org/viewvc?rev=676122&view=rev
Log:
Porting r676121 from trunk.
May 08 WD change: <data> uses "name" attribute instead of "ID"
Thanks to Edzard Hoefig <info at edzard dot net> for the patch.
SCXML-74
Also deprecated get/setName methods and added Edzard to contributors list.

Modified:
    commons/proper/scxml/branches/J6/pom.xml
    commons/proper/scxml/branches/J6/project.xml
    commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
    commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
    commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Data.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/custom-hello-world-04-el.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/custom-hello-world-04-jexl.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSEvaluatorTest.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/example-01.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-01.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-02.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-03.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-04.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/eventdata-03.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-01.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-02.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-03.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-01.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-01.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/assign-test.xml

Modified: commons/proper/scxml/branches/J6/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/pom.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/pom.xml (original)
+++ commons/proper/scxml/branches/J6/pom.xml Fri Jul 11 20:15:45 2008
@@ -108,6 +108,9 @@
     <contributor>
       <name>Elaine Wong</name>
     </contributor>
+    <contributor>
+      <name>Edzard Hoefig</name>
+    </contributor>
   </contributors>
 
   <dependencies>

Modified: commons/proper/scxml/branches/J6/project.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/project.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/project.xml (original)
+++ commons/proper/scxml/branches/J6/project.xml Fri Jul 11 20:15:45 2008
@@ -155,6 +155,9 @@
     <contributor>
       <name>Elaine Wong</name>
     </contributor>
+    <contributor>
+      <name>Edzard Hoefig</name>
+    </contributor>
   </contributors>
   
   <dependencies>

Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLHelper.java?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
(original)
+++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
Fri Jul 11 20:15:45 2008
@@ -435,7 +435,7 @@
             }
             // prefer "src" over "expr" over "inline"
             if (!SCXMLHelper.isStringEmpty(datum.getSrc())) {
-                ctx.setLocal(datum.getName(), valueNode);
+                ctx.setLocal(datum.getId(), valueNode);
             } else if (!SCXMLHelper.isStringEmpty(datum.
                     getExpr())) {
                 Object value = null;
@@ -451,9 +451,9 @@
                         defaultLog.error(see.getMessage(), see);
                     }
                 }
-                ctx.setLocal(datum.getName(), value);
+                ctx.setLocal(datum.getId(), value);
             } else {
-                ctx.setLocal(datum.getName(), valueNode);
+                ctx.setLocal(datum.getId(), valueNode);
             }
         }
     }

Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
(original)
+++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLSerializer.java
Fri Jul 11 20:15:45 2008
@@ -350,8 +350,8 @@
                     }
                     b.append(indent).append(INDENT).append(out.toString());
                 } else {
-                    b.append(indent).append(INDENT).append("<data name=\"").
-                        append(datum.getName()).append("\" expr=\"").
+                    b.append(indent).append(INDENT).append("<data id=\"").
+                        append(datum.getId()).append("\" expr=\"").
                         append(datum.getExpr()).append("\" />\n");
                 }
             }

Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Data.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Data.java?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Data.java
(original)
+++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Data.java
Fri Jul 11 20:15:45 2008
@@ -34,9 +34,10 @@
     private static final long serialVersionUID = 1L;
 
     /**
-     * The name of this data instance, that is used as its identifier.
+     * The identifier of this data instance.
+     * For backwards compatibility this is also the name.
      */
-    private String name;
+    private String id;
 
     /**
      * The URL to get the XML data tree from.
@@ -65,7 +66,7 @@
      * Constructor.
      */
     public Data() {
-        this.name = null;
+        this.id = null;
         this.src = null;
         this.expr = null;
         this.node = null;
@@ -75,18 +76,39 @@
      * Get the name.
      *
      * @return String The name.
+     * @deprecated Use {@link #getId()} instead.
      */
     public final String getName() {
-        return name;
+        return id;
     }
 
     /**
      * Set the name.
      *
      * @param name The name.
+     * @deprecated Use {@link #setId(String)} instead.
      */
     public final void setName(final String name) {
-        this.name = name;
+    	System.err.println("\n\n" + name + "\n\n"); 
+        this.id = name;
+    }
+
+    /**
+     * Get the id.
+     *
+     * @return String An identifier.
+     */
+    public final String getId() {
+        return id;
+    }
+
+    /**
+     * Set the id.
+     *
+     * @param id The identifier.
+     */
+    public final void setId(final String id) {
+        this.id = id;
     }
 
     /**

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/custom-hello-world-04-el.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/custom-hello-world-04-el.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/custom-hello-world-04-el.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/custom-hello-world-04-el.xml
Fri Jul 11 20:15:45 2008
@@ -20,7 +20,7 @@
        xmlns:my="http://my.custom-actions.domain/CUSTOM"
        version="1.0" initialstate="init">
     <datamodel>
-        <data name="helloName1" />
+        <data id="helloName1" />
     </datamodel>
 
     <state id="init">        

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/custom-hello-world-04-jexl.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/custom-hello-world-04-jexl.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/custom-hello-world-04-jexl.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/custom-hello-world-04-jexl.xml
Fri Jul 11 20:15:45 2008
@@ -20,7 +20,7 @@
        xmlns:my="http://my.custom-actions.domain/CUSTOM"
        version="1.0" initialstate="init">
     <datamodel>
-        <data name="helloName1" />
+        <data id="helloName1" />
     </datamodel>
 
     <state id="init">        

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSEvaluatorTest.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSEvaluatorTest.java?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSEvaluatorTest.java
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSEvaluatorTest.java
Fri Jul 11 20:15:45 2008
@@ -61,7 +61,7 @@
                                                         "initialstate = 'start' "  +
                                                         "version      = '1.0'>" +
                                                   "<datamodel>"           +
-                                                  "<data name='forest'>"  +
+                                                  "<data id='forest'>"  +
                                                    "<tree xmlns=''>"      +
                                                    "<branch>"             +
                                                    "<twig>leaf</twig>"    +

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/example-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/example-01.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/example-01.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/example-01.xml
Fri Jul 11 20:15:45 2008
@@ -24,7 +24,7 @@
  <!-- DATA MODEL -->
 
  <datamodel>
-  <data name='jungle'>
+  <data id='jungle'>
    <animals xmlns=''>
     <lion>
      <name>Simba</name>

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-01.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-01.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-01.xml
Fri Jul 11 20:15:45 2008
@@ -24,7 +24,7 @@
 
     <!-- Root or document datamodel -->
     <datamodel>
-        <data name="docdata">
+        <data id="docdata">
             <root xmlns="">
                 <foo>
                     <bar>alpha</bar>
@@ -42,9 +42,9 @@
         <!-- datamodel scoped to state "main" -->
         <datamodel>
             <!-- Degenerate usage, similar to the <var> element -->
-            <data name="mainvar" expr="0" />
+            <data id="mainvar" expr="0" />
             <!-- Usage where the value is an XML data tree -->
-            <data name="maindata">
+            <data id="maindata">
                 <root xmlns="">
                     <a>
                         <b>

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-02.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-02.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-02.xml
Fri Jul 11 20:15:45 2008
@@ -25,7 +25,7 @@
     <state id="ten">
 
         <datamodel>
-            <data name="data10" xmlns:ns1="http://namespace.test.domain/1">
+            <data id="data10" xmlns:ns1="http://namespace.test.domain/1">
                 <root xmlns="">
                     <ns1:foo>
                       <bar>10</bar>
@@ -48,7 +48,7 @@
 
         <datamodel>
             <!-- Start with a prefixless XPath -->
-            <data name="data20">
+            <data id="data20">
                 <ns1:root>
                     <ns2:foo>20</ns2:foo>
                 </ns1:root>
@@ -65,7 +65,7 @@
 
         <datamodel>
             <!-- Start with a prefixless XPath -->
-            <data name="data30">
+            <data id="data30">
                 <root xmlns="http://namespace.test.domain/1">
                     <foo xmlns="http://namespace.test.domain/2"
                          xmlns:ns1="http://namespace.test.domain/3"

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-03.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-03.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-03.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-03.xml
Fri Jul 11 20:15:45 2008
@@ -29,7 +29,7 @@
      <datamodel>
 
         <!-- We'll use this for XPaths -->
-        <data name="rootdata"
+        <data id="rootdata"
               xmlns:ns1="scheme://namespace.test.domain/1"
               xmlns:ns2="scheme://namespace.test.domain/2"
               xmlns:ns3="scheme://namespace.test.domain/3">
@@ -42,7 +42,7 @@
 
         <!-- We'll use this for the JUnit test
              NamespacePrefixedPathsTest.java (scxml package) -->
-        <data name="retval" />
+        <data id="retval" />
 
     </datamodel>
 
@@ -51,7 +51,7 @@
 
         <datamodel>
 
-            <data name="data10" xmlns:ns4="scheme://namespace.test.domain/1">
+            <data id="data10" xmlns:ns4="scheme://namespace.test.domain/1">
                 <root xmlns="">
                     <ns4:foo>
                       <bar>10</bar>
@@ -87,7 +87,7 @@
 
         <datamodel>
 
-            <data name="data20">
+            <data id="data20">
                 <ns1:root>
                     <ns2:foo>20</ns2:foo>
                 </ns1:root>
@@ -136,7 +136,7 @@
 
         <datamodel>
 
-            <data name="data30">
+            <data id="data30">
                 <root xmlns="scheme://namespace.test.domain/1">
                     <foo xmlns="scheme://namespace.test.domain/2"
                          xmlns:ns1="scheme://namespace.test.domain/3"
@@ -163,13 +163,13 @@
 
         <datamodel>
 
-            <data name="data40">
+            <data id="data40">
                 <root xmlns="">
                     <ns1:foo ns2:attfoo="40"/>
                 </root>
             </data>
 
-            <data name="data41">
+            <data id="data41">
                 <ns3:root>
                     <ns4:foo>41</ns4:foo>
                 </ns3:root>
@@ -188,7 +188,7 @@
 
         <datamodel>
 
-            <data name="data50"  xmlns:ns1="scheme://namespace.test.domain/1"
+            <data id="data50"  xmlns:ns1="scheme://namespace.test.domain/1"
                                  xmlns:ns2="scheme://namespace.test.domain/2"
                                  xmlns:ns3="scheme://namespace.test.domain/3">
                 <ns1:root>
@@ -196,7 +196,7 @@
                 </ns1:root>
             </data>
 
-            <data name="data51" xmlns:ns3="scheme://namespace.test.domain/3"
+            <data id="data51" xmlns:ns3="scheme://namespace.test.domain/3"
                                 xmlns:ns4="scheme://namespace.test.domain/4">
                 <ns3:root>
                     <ns4:foo attfoo="51"/>
@@ -223,13 +223,13 @@
                    xmlns:ns3="scheme://namespace.test.domain/3"
                    xmlns:ns4="scheme://namespace.test.domain/4">
 
-            <data name="data60">
+            <data id="data60">
                 <root xmlns="">
                     <ns1:foo ns2:attfoo="60"/>
                 </root>
             </data>
 
-            <data name="data61">
+            <data id="data61">
                 <ns3:root>
                     <ns4:foo attfoo="61"/>
                 </ns3:root>

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-04.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-04.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-04.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/datamodel-04.xml
Fri Jul 11 20:15:45 2008
@@ -24,7 +24,7 @@
 
     <!-- Root or document datamodel -->
     <datamodel>
-        <data name="payload"/>
+        <data id="payload"/>
     </datamodel>
 
     <state id="ten">

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/eventdata-03.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/eventdata-03.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/eventdata-03.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/eventdata-03.xml
Fri Jul 11 20:15:45 2008
@@ -21,7 +21,7 @@
        initialstate="ten">
 
     <datamodel>
-        <data name="rootdata">
+        <data id="rootdata">
             <root xmlns="">
                 <one>1</one>
                 <two>2</two>

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-01.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-01.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-01.xml
Fri Jul 11 20:15:45 2008
@@ -24,7 +24,7 @@
 
     <!-- Root or document datamodel -->
     <datamodel>
-        <data name="docdata">
+        <data id="docdata">
             <root xmlns="">
                 <foo>foo</foo>
             </root>
@@ -39,8 +39,8 @@
 
         <!-- datamodel scoped to state "main" -->
         <datamodel>
-            <data name="mainvar" expr="${0}" />
-            <data name="maindata">
+            <data id="mainvar" expr="${0}" />
+            <data id="maindata">
                 <root xmlns="">
                     <foo>
                         <bar>bar</bar>

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-02.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-02.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-02.xml
Fri Jul 11 20:15:45 2008
@@ -25,7 +25,7 @@
     <state id="ten">
 
         <datamodel>
-            <data name="data10">
+            <data id="data10">
                 <root xmlns="">
                     <foo>10</foo>
                 </root>
@@ -43,7 +43,7 @@
 
         <datamodel>
             <!-- Start with a prefixless XPath -->
-            <data name="data20">
+            <data id="data20">
                 <ns1:root>
                     <ns2:foo>20</ns2:foo>
                 </ns1:root>
@@ -60,7 +60,7 @@
 
         <datamodel>
             <!-- Start with a prefixless XPath -->
-            <data name="data30">
+            <data id="data30">
                 <root xmlns="http://namespace.test.domain/1">
                     <foo xmlns="http://namespace.test.domain/2">30</foo>
                 </root>

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-03.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-03.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-03.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/datamodel-03.xml
Fri Jul 11 20:15:45 2008
@@ -29,7 +29,7 @@
      <datamodel>
 
         <!-- We'll use this for XPaths -->
-        <data name="rootdata"
+        <data id="rootdata"
               xmlns:ns1="scheme://namespace.test.domain/1"
               xmlns:ns2="scheme://namespace.test.domain/2"
               xmlns:ns3="scheme://namespace.test.domain/3">
@@ -42,7 +42,7 @@
 
         <!-- We'll use this for the JUnit test
              NamespacePrefixedPathsTest.java (scxml package) -->
-        <data name="retval" />
+        <data id="retval" />
 
     </datamodel>
 
@@ -51,7 +51,7 @@
 
         <datamodel>
 
-            <data name="data10" xmlns:ns4="scheme://namespace.test.domain/1">
+            <data id="data10" xmlns:ns4="scheme://namespace.test.domain/1">
                 <root xmlns="">
                     <ns4:foo>
                       <bar>10</bar>
@@ -87,7 +87,7 @@
 
         <datamodel>
 
-            <data name="data20">
+            <data id="data20">
                 <ns1:root>
                     <ns2:foo>20</ns2:foo>
                 </ns1:root>
@@ -136,7 +136,7 @@
 
         <datamodel>
 
-            <data name="data30">
+            <data id="data30">
                 <root xmlns="scheme://namespace.test.domain/1">
                     <foo xmlns="scheme://namespace.test.domain/2"
                          xmlns:ns1="scheme://namespace.test.domain/3"
@@ -163,13 +163,13 @@
 
         <datamodel>
 
-            <data name="data40">
+            <data id="data40">
                 <root xmlns="">
                     <ns1:foo ns2:attfoo="40"/>
                 </root>
             </data>
 
-            <data name="data41">
+            <data id="data41">
                 <ns3:root>
                     <ns4:foo>41</ns4:foo>
                 </ns3:root>
@@ -188,7 +188,7 @@
 
         <datamodel>
 
-            <data name="data50"  xmlns:ns1="scheme://namespace.test.domain/1"
+            <data id="data50"  xmlns:ns1="scheme://namespace.test.domain/1"
                                  xmlns:ns2="scheme://namespace.test.domain/2"
                                  xmlns:ns3="scheme://namespace.test.domain/3">
                 <ns1:root>
@@ -196,7 +196,7 @@
                 </ns1:root>
             </data>
 
-            <data name="data51" xmlns:ns3="scheme://namespace.test.domain/3"
+            <data id="data51" xmlns:ns3="scheme://namespace.test.domain/3"
                                 xmlns:ns4="scheme://namespace.test.domain/4">
                 <ns3:root>
                     <ns4:foo attfoo="51"/>
@@ -223,13 +223,13 @@
                    xmlns:ns3="scheme://namespace.test.domain/3"
                    xmlns:ns4="scheme://namespace.test.domain/4">
 
-            <data name="data60">
+            <data id="data60">
                 <root xmlns="">
                     <ns1:foo ns2:attfoo="60"/>
                 </root>
             </data>
 
-            <data name="data61">
+            <data id="data61">
                 <ns3:root>
                     <ns4:foo attfoo="61"/>
                 </ns3:root>

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-01.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-01.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-01.xml
Fri Jul 11 20:15:45 2008
@@ -21,7 +21,7 @@
        version="1.0">
 
     <datamodel>
-        <data name="jungle">
+        <data id="jungle">
             <animals xmlns="">
                 <lion>
                     <name>Simba</name>

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-01.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-01.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-01.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-01.xml
Fri Jul 11 20:15:45 2008
@@ -22,7 +22,7 @@
 
     <state id="tranbug">
          <datamodel>
- 			<data name="dummy" expr="'somedata'"/>
+ 			<data id="dummy" expr="'somedata'"/>
          </datamodel>
         <onentry>
             <log expr="'Begin transition bug test ...'" />

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml
Fri Jul 11 20:15:45 2008
@@ -22,7 +22,7 @@
        initialstate="tranbug">
 
     <datamodel>
-        <data name="foo">
+        <data id="foo">
             <alpha xmlns="">
                 <beta/>
             </alpha>
@@ -39,7 +39,7 @@
         <transition event="show.bug" target="end">
          <!-- For example, FOLLOWING datamodel IS MISPLACED -->
          <datamodel>
- 			<data name="dummy" expr="'somedata'"/>
+ 			<data id="dummy" expr="'somedata'"/>
          </datamodel>
          <log expr="dummy" />
          <log expr="'*****' + dummy" />

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/assign-test.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/assign-test.xml?rev=676122&r1=676121&r2=676122&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/assign-test.xml
(original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/assign-test.xml
Fri Jul 11 20:15:45 2008
@@ -24,12 +24,12 @@
   <state id="assign1" final="true">
 
     <datamodel>
-        <data name="foo">
+        <data id="foo">
             <root xmlns="">
                 <foo/>
             </root>
         </data>
-        <data name="bar">
+        <data id="bar">
             <root xmlns="">
                 <bar>5</bar>
             </root>
@@ -48,10 +48,10 @@
   <state id="assign2">
 
     <datamodel>
-      <data name="jira51data1">
+      <data id="jira51data1">
           <rad:timeout>10</rad:timeout>
       </data> 
-      <data name="jira51data2">
+      <data id="jira51data2">
           <rad:short xmlns="">20</rad:short>
       </data>
     </datamodel>



Mime
View raw message