svn commit: r1132819 - in /commons/proper/scxml/trunk/src: main/java/org/apache/commons/scxml/SCXMLHelper.java test/java/org/apache/commons/scxml/SCXMLExecutorTest.java test/java/org/apache/commons/sc
Author: rahul
Date: Mon Jun 6 22:47:09 2011
New Revision: 1132819
URL: http://svn.apache.org/viewvc?rev=1132819&view=rev
Log:
SCXML-161 Transition leaving a child state of parallel incorrect. Fix by
accounting for non-composite regions.
Test case provided by Enrico Nardelli .
Added:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/transitions-05.xml
(with props)
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLHelper.java?rev=1132819&r1=1132818&r2=1132819&view=diff
==
---
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
(original)
+++
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
Mon Jun 6 22:47:09 2011
@@ -259,7 +259,7 @@ public final class SCXMLHelper {
for (Iterator act = currentStates.iterator();
act.hasNext();) {
TransitionTarget a = (TransitionTarget) act.next();
-if (isDescendant(a, s)) {
+if (isDescendant(a, s) || a == s) {
//a is affected
boolean added = false;
added = allStates.add(a);
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java?rev=1132819&r1=1132818&r2=1132819&view=diff
==
---
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
(original)
+++
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
Mon Jun 6 22:47:09 2011
@@ -43,7 +43,7 @@ public class SCXMLExecutorTest extends T
// Test data
private URL microwave01jsp, microwave02jsp, microwave01jexl,
microwave02jexl, microwave03jexl, microwave04jexl, microwave05jexl,
transitions01,
-transitions02, transitions03, transitions04, prefix01, send01, send02;
+transitions02, transitions03, transitions04, transitions05, prefix01,
send01, send02;
private SCXMLExecutor exec;
/**
@@ -72,6 +72,8 @@ public class SCXMLExecutorTest extends T
getResource("org/apache/commons/scxml/transitions-03.xml");
transitions04 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/transitions-04.xml");
+transitions05 = this.getClass().getClassLoader().
+getResource("org/apache/commons/scxml/transitions-05.xml");
prefix01 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/prefix-01.xml");
send01 = this.getClass().getClassLoader().
@@ -86,7 +88,7 @@ public class SCXMLExecutorTest extends T
public void tearDown() {
microwave01jsp = microwave02jsp = microwave01jexl = microwave02jexl =
microwave04jexl = microwave05jexl = transitions01 = transitions02
= transitions03 =
-transitions04 = prefix01 = send01 = send02 = null;
+transitions04 = transitions05 = prefix01 = send01 = send02 = null;
}
/**
@@ -234,6 +236,17 @@ public class SCXMLExecutorTest extends T
next()).getId());
}
+public void testSCXMLExecutorTransitions05Sample() throws Exception {
+SCXML scxml = SCXMLTestHelper.parse(transitions05);
+assertNotNull(scxml);
+exec = SCXMLTestHelper.getExecutor(scxml);
+assertNotNull(exec);
+SCXMLTestHelper.assertPostTriggerStates(exec, "start", new
String[]{"one", "two"});
+SCXMLTestHelper.assertPostTriggerState(exec, "onetwo_three", "three");
+SCXMLTestHelper.assertPostTriggerStates(exec, "three_one", new
String[]{"one", "two"});
+SCXMLTestHelper.assertPostTriggerState(exec, "two_four", "four");
+}
+
public void testSend01Sample() throws Exception {
exec = SCXMLTestHelper.getExecutor(send01);
assertNotNull(exec);
Added:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/transitions-05.xml
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/transitions-05.xml?rev=1132819&view=auto
==
svn commit: r1132823 - in /commons/proper/scxml/branches/J6/src: main/java/org/apache/commons/scxml/SCXMLHelper.java test/java/org/apache/commons/scxml/SCXMLExecutorTest.java test/java/org/apache/comm
Author: rahul
Date: Mon Jun 6 22:49:05 2011
New Revision: 1132823
URL: http://svn.apache.org/viewvc?rev=1132823&view=rev
Log:
Port r1132819 from trunk.
SCXML-161 Transition leaving a child state of parallel incorrect. Fix by
accounting for non-composite regions.
Test case provided by Enrico Nardelli .
Added:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/transitions-06.xml
(with props)
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
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=1132823&r1=1132822&r2=1132823&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
Mon Jun 6 22:49:05 2011
@@ -250,7 +250,7 @@ public final class SCXMLHelper {
for (TransitionTarget tt : par.getChildren()) {
State s = (State) tt;
for (TransitionTarget a : currentStates) {
-if (isDescendant(a, s)) {
+if (isDescendant(a, s) || a == s) {
//a is affected
boolean added = false;
added = allStates.add(a);
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java?rev=1132823&r1=1132822&r2=1132823&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
Mon Jun 6 22:49:05 2011
@@ -41,7 +41,7 @@ public class SCXMLExecutorTest extends T
// Test data
private URL microwave01jsp, microwave02jsp, microwave01jexl,
microwave02jexl, microwave03jexl, microwave04jexl, microwave05jexl,
transitions01,
-transitions02, transitions03, transitions04, transitions05, prefix01,
send01, send02;
+transitions02, transitions03, transitions04, transitions05,
transitions06, prefix01, send01, send02;
private SCXMLExecutor exec;
/**
@@ -73,6 +73,8 @@ public class SCXMLExecutorTest extends T
getResource("org/apache/commons/scxml/transitions-04.xml");
transitions05 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/transitions-05.xml");
+transitions06 = this.getClass().getClassLoader().
+getResource("org/apache/commons/scxml/transitions-06.xml");
prefix01 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/prefix-01.xml");
send01 = this.getClass().getClassLoader().
@@ -88,7 +90,7 @@ public class SCXMLExecutorTest extends T
public void tearDown() {
microwave01jsp = microwave02jsp = microwave01jexl = microwave02jexl =
microwave04jexl = microwave05jexl = transitions01 = transitions02
= transitions03 =
-transitions04 = transitions05 = prefix01 = send01 = send02 = null;
+transitions04 = transitions05 = transitions06 = prefix01 = send01
= send02 = null;
}
/**
@@ -235,6 +237,17 @@ public class SCXMLExecutorTest extends T
SCXMLTestHelper.assertPostTriggerState(exec, "foo", "end");
}
+public void testSCXMLExecutorTransitions06Sample() throws Exception {
+SCXML scxml = SCXMLTestHelper.parse(transitions06);
+assertNotNull(scxml);
+exec = SCXMLTestHelper.getExecutor(scxml);
+assertNotNull(exec);
+SCXMLTestHelper.assertPostTriggerStates(exec, "start", new
String[]{"one", "two"});
+SCXMLTestHelper.assertPostTriggerState(exec, "onetwo_three", "three");
+SCXMLTestHelper.assertPostTriggerStates(exec, "three_one", new
String[]{"one", "two"});
+SCXMLTestHelper.assertPostTriggerState(exec, "two_four", "four");
+}
+
public void testSend01Sample() throws Exception {
exec = SCXMLTestHelper.getExecutor(send01);
assertNotNull(exec);
Added:
commons/proper/scxml/branches/J6/src/test/java/org
svn commit: r1132830 - /commons/proper/scxml/trunk/src/site/xdoc/building.xml
Author: rahul Date: Mon Jun 6 23:13:06 2011 New Revision: 1132830 URL: http://svn.apache.org/viewvc?rev=1132830&view=rev Log: Remove m1 section from building page, now that the build has been removed. Modified: commons/proper/scxml/trunk/src/site/xdoc/building.xml Modified: commons/proper/scxml/trunk/src/site/xdoc/building.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/building.xml?rev=1132830&r1=1132829&r2=1132830&view=diff == --- commons/proper/scxml/trunk/src/site/xdoc/building.xml (original) +++ commons/proper/scxml/trunk/src/site/xdoc/building.xml Mon Jun 6 23:13:06 2011 @@ -45,25 +45,6 @@ Maven 2.0.8 and above is recommended. - - - - - -To build a jar file, change into SCXML's root directory and run "maven jar". -The result will be in the "target" subdirectory. - - -To build the Javadocs, run "maven javadoc". -The result will be in "target/docs/apidocs". - - -To build the full website, run "maven site". The result will be in "target/docs". - - -To build the site, you need Maven 1.0.2 and version 1.9.2 of the maven-xdoc-plugin installed. - -
svn commit: r1132832 - /commons/proper/scxml/branches/J6/src/site/xdoc/building.xml
Author: rahul Date: Mon Jun 6 23:13:55 2011 New Revision: 1132832 URL: http://svn.apache.org/viewvc?rev=1132832&view=rev Log: Update building docs to use m2 instead, now that the m1 build has been removed. Modified: commons/proper/scxml/branches/J6/src/site/xdoc/building.xml Modified: commons/proper/scxml/branches/J6/src/site/xdoc/building.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/site/xdoc/building.xml?rev=1132832&r1=1132831&r2=1132832&view=diff == --- commons/proper/scxml/branches/J6/src/site/xdoc/building.xml (original) +++ commons/proper/scxml/branches/J6/src/site/xdoc/building.xml Mon Jun 6 23:13:55 2011 @@ -30,22 +30,21 @@ - + -To build a jar file, change into SCXML's root directory and run "maven jar". +To build a jar file, change into SCXML's root directory and run "mvn package". The result will be in the "target" subdirectory. -To build the Javadocs, run "maven javadoc". +To build the Javadocs, run "mvn javadoc:javadoc". The result will be in "target/docs/apidocs". -To build the full website, run "maven site". The result will be in "target/docs". +To build the full website, including Javadocs, run "mvn site". -To build the site, you need Maven 1.0.2 and version 1.9.2 of the maven-xdoc-plugin installed. +Maven 2.0.8 and above is recommended. -
svn commit: r1000100 - /commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Author: rahul
Date: Wed Sep 22 17:37:24 2010
New Revision: 1000100
URL: http://svn.apache.org/viewvc?rev=1000100&view=rev
Log:
Javadoc notes and a typo.
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java?rev=1000100&r1=199&r2=1000100&view=diff
==
---
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
(original)
+++
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Wed Sep 22 17:37:24 2010
@@ -453,7 +453,7 @@ public class SCXMLSemanticsImpl implemen
removeList.add(t);
break; //it makes no sense to waste cycles with t
} else if (SCXMLHelper.isDescendant(tsrc, t2src)) {
-//t takes precendence over t2
+//t takes precedence over t2
removeList.add(t2);
} else {
//add both to the non-determinism candidates
@@ -467,6 +467,7 @@ public class SCXMLSemanticsImpl implemen
if (nonDeterm.size() > 0) {
// if not, first one in each state / region (which is also
// first in document order) wins
+// NOTE: Self or stay transitions are conflict-free
Set regions = new HashSet();
Iterator iter = nonDeterm.iterator();
while (iter.hasNext()) {
svn commit: r1000101 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Author: rahul
Date: Wed Sep 22 17:38:06 2010
New Revision: 1000101
URL: http://svn.apache.org/viewvc?rev=1000101&view=rev
Log:
Javadoc note and fixing a typo.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java?rev=1000101&r1=1000100&r2=1000101&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/semantics/SCXMLSemanticsImpl.java
Wed Sep 22 17:38:06 2010
@@ -440,7 +440,7 @@ public class SCXMLSemanticsImpl implemen
removeList.add(t);
break; //it makes no sense to waste cycles with t
} else if (SCXMLHelper.isDescendant(tsrc, t2src)) {
-//t takes precendence over t2
+//t takes precedence over t2
removeList.add(t2);
} else {
//add both to the non-determinism candidates
@@ -454,6 +454,7 @@ public class SCXMLSemanticsImpl implemen
if (nonDeterm.size() > 0) {
// if not, first one in each state / region (which is also
// first in document order) wins
+// NOTE: Self or stay transitions are conflict-free
Set regions = new
HashSet();
for (Transition t : nonDeterm) {
TransitionTarget parent = t.getParent();
svn commit: r1059252 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/xpath/XPathEvaluator.java
Author: rahul
Date: Sat Jan 15 04:08:06 2011
New Revision: 1059252
URL: http://svn.apache.org/viewvc?rev=1059252&view=rev
Log:
Remove debug trace.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/xpath/XPathEvaluator.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/xpath/XPathEvaluator.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/xpath/XPathEvaluator.java?rev=1059252&r1=1059251&r2=1059252&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/xpath/XPathEvaluator.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/xpath/XPathEvaluator.java
Sat Jan 15 04:08:06 2011
@@ -89,7 +89,6 @@ public class XPathEvaluator implements E
try {
return xpath.evaluate(expr, dummyContextNode,
XPathConstants.STRING);
} catch (XPathExpressionException xee) {
-xee.printStackTrace();
throw new SCXMLExpressionException(xee.getMessage(), xee);
}
}
svn commit: r1059253 - in /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath: XPathExampleTest.java example-02.xml
Author: rahul
Date: Sat Jan 15 04:10:12 2011
New Revision: 1059253
URL: http://svn.apache.org/viewvc?rev=1059253&view=rev
Log:
Test case illustrating use of namespaces in XPath expressions.
Added:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java?rev=1059253&r1=1059252&r2=1059253&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java
Sat Jan 15 04:10:12 2011
@@ -50,7 +50,7 @@ public class XPathExampleTest extends Te
}
// Test data
-private URL example01;
+private URL example01, example02;
private SCXMLExecutor exec;
/**
@@ -60,6 +60,8 @@ public class XPathExampleTest extends Te
public void setUp() {
example01 = this.getClass().getClassLoader().
getResource("org/apache/commons/scxml/env/xpath/example-01.xml");
+example02 = this.getClass().getClassLoader().
+getResource("org/apache/commons/scxml/env/xpath/example-02.xml");
}
/**
@@ -67,7 +69,7 @@ public class XPathExampleTest extends Te
*/
@Override
public void tearDown() {
-example01 = null;
+example01 = example02 = null;
}
// TEST METHODS
@@ -94,5 +96,21 @@ public class XPathExampleTest extends Te
}
+public void testExample02Sample() throws Exception {
+
+SCXML scxml = SCXMLTestHelper.parse(example02);
+Evaluator evaluator = null;
+evaluator = new XPathEvaluator();
+Context context = new XPathContext(null);
+exec = SCXMLTestHelper.getExecutor(scxml, context, evaluator);
+
+assertNotNull(exec);
+Set currentStates =
exec.getCurrentStatus().getStates();
+assertEquals(1, currentStates.size());
+assertEquals("end", ((State)currentStates.iterator().
+next()).getId());
+
+}
+
}
Added:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml?rev=1059253&view=auto
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml
(added)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml
Sat Jan 15 04:10:12 2011
@@ -0,0 +1,41 @@
+
+
+
+http://www.w3.org/2005/07/scxml"; initial="start" version="1.0"
+ xmlns:a="http://example.com/a";
+ xmlns:b="http://example.com/b";
+ xmlns:c="http://example.com/c";>
+
+
+
+
+1
+2
+3
+
+
+
+
+
+
+
+
+
+
+
svn commit: r1059254 - /commons/proper/scxml/branches/J6/pom.xml
Author: rahul Date: Sat Jan 15 04:17:14 2011 New Revision: 1059254 URL: http://svn.apache.org/viewvc?rev=1059254&view=rev Log: Update a couple of deps. Modified: commons/proper/scxml/branches/J6/pom.xml Modified: commons/proper/scxml/branches/J6/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/pom.xml?rev=1059254&r1=1059253&r2=1059254&view=diff == --- commons/proper/scxml/branches/J6/pom.xml (original) +++ commons/proper/scxml/branches/J6/pom.xml Sat Jan 15 04:17:14 2011 @@ -134,12 +134,12 @@ commons-digester commons-digester - 2.0 + 2.1 commons-beanutils commons-beanutils - 1.8.0 + 1.8.3 junit @@ -189,7 +189,7 @@ org.apache.myfaces.core myfaces-api - 1.1.5 + 1.1.8 provided true
svn commit: r1059255 - /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml
Author: rahul Date: Sat Jan 15 04:19:10 2011 New Revision: 1059255 URL: http://svn.apache.org/viewvc?rev=1059255&view=rev Log: Add missing svn:eol-style. Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml (contents, props changed) Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml?rev=1059255&r1=1059254&r2=1059255&view=diff == --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml Sat Jan 15 04:19:10 2011 @@ -1,41 +1,41 @@ - - - -http://www.w3.org/2005/07/scxml"; initial="start" version="1.0" - xmlns:a="http://example.com/a"; - xmlns:b="http://example.com/b"; - xmlns:c="http://example.com/c";> - - - - -1 -2 -3 - - - - - - - - - - - + + + +http://www.w3.org/2005/07/scxml"; initial="start" version="1.0" + xmlns:a="http://example.com/a"; + xmlns:b="http://example.com/b"; + xmlns:c="http://example.com/c";> + + + + +1 +2 +3 + + + + + + + + + + + Propchange: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-02.xml -- svn:eol-style = native
svn commit: r944742 - /commons/sandbox/gsoc/
Author: rahul Date: Sun May 16 00:14:30 2010 New Revision: 944742 URL: http://svn.apache.org/viewvc?rev=944742&view=rev Log: Create base SVN directory for Google Summer of Code project sandboxes. Added: commons/sandbox/gsoc/
svn commit: r944743 - /commons/sandbox/gsoc/README.txt
Author: rahul Date: Sun May 16 00:17:28 2010 New Revision: 944743 URL: http://svn.apache.org/viewvc?rev=944743&view=rev Log: Add a README listing the purpose and organization of the gsoc sandbox directory. Added: commons/sandbox/gsoc/README.txt (with props) Added: commons/sandbox/gsoc/README.txt URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/README.txt?rev=944743&view=auto == --- commons/sandbox/gsoc/README.txt (added) +++ commons/sandbox/gsoc/README.txt Sun May 16 00:17:28 2010 @@ -0,0 +1,32 @@ + +$Id$ + +Commons Sandbox - Google Summer of Code Repositories + +-- PURPOSE -- + +The purpose of this SVN space is to provide sandboxes for GSoC participants +to develop their project code in the Apache SVN. + +More details about the program can be found here: + + http://code.google.com/soc/ + + -- ORGANIZATION -- + +This space is organized according to the year of participation in the program. Propchange: commons/sandbox/gsoc/README.txt -- svn:eol-style = native Propchange: commons/sandbox/gsoc/README.txt -- svn:keywords = Date Author Id Revision HeadURL
svn commit: r944744 - in /commons/sandbox/gsoc/2010: ./ README.txt
Author: rahul Date: Sun May 16 00:21:54 2010 New Revision: 944744 URL: http://svn.apache.org/viewvc?rev=944744&view=rev Log: Create SVN directory for 2010 Google Summer of Code project sandboxes; add a README listing projects. Added: commons/sandbox/gsoc/2010/ commons/sandbox/gsoc/2010/README.txt (with props) Added: commons/sandbox/gsoc/2010/README.txt URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/README.txt?rev=944744&view=auto == --- commons/sandbox/gsoc/2010/README.txt (added) +++ commons/sandbox/gsoc/2010/README.txt Sun May 16 00:21:54 2010 @@ -0,0 +1,31 @@ + +$Id$ + +Commons Sandbox - Google Summer of Code 2010 Repositories + +-- PURPOSE -- + +See README.txt in parent directory. + + -- ORGANIZATION -- + +The GSoC 2010 projects are: + +1. scxml-js : SCXML Code Generation Framework, JavaScript Edition by jbeard + +2. scxml-eclipse : Eclipse-based Visual SCXML Editor by guixl Propchange: commons/sandbox/gsoc/2010/README.txt -- svn:eol-style = native Propchange: commons/sandbox/gsoc/2010/README.txt -- svn:keywords = Date Author Id Revision HeadURL
svn commit: r944746 - in /commons/sandbox/gsoc/2010/scxml-js: ./ branches/ tags/ trunk/ trunk/LICENSE.txt trunk/NOTICE.txt trunk/README.txt
Author: rahul Date: Sun May 16 00:34:58 2010 New Revision: 944746 URL: http://svn.apache.org/viewvc?rev=944746&view=rev Log: Create SVN space for jbeard's 2010 Google Summer of Code project with standard directory structure (branches, tags, trunk); add LICENSE, NOTICE and README to trunk. Added: commons/sandbox/gsoc/2010/scxml-js/ commons/sandbox/gsoc/2010/scxml-js/branches/ commons/sandbox/gsoc/2010/scxml-js/tags/ commons/sandbox/gsoc/2010/scxml-js/trunk/ commons/sandbox/gsoc/2010/scxml-js/trunk/LICENSE.txt (with props) commons/sandbox/gsoc/2010/scxml-js/trunk/NOTICE.txt (with props) commons/sandbox/gsoc/2010/scxml-js/trunk/README.txt (with props) Added: commons/sandbox/gsoc/2010/scxml-js/trunk/LICENSE.txt URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/LICENSE.txt?rev=944746&view=auto == --- commons/sandbox/gsoc/2010/scxml-js/trunk/LICENSE.txt (added) +++ commons/sandbox/gsoc/2010/scxml-js/trunk/LICENSE.txt Sun May 16 00:34:58 2010 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide,
svn commit: r944749 - in /commons/sandbox/gsoc/2010/scxml-eclipse: ./ branches/ tags/ trunk/ trunk/LICENSE.txt trunk/NOTICE.txt trunk/README.txt
Author: rahul Date: Sun May 16 00:41:59 2010 New Revision: 944749 URL: http://svn.apache.org/viewvc?rev=944749&view=rev Log: Create SVN space for guixl's 2010 Google Summer of Code project with standard directory structure (branches, tags, trunk); add LICENSE, NOTICE and README to trunk. Added: commons/sandbox/gsoc/2010/scxml-eclipse/ commons/sandbox/gsoc/2010/scxml-eclipse/branches/ commons/sandbox/gsoc/2010/scxml-eclipse/tags/ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/LICENSE.txt (with props) commons/sandbox/gsoc/2010/scxml-eclipse/trunk/NOTICE.txt (with props) commons/sandbox/gsoc/2010/scxml-eclipse/trunk/README.txt (with props) Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/LICENSE.txt URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/LICENSE.txt?rev=944749&view=auto == --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/LICENSE.txt (added) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/LICENSE.txt Sun May 16 00:41:59 2010 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contribut
svn commit: r952687 - in /commons/sandbox/gsoc/2010: scxml-eclipse/trunk/getDeps.xml scxml-eclipse/trunk/sdocbook/How to run source code for scxml visual editor tool.ppt scxml-js/trunk/getDeps.xml
Author: rahul Date: Tue Jun 8 15:26:19 2010 New Revision: 952687 URL: http://svn.apache.org/viewvc?rev=952687&view=rev Log: Remove cut-n-paste comment from Ant files and use distinct project names. Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/getDeps.xml commons/sandbox/gsoc/2010/scxml-eclipse/trunk/sdocbook/How to run source code for scxml visual editor tool.ppt commons/sandbox/gsoc/2010/scxml-js/trunk/getDeps.xml Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/getDeps.xml URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/getDeps.xml?rev=952687&r1=952686&r2=952687&view=diff == --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/getDeps.xml (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/getDeps.xml Tue Jun 8 15:26:19 2010 @@ -15,10 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. --> - - - + Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/sdocbook/How to run source code for scxml visual editor tool.ppt URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/sdocbook/How%20to%20run%20source%20code%20for%20scxml%20visual%20editor%20tool.ppt?rev=952687&r1=952686&r2=952687&view=diff == Binary files - no diff available. Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/getDeps.xml URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/getDeps.xml?rev=952687&r1=952686&r2=952687&view=diff == --- commons/sandbox/gsoc/2010/scxml-js/trunk/getDeps.xml (original) +++ commons/sandbox/gsoc/2010/scxml-js/trunk/getDeps.xml Tue Jun 8 15:26:19 2010 @@ -15,10 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. --> - - - +
svn commit: r957791 - /commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Author: rahul
Date: Fri Jun 25 04:28:14 2010
New Revision: 957791
URL: http://svn.apache.org/viewvc?rev=957791&view=rev
Log:
Add a couple of helper test methods.
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java?rev=957791&r1=957790&r2=957791&view=diff
==
---
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
(original)
+++
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Fri Jun 25 04:28:14 2010
@@ -36,6 +36,7 @@ import org.apache.commons.scxml.env.Trac
import org.apache.commons.scxml.env.jexl.JexlEvaluator;
import org.apache.commons.scxml.io.SCXMLDigester;
import org.apache.commons.scxml.io.SCXMLParser;
+import org.apache.commons.scxml.model.ModelException;
import org.apache.commons.scxml.model.SCXML;
import org.apache.commons.scxml.model.State;
import org.apache.commons.scxml.model.TransitionTarget;
@@ -346,6 +347,46 @@ public class SCXMLTestHelper {
}
/**
+ * Get the active leaf state for this executor instance.
+ * Assumes no usage of <parallel>.
+ *
+ * @param exec The {...@link SCXMLExecutor} instance whose active state is
+ * being queried.
+ * @return The id of the active state.
+ */
+public static String getCurrentState(SCXMLExecutor exec) {
+Set current = exec.getCurrentStatus().getStates();
+TransitionTarget active = (TransitionTarget) current.iterator().next();
+return active.getId();
+}
+
+/**
+ * Set the active leaf state for this executor instance.
+ * Assumes no usage of <parallel>.
+ *
+ * @param exec The {...@link SCXMLExecutor} instance whose active state is
+ * to be set.
+ * @param id The id of the state to be made active.
+ */
+public static void setCurrentState(SCXMLExecutor exec, final String id) {
+try {
+exec.reset();
+} catch (ModelException me) {
+throw new IllegalArgumentException("Provided SCXMLExecutor "
++ "instance cannot be reset.");
+}
+TransitionTarget active = (TransitionTarget) exec.getStateMachine().
+getTargets().get(id);
+if (active == null) {
+throw new IllegalArgumentException("No target with id '" + id
++ "' present in state machine.");
+}
+Set current = exec.getCurrentStatus().getStates();
+current.clear();
+current.add(active);
+}
+
+/**
* Discourage instantiation.
*/
private SCXMLTestHelper() {
svn commit: r957793 - /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Author: rahul
Date: Fri Jun 25 04:32:05 2010
New Revision: 957793
URL: http://svn.apache.org/viewvc?rev=957793&view=rev
Log:
Add a couple of helper test methods.
Porting r957791 from trunk.
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java?rev=957793&r1=957792&r2=957793&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Fri Jun 25 04:32:05 2010
@@ -35,6 +35,7 @@ import org.apache.commons.scxml.env.jexl
import org.apache.commons.scxml.io.SCXMLReader;
import org.apache.commons.scxml.io.SCXMLReader.Configuration;
import org.apache.commons.scxml.model.CustomAction;
+import org.apache.commons.scxml.model.ModelException;
import org.apache.commons.scxml.model.SCXML;
import org.apache.commons.scxml.model.TransitionTarget;
/**
@@ -284,6 +285,45 @@ public class SCXMLTestHelper {
return roundtrip;
}
+/**
+ * Get the active leaf state for this executor instance.
+ * Assumes no usage of <parallel>.
+ *
+ * @param exec The {...@link SCXMLExecutor} instance whose active state is
+ * being queried.
+ * @return The id of the active state.
+ */
+public static String getCurrentState(SCXMLExecutor exec) {
+Set current = exec.getCurrentStatus().getStates();
+TransitionTarget active = current.iterator().next();
+return active.getId();
+}
+
+/**
+ * Set the active leaf state for this executor instance.
+ * Assumes no usage of <parallel>.
+ *
+ * @param exec The {...@link SCXMLExecutor} instance whose active state is
+ * to be set.
+ * @param id The id of the state to be made active.
+ */
+public static void setCurrentState(SCXMLExecutor exec, final String id) {
+try {
+exec.reset();
+} catch (ModelException me) {
+throw new IllegalArgumentException("Provided SCXMLExecutor "
++ "instance cannot be reset.");
+}
+TransitionTarget active = exec.getStateMachine().getTargets().get(id);
+if (active == null) {
+throw new IllegalArgumentException("No target with id '" + id
++ "' present in state machine.");
+}
+Set current = exec.getCurrentStatus().getStates();
+current.clear();
+current.add(active);
+}
+
public static String removeCarriageReturns(final String original) {
StringBuffer buf = new StringBuffer();
for (int i = 0; i < original.length(); i++) {
svn commit: r958237 - /commons/sandbox/gsoc/2010/scxml-js/trunk/
Author: rahul Date: Sat Jun 26 15:31:15 2010 New Revision: 958237 URL: http://svn.apache.org/viewvc?rev=958237&view=rev Log: Adding .project to svn:ignore. Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/ (props changed) Propchange: commons/sandbox/gsoc/2010/scxml-js/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sat Jun 26 15:31:15 2010 @@ -1,2 +1,3 @@ +.project build_dbg.sh build
svn commit: r958238 - /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/
Author: rahul Date: Sat Jun 26 15:32:04 2010 New Revision: 958238 URL: http://svn.apache.org/viewvc?rev=958238&view=rev Log: Adding .project to svn:ignore. Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/ (props changed) Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/ -- --- svn:ignore (added) +++ svn:ignore Sat Jun 26 15:32:04 2010 @@ -0,0 +1 @@ +.project
svn commit: r958241 - /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/lib/
Author: rahul Date: Sat Jun 26 16:09:27 2010 New Revision: 958241 URL: http://svn.apache.org/viewvc?rev=958241&view=rev Log: Ignore jar files downloaded to the lib/ directory by the ant build. Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/lib/ (props changed) Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling.diagram/lib/ -- --- svn:ignore (added) +++ svn:ignore Sat Jun 26 16:09:27 2010 @@ -0,0 +1 @@ +*.jar
svn commit: r958301 - in /commons/sandbox/gsoc/2010/scxml-js/trunk: pom.xml src/changes/ src/changes/changes.xml src/site/ src/site/site.xml src/site/xdoc/ src/site/xdoc/index.xml src/site/xdoc/issue-
Author: rahul
Date: Sun Jun 27 00:40:37 2010
New Revision: 958301
URL: http://svn.apache.org/viewvc?rev=958301&view=rev
Log:
Add a website for the scxml-js project:
* The m2 POM is currently used purely for building the site
* Simple site.xml is added, can be improved as docs etc. become available as
part of the site
* A stub changes.xml is provided (TBD whether to maintain this)
* Basic homepage includes a blurb from the README
* Mailing list page via 'mvn commons:mail-page'
* Issue tracking page via 'mvn commons:jira-page' (note: we use the SCXML JIRA
component, not sandbox)
Added:
commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml (with props)
commons/sandbox/gsoc/2010/scxml-js/trunk/src/changes/
commons/sandbox/gsoc/2010/scxml-js/trunk/src/changes/changes.xml (with
props)
commons/sandbox/gsoc/2010/scxml-js/trunk/src/site/
commons/sandbox/gsoc/2010/scxml-js/trunk/src/site/site.xml (with props)
commons/sandbox/gsoc/2010/scxml-js/trunk/src/site/xdoc/
commons/sandbox/gsoc/2010/scxml-js/trunk/src/site/xdoc/index.xml (with
props)
commons/sandbox/gsoc/2010/scxml-js/trunk/src/site/xdoc/issue-tracking.xml
(with props)
commons/sandbox/gsoc/2010/scxml-js/trunk/src/site/xdoc/mail-lists.xml
(with props)
Added: commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml?rev=958301&view=auto
==
--- commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml (added)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml Sun Jun 27 00:40:37 2010
@@ -0,0 +1,105 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ 4.0.0
+
+org.apache.commons
+commons-sandbox-parent
+9
+
+
+ Commons SCXML JavaScript (Sandbox)
+ commons-scxml
+ commons-scxml-js
+ 1.0-SNAPSHOT
+
+ 2010
+
+The Commons SCXML JavaScript project provides an SCXML-to-JavaScript
+compiler optimized for User Interface development on the World Wide Web.
+
+
+ http://commons.apache.org/sandbox/gsoc/2010/scxml-js
+
+
+jira
+http://issues.apache.org/jira/browse/SCXML
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/commons/sandbox/gsoc/2010/scxml-js/trunk
+
scm:svn:https://svn.apache.org/repos/asf/commons/sandbox/gsoc/2010/scxml-js/trunk
+
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk
+
+
+
+
+ Jacob Beard
+ jbeard
+ jbeard AT apache.org
+ Apache Software Foundation
+
+
+ Rahul Akolkar
+ rahul
+ rahul AT apache.org
+ Apache Software Foundation
+
+
+
+
+
+
+ apache.website
+ Apache Commons Site
+
${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/sandbox/gsoc/2010/scxml-js
+
+
+
+
+1.6
+1.6
+scxml-js
+1.0
+RC1
+SCXML
+12310492
+
+
+
+
+
+org.apache.maven.plugins
+maven-changes-plugin
+2.0
+
+ %URL%/%ISSUE%
+
+
+
+
+ changes-report
+
+
+
+
+
+
+
+
Propchange: commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml
--
svn:eol-style = native
Propchange: commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml
--
svn:keywords = Date Author Id Revision HeadURL
Added: commons/sandbox/gsoc/2010/scxml-js/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/src/changes/changes.xml?rev=958301&view=auto
==
--- commons/sandbox/gsoc/2010/scxml-js/trunk/src/changes/changes.xml (added)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/src/changes/changes.xml Sun Jun 27
00:40:37 2010
@@ -0,0 +1,34 @@
+
+
+
+
+Commons SCXML JS Change Log
+
+
+
+
+
+[21-05-2010] Initial commit.
+
+
+[26-06-2010] Added Maven 2 build for site generation.
+
+
+
+
+
Propchange: commons/sandbox/gsoc/2010/scxml-js/trunk/src/changes/changes.xml
--
svn:eol-style = native
Propchange: commons/sandbox/gsoc/2010/scxml-js/trunk/src/changes/changes.xml
--
svn:keywords = Date Author Id Revision HeadURL
Added: commons/sandbox/gsoc/2010/scxml-js/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/gso
svn commit: r958302 - /commons/sandbox/gsoc/2010/scxml-js/trunk/
Author: rahul Date: Sun Jun 27 00:41:39 2010 New Revision: 958302 URL: http://svn.apache.org/viewvc?rev=958302&view=rev Log: Ignore target directory (produced by m2 build). Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/ (props changed) Propchange: commons/sandbox/gsoc/2010/scxml-js/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sun Jun 27 00:41:39 2010 @@ -1,3 +1,4 @@ .project +target build_dbg.sh build
svn commit: r958309 - in /commons/sandbox/gsoc/2010/scxml-eclipse/trunk: pom.xml src/changes/ src/changes/changes.xml src/site/ src/site/site.xml src/site/xdoc/ src/site/xdoc/index.xml src/site/xdoc/i
Author: rahul
Date: Sun Jun 27 01:28:52 2010
New Revision: 958309
URL: http://svn.apache.org/viewvc?rev=958309&view=rev
Log:
Add a website for the scxml-eclipse project:
* The m2 POM is currently used purely for building the site, the dummy
section that skips compilation is introduced until we move to the logical
multi-module build if possible and if there is interest
* Simple site.xml is added, can be improved as docs etc. become available as
part of the site (for example, the ppt building tutorial should be converted to
xdoc)
* A stub changes.xml is provided (TBD whether to maintain this)
* Basic homepage includes a blurb from the README
* Mailing list page via 'mvn commons:mail-page'
* Issue tracking page via 'mvn commons:jira-page' (note: we use the SCXML JIRA
component, not sandbox)
Added:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/pom.xml (with props)
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/changes/
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/changes/changes.xml
(with props)
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/site.xml (with
props)
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/xdoc/
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/xdoc/index.xml
(with props)
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/xdoc/issue-tracking.xml
(with props)
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/xdoc/mail-lists.xml
(with props)
Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/pom.xml?rev=958309&view=auto
==
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/pom.xml (added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/pom.xml Sun Jun 27 01:28:52
2010
@@ -0,0 +1,112 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ 4.0.0
+
+org.apache.commons
+commons-sandbox-parent
+9
+
+
+ Commons SCXML Eclipse (Sandbox)
+ commons-scxml
+ commons-scxml-eclipse
+ 1.0-SNAPSHOT
+
+ 2010
+
+The Commons SCXML Eclipse project aims to provide an Eclipse and GMF
+based visual editor and debugger for SCXML, which can also be used to
+generate SCXML documents and code from a state chart.
+
+
+ http://commons.apache.org/sandbox/gsoc/2010/scxml-eclipse
+
+
+jira
+http://issues.apache.org/jira/browse/SCXML
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/commons/sandbox/gsoc/2010/scxml-eclipse/trunk
+
scm:svn:https://svn.apache.org/repos/asf/commons/sandbox/gsoc/2010/scxml-eclipse/trunk
+
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk
+
+
+
+
+ Xunlong Gui
+ guixl
+ guixl AT apache.org
+ Apache Software Foundation
+
+
+ Rahul Akolkar
+ rahul
+ rahul AT apache.org
+ Apache Software Foundation
+
+
+
+
+
+${basedir}/skip
+${basedir}/skip
+
+
+
+
+
+ apache.website
+ Apache Commons Site
+
${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/sandbox/gsoc/2010/scxml-eclipse
+
+
+
+
+1.6
+1.6
+scxml-eclipse
+1.0
+RC1
+SCXML
+12310492
+
+
+
+
+
+org.apache.maven.plugins
+maven-changes-plugin
+2.0
+
+ %URL%/%ISSUE%
+
+
+
+
+ changes-report
+
+
+
+
+
+
+
+
Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/pom.xml
--
svn:eol-style = native
Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/pom.xml
--
svn:keywords = Date Author Id Revision HeadURL
Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/changes/changes.xml?rev=958309&view=auto
==
--- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/changes/changes.xml
(added)
+++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/changes/changes.xml Sun
Jun 27 01:28:52 2010
@@ -0,0 +1,34 @@
+
+
+
+
+Commons SCXML Eclipse Change Log
+
+
+
+
+
+[17-05-2010] Initial commit.
+
+
+[26-06-2010] Added Maven 2 build for site generation.
+
+
+
+
+
Propchange:
commons/s
svn commit: r958310 - /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/
Author: rahul Date: Sun Jun 27 01:29:42 2010 New Revision: 958310 URL: http://svn.apache.org/viewvc?rev=958310&view=rev Log: Ignore target directory (produced by m2 build). Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/ (props changed) Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sun Jun 27 01:29:42 2010 @@ -1 +1,3 @@ .project +target +
svn commit: r960666 - in /commons/proper/commons-site/trunk/src/site/xdoc/sandbox: gsoc/ gsoc/2010/ gsoc/2010/index.xml gsoc/index.xml index.xml
Author: rahul Date: Mon Jul 5 19:37:58 2010 New Revision: 960666 URL: http://svn.apache.org/viewvc?rev=960666&view=rev Log: Added Google Summer of Code (GSoC) section to the sandbox page and a couple of GSoC landing pages in the directory structure. COMMONSSITE-58 Added: commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/ commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/2010/ commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/2010/index.xml (with props) commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/index.xml (with props) Modified: commons/proper/commons-site/trunk/src/site/xdoc/sandbox/index.xml Added: commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/2010/index.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/2010/index.xml?rev=960666&view=auto == --- commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/2010/index.xml (added) +++ commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/2010/index.xml Mon Jul 5 19:37:58 2010 @@ -0,0 +1,60 @@ + + + + + +2010 GSoC projects in Commons Sandbox +Commons Documentation Team + + + + + + +Here is the list of the two projects from the +http://code.google.com/soc/";>Google Summer of CodeTM +2010 program, in alphabetical order. + + +scxml-eclipse - This project aims to + provide an Eclipse and GMF based visual editor and debugger for SCXML, which + can also be used to generate SCXML documents and code from a state chart. +scxml-js - This project aims develop an + SCXML-to-JavaScript compiler optimized for User Interface development on the + World Wide Web and generate graphical depictions of statecharts for testing + and simulation. + + + + + + + +Please ask on the Commons development mailing list +for the status of any of GSoC projects in the Commons Sandbox. Any development +discussions or suggestions are also welcome on the developers mailing list. + + +A Commons Sandbox component is considered inactive if there +is no active development for a sustained period of time. + + + + + + Propchange: commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/2010/index.xml -- svn:eol-style = native Propchange: commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/2010/index.xml -- svn:keywords = Date Author Id Revision HeadURL Added: commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/index.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/index.xml?rev=960666&view=auto == --- commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/index.xml (added) +++ commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/index.xml Mon Jul 5 19:37:58 2010 @@ -0,0 +1,59 @@ + + + + + +GSoC space in Commons Sandbox +Commons Documentation Team + + + + + + +http://code.google.com/soc/";>Google Summer of CodeTM +is a global program that offers student developers stipends to write code for various +open source software projects. The Apache Software Foundation participates in +the program every year. + + +Some of these projects' websites are listed below. These are listed by their year of +participation: + + 2010 projects + + + + + + + + +Please ask on the Commons developers mailing list +for the status of any of GSoC projects in the Commons Sandbox. Any development +discussions or suggestions are also welcome on the developers mailing list. + + +A Commons Sandbox component is considered inactive if there +is no active development for a sustained period of time. + + + + + + Propchange: commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/index.xml -- svn:eol-style = native Propchange: commons/proper/commons-site/trunk/src/site/xdoc/sandbox/gsoc/index.xml -- svn:keywords = Date Author Id Revision HeadURL Modified: commons/proper/commons-site/trunk/src/site/xdoc/sandbox/index.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/src/site/xdoc/sandbox/index.xml?rev=960
svn commit: r960669 - /commons/proper/commons-site/trunk/
Author: rahul Date: Mon Jul 5 19:43:53 2010 New Revision: 960669 URL: http://svn.apache.org/viewvc?rev=960669&view=rev Log: Ignore .project file. Modified: commons/proper/commons-site/trunk/ (props changed) Propchange: commons/proper/commons-site/trunk/ -- --- svn:ignore (original) +++ svn:ignore Mon Jul 5 19:43:53 2010 @@ -1 +1,2 @@ +.project target
svn commit: r960670 - /commons/proper/scxml/trunk/src/site/xdoc/index.xml
Author: rahul Date: Mon Jul 5 19:46:36 2010 New Revision: 960670 URL: http://svn.apache.org/viewvc?rev=960670&view=rev Log: Added a "Related Projects" section to the Commons SCXML homepage (includes scxml-eclipse and scxml-js). Variant of patch by Xunlong Gui SCXML-150 Modified: commons/proper/scxml/trunk/src/site/xdoc/index.xml Modified: commons/proper/scxml/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/index.xml?rev=960670&r1=960669&r2=960670&view=diff == --- commons/proper/scxml/trunk/src/site/xdoc/index.xml (original) +++ commons/proper/scxml/trunk/src/site/xdoc/index.xml Mon Jul 5 19:46:36 2010 @@ -122,6 +122,24 @@ + + + Related projects providing some SCXML-related functionality: + + + http://commons.apache.org/sandbox/gsoc/2010/scxml-eclipse/";>Commons SCXML - Eclipse - + This project aims to provide an Eclipse and GMF based visual editor and debugger for SCXML, which can + also be used to generate SCXML documents and code from a state chart. + + + http://commons.apache.org/sandbox/gsoc/2010/scxml-js/";>Commons SCXML - JavaScript - + This project aims develop an SCXML-to-JavaScript compiler optimized for User Interface development on + the World Wide Web and generate graphical depictions of statecharts for testing and simulation. + + + + +
svn commit: r960707 - /commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/xdoc/index.xml
Author: rahul Date: Mon Jul 5 21:24:20 2010 New Revision: 960707 URL: http://svn.apache.org/viewvc?rev=960707&view=rev Log: Reword project intro on home page. Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/xdoc/index.xml Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/xdoc/index.xml?rev=960707&r1=960706&r2=960707&view=diff == --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/xdoc/index.xml (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/site/xdoc/index.xml Mon Jul 5 21:24:20 2010 @@ -24,15 +24,18 @@ - http://www.w3.org/TR/scxml/";>State Chart XML is very useful to handler complex status transfer logic. http://commons.apache.org/scxml/index.html";>Commons SCXML is an implementation aimed at creating and maintaining a Java SCXML engine capable of executing a state machine defined using a SCXML document, while abstracting out the environment interfaces. - - - Now,more and more developers use it to help handler complex program logic,but edit a State Chart XML is so boring and mistakable.If a SCXML file is really so huge and complex,it will become too difficult to maintain and refactor or to test its logic validity.For example,if a SCXML flow has more than 20 States,it is possible to form an dead loop due to developer's glitch. In fact, the archives of the Apache Commons SCXML user mailing list will show many queries asking for it over the years.Obviously, Eclipse is the most power and popular Integration Develop Environment for developers, if it supplies an editor or even debuger for State Chart XML, isn't it cool ? + +http://www.w3.org/TR/scxml";>State Chart XML (SCXML) provides a generic state-machine based execution +environment based on Harel State Tables. Apache Commons already provides an implementation in +http://commons.apache.org/scxml/";>Commons SCXML aimed at creating and maintaining a Java SCXML +engine capable of executing a state machine defined using a SCXML document, while abstracting out the environment +interfaces. - This project aims to provide an Eclipse and GMF based visual - editor and debugger for SCXML, which can also be used to generate SCXML - documents and code from a state chart. +This project provides http://www.eclipse.org";>Eclipse-based SCXML tooling. SCXML is very useful +to handle complex state transfer logic, but if a SCXML file is large and complex, it may become too difficult to maintain +and refactor or to test its logic. This project aims to provide an Eclipse and GMF based visual editor and debugger for +SCXML, which can also be used to generate SCXML documents and code from a state chart.
svn commit: r964493 - /commons/proper/scxml/trunk/src/site/xdoc/index.xml
Author: rahul Date: Thu Jul 15 17:08:50 2010 New Revision: 964493 URL: http://svn.apache.org/viewvc?rev=964493&view=rev Log: Add scxmlgui in related projects section. Modified version of patch by: Fabrizio Morbini SCXML-151 Modified: commons/proper/scxml/trunk/src/site/xdoc/index.xml Modified: commons/proper/scxml/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/site/xdoc/index.xml?rev=964493&r1=964492&r2=964493&view=diff == --- commons/proper/scxml/trunk/src/site/xdoc/index.xml (original) +++ commons/proper/scxml/trunk/src/site/xdoc/index.xml Thu Jul 15 17:08:50 2010 @@ -136,6 +136,10 @@ This project aims develop an SCXML-to-JavaScript compiler optimized for User Interface development on the World Wide Web and generate graphical depictions of statecharts for testing and simulation. + + http://code.google.com/p/scxmlgui/";>scxmlgui - + This project aims to provide a simple GUI to edit SCXML state charts. +
svn commit: r964494 - /commons/proper/scxml/branches/J6/src/site/xdoc/index.xml
Author: rahul Date: Thu Jul 15 17:09:15 2010 New Revision: 964494 URL: http://svn.apache.org/viewvc?rev=964494&view=rev Log: Sync related projects section from trunk. Modified: commons/proper/scxml/branches/J6/src/site/xdoc/index.xml Modified: commons/proper/scxml/branches/J6/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/site/xdoc/index.xml?rev=964494&r1=964493&r2=964494&view=diff == --- commons/proper/scxml/branches/J6/src/site/xdoc/index.xml (original) +++ commons/proper/scxml/branches/J6/src/site/xdoc/index.xml Thu Jul 15 17:09:15 2010 @@ -122,6 +122,28 @@ + + + Related projects providing some SCXML-related functionality: + + + http://commons.apache.org/sandbox/gsoc/2010/scxml-eclipse/";>Commons SCXML - Eclipse - + This project aims to provide an Eclipse and GMF based visual editor and debugger for SCXML, which can + also be used to generate SCXML documents and code from a state chart. + + + http://commons.apache.org/sandbox/gsoc/2010/scxml-js/";>Commons SCXML - JavaScript - + This project aims develop an SCXML-to-JavaScript compiler optimized for User Interface development on + the World Wide Web and generate graphical depictions of statecharts for testing and simulation. + + + http://code.google.com/p/scxmlgui/";>scxmlgui - + This project aims to provide a simple GUI to edit SCXML state charts. + + + + +
svn propchange: r964665 - svn:log
Author: rahul Revision: 964665 Modified property: svn:log Modified: svn:log at Fri Jul 16 15:41:30 2010 -- (empty)
svn propchange: r964665 - svn:log
Author: rahul Revision: 964665 Modified property: svn:log Modified: svn:log at Fri Jul 16 15:45:25 2010 -- --- svn:log (original) +++ svn:log Fri Jul 16 15:45:25 2010 @@ -1 +1 @@ -add prefix "*.scxml" for document import file selection dialog +SCXML-153 : add prefix '*.scxml' for document import file selection dialog
svn commit: r964975 - /commons/proper/scxml/trunk/pom.xml
Author: rahul Date: Fri Jul 16 23:14:15 2010 New Revision: 964975 URL: http://svn.apache.org/viewvc?rev=964975&view=rev Log: Upgrading Commons Parent POM to latest release (v17). Modified: commons/proper/scxml/trunk/pom.xml Modified: commons/proper/scxml/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/pom.xml?rev=964975&r1=964974&r2=964975&view=diff == --- commons/proper/scxml/trunk/pom.xml (original) +++ commons/proper/scxml/trunk/pom.xml Fri Jul 16 23:14:15 2010 @@ -20,7 +20,7 @@ org.apache.commons commons-parent -15 +17 4.0.0
svn commit: r964976 - /commons/proper/scxml/branches/J6/pom.xml
Author: rahul Date: Fri Jul 16 23:14:50 2010 New Revision: 964976 URL: http://svn.apache.org/viewvc?rev=964976&view=rev Log: Upgrading Commons Parent POM to latest release (v17). Modified: commons/proper/scxml/branches/J6/pom.xml Modified: commons/proper/scxml/branches/J6/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/pom.xml?rev=964976&r1=964975&r2=964976&view=diff == --- commons/proper/scxml/branches/J6/pom.xml (original) +++ commons/proper/scxml/branches/J6/pom.xml Fri Jul 16 23:14:50 2010 @@ -20,7 +20,7 @@ org.apache.commons commons-parent -15 +17 4.0.0
svn commit: r964979 - /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Author: rahul
Date: Fri Jul 16 23:22:30 2010
New Revision: 964979
URL: http://svn.apache.org/viewvc?rev=964979&view=rev
Log:
Add a String to namespace aware Document utility method for tests.
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java?rev=964979&r1=964978&r2=964979&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
Fri Jul 16 23:22:30 2010
@@ -21,12 +21,15 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.io.StringReader;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
+import javax.xml.parsers.DocumentBuilderFactory;
+
import junit.framework.Assert;
import org.apache.commons.scxml.env.SimpleDispatcher;
@@ -38,6 +41,8 @@ import org.apache.commons.scxml.model.Cu
import org.apache.commons.scxml.model.ModelException;
import org.apache.commons.scxml.model.SCXML;
import org.apache.commons.scxml.model.TransitionTarget;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
/**
* Helper methods for running SCXML unit tests.
*/
@@ -286,6 +291,22 @@ public class SCXMLTestHelper {
}
/**
+ * Parses a String containing XML source into a {...@link Document}.
+ *
+ * @param xml The XML source as a String.
+ * @return The parsed {...@link Document}.
+ */
+public static Document stringToXMLDocument(final String xml) {
+try {
+DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+dbf.setNamespaceAware(true);
+return dbf.newDocumentBuilder().parse(new InputSource(new
StringReader(xml)));
+} catch (Exception e) {
+throw new RuntimeException("Exception parsing String to Node:\n" +
xml);
+}
+}
+
+/**
* Get the active leaf state for this executor instance.
* Assumes no usage of <parallel>.
*
svn commit: r964982 - in /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath: XPathExampleTest.java example-01.xml
Author: rahul
Date: Fri Jul 16 23:36:32 2010
New Revision: 964982
URL: http://svn.apache.org/viewvc?rev=964982&view=rev
Log:
Add an example of a guard condition operating over the XML payload of an event.
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/example-01.xml
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java?rev=964982&r1=964981&r2=964982&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/XPathExampleTest.java
Fri Jul 16 23:36:32 2010
@@ -28,6 +28,7 @@ import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.Evaluator;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
+import org.apache.commons.scxml.TriggerEvent;
import org.apache.commons.scxml.model.SCXML;
import org.apache.commons.scxml.model.State;
import org.apache.commons.scxml.model.TransitionTarget;
@@ -82,8 +83,15 @@ public class XPathExampleTest extends Te
assertNotNull(exec);
Set currentStates =
exec.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("end", ((State)currentStates.iterator().
+assertEquals("mid", ((State)currentStates.iterator().
next()).getId());
+
+String payload = "complete";
+SCXMLTestHelper.assertPostTriggerState(exec,
+new TriggerEvent("foo", TriggerEvent.SIGNAL_EVENT,
+SCXMLTestHelper.stringToXMLDocument(payload)),
+"end");
+
}
}
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=964982&r1=964981&r2=964982&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 16 23:36:32 2010
@@ -41,15 +41,19 @@
expr="cs:Data('jungle','animals/lion/name')" />
+target="mid" />
-
+
-
+
+
+
+
svn commit: r987963 - in /commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations: DigesterLoader.java handlers/MethodHandler.java
Author: rahul
Date: Mon Aug 23 01:07:39 2010
New Revision: 987963
URL: http://svn.apache.org/viewvc?rev=987963&view=rev
Log:
Humor the Sun compiler on XP.
Modified:
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/DigesterLoader.java
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/handlers/MethodHandler.java
Modified:
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/DigesterLoader.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/DigesterLoader.java?rev=987963&r1=987962&r2=987963&view=diff
==
---
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/DigesterLoader.java
(original)
+++
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/DigesterLoader.java
Mon Aug 23 01:07:39 2010
@@ -182,7 +182,7 @@ public final class DigesterLoader {
* @param element the current visited element.
*/
@SuppressWarnings("unchecked")
-private void handle(A
annotation, E element, FromAnnotationsRuleSet ruleSet) {
+private
void handle(A annotation, E element, FromAnnotationsRuleSet ruleSet) {
Class annotationType = annotation.annotationType();
// check if it is one of the @*.List annotation
@@ -198,7 +198,7 @@ public final class DigesterLoader {
DigesterRule digesterRule =
annotationType.getAnnotation(DigesterRule.class);
if (DefaultLoaderHandler.class == digesterRule.handledBy()) {
-Class>
providerType = (Class>)
digesterRule.providedBy();
+Class> providerType
= (Class>) digesterRule.providedBy();
ruleSet.addRuleProvider(AnnotationUtils.getAnnotationPattern(annotation),
providerType,
annotation,
Modified:
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/handlers/MethodHandler.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/handlers/MethodHandler.java?rev=987963&r1=987962&r2=987963&view=diff
==
---
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/handlers/MethodHandler.java
(original)
+++
commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/handlers/MethodHandler.java
Mon Aug 23 01:07:39 2010
@@ -106,13 +106,13 @@ public final class MethodHandler impleme
}
@SuppressWarnings("unchecked")
-private void doHandle(A methodAnnotation,
Annotation annotation, Method method, Class type, FromAnnotationsRuleSet
ruleSet) {
+private void doHandle(A
methodAnnotation, Annotation annotation, Method method, Class type,
FromAnnotationsRuleSet ruleSet) {
if (annotation.annotationType().isAnnotationPresent(DigesterRule.class)
&&
annotation.annotationType().isAnnotationPresent(CreationRule.class)) {
ruleSet.addRules(type);
DigesterRule digesterRule =
methodAnnotation.annotationType().getAnnotation(DigesterRule.class);
-Class>
providerType = (Class>) digesterRule.providedBy();
+Class> providerType
= (Class>)
digesterRule.providedBy();
ruleSet.addRuleProvider(AnnotationUtils.getAnnotationPattern(annotation),
providerType,
methodAnnotation,
svn commit: r987965 - /commons/proper/digester/trunk/src/java/org/apache/commons/digester/annotations/
Author: rahul Date: Mon Aug 23 01:11:08 2010 New Revision: 987965 URL: http://svn.apache.org/viewvc?rev=987965&view=rev Log: [at-digester] Part 1 of 2. Copy the at-digester source packages from sandbox. This functionality makes it possible to add digester rules via annotations on the POJOs themselves that the digester will map the XML into. See package.html in the new annotations package for details and examples. Thanks to Simone Tripodi . Added: commons/proper/digester/trunk/src/java/org/apache/commons/digester/annotations/ - copied from r987964, commons/sandbox/at-digester/trunk/src/java/org/apache/commons/digester/annotations/
svn commit: r987966 - /commons/proper/digester/trunk/src/test/org/apache/commons/digester/annotations/
Author: rahul Date: Mon Aug 23 01:12:12 2010 New Revision: 987966 URL: http://svn.apache.org/viewvc?rev=987966&view=rev Log: [at-digester] Part 2 of 2. Copy the at-digester tests from sandbox. Thanks to Simone Tripodi . Added: commons/proper/digester/trunk/src/test/org/apache/commons/digester/annotations/ - copied from r987965, commons/sandbox/at-digester/trunk/src/test/org/apache/commons/digester/annotations/
svn commit: r987967 - /commons/sandbox/at-digester/trunk/
Author: rahul Date: Mon Aug 23 01:17:00 2010 New Revision: 987967 URL: http://svn.apache.org/viewvc?rev=987967&view=rev Log: Ignore Eclipse files. Modified: commons/sandbox/at-digester/trunk/ (props changed) Propchange: commons/sandbox/at-digester/trunk/ -- --- svn:ignore (original) +++ svn:ignore Mon Aug 23 01:17:00 2010 @@ -1,2 +1,5 @@ +.project +.classpath +.settings target maven-eclipse.xml
svn commit: r987970 - /commons/proper/digester/trunk/pom.xml
Author: rahul Date: Mon Aug 23 01:25:35 2010 New Revision: 987970 URL: http://svn.apache.org/viewvc?rev=987970&view=rev Log: Suppress most logging output during build. Modified: commons/proper/digester/trunk/pom.xml Modified: commons/proper/digester/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/pom.xml?rev=987970&r1=987969&r2=987970&view=diff == --- commons/proper/digester/trunk/pom.xml (original) +++ commons/proper/digester/trunk/pom.xml Mon Aug 23 01:25:35 2010 @@ -217,6 +217,17 @@ **/TestRuleSet.java **/Test*$*.java + + + + org.apache.commons.logging.Log + org.apache.commons.logging.impl.SimpleLog + + + org.apache.commons.logging.simplelog.defaultlog + fatal + +
svn commit: r987971 - /commons/proper/digester/branches/1_X_LINE/pom.xml
Author: rahul Date: Mon Aug 23 01:25:46 2010 New Revision: 987971 URL: http://svn.apache.org/viewvc?rev=987971&view=rev Log: Suppress most logging output during build. Modified: commons/proper/digester/branches/1_X_LINE/pom.xml Modified: commons/proper/digester/branches/1_X_LINE/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/digester/branches/1_X_LINE/pom.xml?rev=987971&r1=987970&r2=987971&view=diff == --- commons/proper/digester/branches/1_X_LINE/pom.xml (original) +++ commons/proper/digester/branches/1_X_LINE/pom.xml Mon Aug 23 01:25:46 2010 @@ -213,6 +213,17 @@ **/TestRuleSet.java **/Test*$*.java + + + + org.apache.commons.logging.Log + org.apache.commons.logging.impl.SimpleLog + + + org.apache.commons.logging.simplelog.defaultlog + fatal + +
svn commit: r987972 - /commons/proper/digester/branches/1_X_LINE/xdocs/images/
Author: rahul Date: Mon Aug 23 01:29:22 2010 New Revision: 987972 URL: http://svn.apache.org/viewvc?rev=987972&view=rev Log: Ignore Thumbs.db in images directory. Modified: commons/proper/digester/branches/1_X_LINE/xdocs/images/ (props changed) Propchange: commons/proper/digester/branches/1_X_LINE/xdocs/images/ -- --- svn:ignore (added) +++ svn:ignore Mon Aug 23 01:29:22 2010 @@ -0,0 +1 @@ +Thumbs.db
svn commit: r992789 - /commons/proper/digester/trunk/pom.xml
Author: rahul Date: Sun Sep 5 14:13:05 2010 New Revision: 992789 URL: http://svn.apache.org/viewvc?rev=992789&view=rev Log: Use latest changes plugin (2.0 causes NPE). Modified: commons/proper/digester/trunk/pom.xml Modified: commons/proper/digester/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/pom.xml?rev=992789&r1=992788&r2=992789&view=diff == --- commons/proper/digester/trunk/pom.xml (original) +++ commons/proper/digester/trunk/pom.xml Sun Sep 5 14:13:05 2010 @@ -264,7 +264,7 @@ org.apache.maven.plugins maven-changes-plugin -2.0 +2.3 %URL%/../%ISSUE%
svn commit: r992793 - /commons/proper/digester/branches/1_X_LINE/pom.xml
Author: rahul Date: Sun Sep 5 14:25:08 2010 New Revision: 992793 URL: http://svn.apache.org/viewvc?rev=992793&view=rev Log: Use latest changes plugin (2.0 causes NPE) - porting r992789 from trunk. Modified: commons/proper/digester/branches/1_X_LINE/pom.xml Modified: commons/proper/digester/branches/1_X_LINE/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/digester/branches/1_X_LINE/pom.xml?rev=992793&r1=992792&r2=992793&view=diff == --- commons/proper/digester/branches/1_X_LINE/pom.xml (original) +++ commons/proper/digester/branches/1_X_LINE/pom.xml Sun Sep 5 14:25:08 2010 @@ -270,7 +270,7 @@ org.apache.maven.plugins maven-changes-plugin -2.0 +2.3 %URL%/../%ISSUE%
svn commit: r997117 - /commons/proper/scxml/branches/J6/pom.xml
Author: rahul Date: Tue Sep 14 22:23:35 2010 New Revision: 997117 URL: http://svn.apache.org/viewvc?rev=997117&view=rev Log: Replace deprecated systemProperties by systemPropertyVariables - porting r997105 from trunk. Modified: commons/proper/scxml/branches/J6/pom.xml Modified: commons/proper/scxml/branches/J6/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/pom.xml?rev=997117&r1=997116&r2=997117&view=diff == --- commons/proper/scxml/branches/J6/pom.xml (original) +++ commons/proper/scxml/branches/J6/pom.xml Tue Sep 14 22:23:35 2010 @@ -249,17 +249,11 @@ org/apache/commons/scxml/semantics/SemanticsTestSuite.java org/apache/commons/scxml/test/TestingTestSuite.java - - - - org.apache.commons.logging.Log - org.apache.commons.logging.impl.SimpleLog - - - org.apache.commons.logging.simplelog.defaultlog - fatal - - + + + org.apache.commons.logging.impl.SimpleLog + fatal +
svn commit: r638620 - in /commons/proper/scxml/trunk: build.xml pom.xml project.xml
Author: rahul Date: Tue Mar 18 15:44:42 2008 New Revision: 638620 URL: http://svn.apache.org/viewvc?rev=638620&view=rev Log: Try to improve the dependencies page on the m2 site by using myfaces-api:1.1.5. Also move the build.xml over to use the m2 repo. Modified: commons/proper/scxml/trunk/build.xml commons/proper/scxml/trunk/pom.xml commons/proper/scxml/trunk/project.xml Modified: commons/proper/scxml/trunk/build.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/build.xml?rev=638620&r1=638619&r2=638620&view=diff == --- commons/proper/scxml/trunk/build.xml (original) +++ commons/proper/scxml/trunk/build.xml Tue Mar 18 15:44:42 2008 @@ -201,25 +201,25 @@ -http://www.ibiblio.org/maven/junit/jars/junit-3.8.2.jar";> +http://www.ibiblio.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar";> -http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.8.jar";> +http://www.ibiblio.org/maven2/commons-digester/commons-digester/1.8/commons-digester-1.8.jar";> -http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.7.0.jar";> +http://www.ibiblio.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar";> -http://www.ibiblio.org/maven/commons-el/jars/commons-el-1.0.jar";> +http://www.ibiblio.org/maven2/commons-el/commons-el/1.0/commons-el-1.0.jar";> -http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-1.1.jar";> +http://www.ibiblio.org/maven2/commons-jexl/commons-jexl/1.1/commons-jexl-1.1.jar";> -http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.1.1.jar";> +http://www.ibiblio.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar";> -http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.4.jar";> +http://www.ibiblio.org/maven2/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar";> -http://www.ibiblio.org/maven/javax.servlet/jars/jsp-api-2.0.jar";> +http://www.ibiblio.org/maven2/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar";> -http://www.ibiblio.org/maven/myfaces/jars/myfaces-all-1.1.0.jar";> +http://www.ibiblio.org/maven2/org/apache/myfaces/core/myfaces-api/1.1.5/myfaces-api-1.1.5.jar";> -http://www.ibiblio.org/maven/xalan/jars/xalan-2.6.0.jar";> +http://www.ibiblio.org/maven2/xalan/xalan/2.6.0/xalan-2.6.0.jar";> Modified: commons/proper/scxml/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/pom.xml?rev=638620&r1=638619&r2=638620&view=diff == --- commons/proper/scxml/trunk/pom.xml (original) +++ commons/proper/scxml/trunk/pom.xml Tue Mar 18 15:44:42 2008 @@ -154,9 +154,9 @@ true - myfaces - myfaces-all - 1.1.0 + org.apache.myfaces.core + myfaces-api + 1.1.5 provided true Modified: commons/proper/scxml/trunk/project.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/project.xml?rev=638620&r1=638619&r2=638620&view=diff == --- commons/proper/scxml/trunk/project.xml (original) +++ commons/proper/scxml/trunk/project.xml Tue Mar 18 15:44:42 2008 @@ -235,9 +235,9 @@ - myfaces - myfaces-all - 1.1.0 + org.apache.myfaces.core + myfaces-api + 1.1.5 http://myfaces.apache.org/ <b>Usecases</b>
svn commit: r638624 - in /commons/proper/scxml/branches/J5: build.xml pom.xml project.xml
Author: rahul Date: Tue Mar 18 15:48:35 2008 New Revision: 638624 URL: http://svn.apache.org/viewvc?rev=638624&view=rev Log: Port r638620 from trunk. Try to improve the dependencies page on the m2 site by using myfaces-api:1.1.5. Also move the build.xml over to use the m2 repo. Modified: commons/proper/scxml/branches/J5/build.xml commons/proper/scxml/branches/J5/pom.xml commons/proper/scxml/branches/J5/project.xml Modified: commons/proper/scxml/branches/J5/build.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/build.xml?rev=638624&r1=638623&r2=638624&view=diff == --- commons/proper/scxml/branches/J5/build.xml (original) +++ commons/proper/scxml/branches/J5/build.xml Tue Mar 18 15:48:35 2008 @@ -203,25 +203,25 @@ -http://www.ibiblio.org/maven/junit/jars/junit-3.8.2.jar";> +http://www.ibiblio.org/maven2/junit/junit/3.8.2/junit-3.8.2.jar";> -http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.8.jar";> +http://www.ibiblio.org/maven2/commons-digester/commons-digester/1.8/commons-digester-1.8.jar";> -http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.7.0.jar";> +http://www.ibiblio.org/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar";> -http://www.ibiblio.org/maven/commons-el/jars/commons-el-1.0.jar";> +http://www.ibiblio.org/maven2/commons-el/commons-el/1.0/commons-el-1.0.jar";> -http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-1.1.jar";> +http://www.ibiblio.org/maven2/commons-jexl/commons-jexl/1.1/commons-jexl-1.1.jar";> -http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.1.1.jar";> +http://www.ibiblio.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar";> -http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.4.jar";> +http://www.ibiblio.org/maven2/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar";> -http://www.ibiblio.org/maven/javax.servlet/jars/jsp-api-2.0.jar";> +http://www.ibiblio.org/maven2/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar";> -http://www.ibiblio.org/maven/myfaces/jars/myfaces-all-1.1.0.jar";> +http://www.ibiblio.org/maven2/org/apache/myfaces/core/myfaces-api/1.1.5/myfaces-api-1.1.5.jar";> -http://www.ibiblio.org/maven/xalan/jars/xalan-2.6.0.jar";> +http://www.ibiblio.org/maven2/xalan/xalan/2.6.0/xalan-2.6.0.jar";> Modified: commons/proper/scxml/branches/J5/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/pom.xml?rev=638624&r1=638623&r2=638624&view=diff == --- commons/proper/scxml/branches/J5/pom.xml (original) +++ commons/proper/scxml/branches/J5/pom.xml Tue Mar 18 15:48:35 2008 @@ -154,9 +154,9 @@ true - myfaces - myfaces-all - 1.1.0 + org.apache.myfaces.core + myfaces-api + 1.1.5 provided true Modified: commons/proper/scxml/branches/J5/project.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/project.xml?rev=638624&r1=638623&r2=638624&view=diff == --- commons/proper/scxml/branches/J5/project.xml (original) +++ commons/proper/scxml/branches/J5/project.xml Tue Mar 18 15:48:35 2008 @@ -235,9 +235,9 @@ - myfaces - myfaces-all - 1.1.0 + org.apache.myfaces.core + myfaces-api + 1.1.5 http://myfaces.apache.org/ <b>Usecases</b>
svn commit: r647969 - /commons/trunks-sandbox/
Author: rahul Date: Mon Apr 14 12:38:37 2008 New Revision: 647969 URL: http://svn.apache.org/viewvc?rev=647969&view=rev Log: Add [me] to sandbox externals. Modified: commons/trunks-sandbox/ (props changed) Propchange: commons/trunks-sandbox/ -- --- svn:externals (original) +++ svn:externals Mon Apr 14 12:38:37 2008 @@ -9,6 +9,7 @@ id https://svn.apache.org/repos/asf/commons/sandbox/id/trunk javaflow https://svn.apache.org/repos/asf/commons/sandbox/javaflow/trunk js2j https://svn.apache.org/repos/asf/commons/sandbox/js2j/trunk +me https://svn.apache.org/repos/asf/commons/sandbox/me/trunk monitoring https://svn.apache.org/repos/asf/commons/sandbox/monitoring/trunk openpgp https://svn.apache.org/repos/asf/commons/sandbox/openpgp/trunk performance https://svn.apache.org/repos/asf/commons/sandbox/performance/trunk
svn commit: r648002 - /commons/sandbox/expression/
Author: rahul Date: Mon Apr 14 14:25:18 2008 New Revision: 648002 URL: http://svn.apache.org/viewvc?rev=648002&view=rev Log: Adding the new [expression] component to the sandbox. Added: commons/sandbox/expression/
svn commit: r648003 - /commons/sandbox/expression/branches/
Author: rahul Date: Mon Apr 14 14:26:06 2008 New Revision: 648003 URL: http://svn.apache.org/viewvc?rev=648003&view=rev Log: Creating holder for [expression] branches. Added: commons/sandbox/expression/branches/
svn commit: r648004 - /commons/sandbox/expression/tags/
Author: rahul Date: Mon Apr 14 14:26:39 2008 New Revision: 648004 URL: http://svn.apache.org/viewvc?rev=648004&view=rev Log: Creating holder for [expression] tags. Added: commons/sandbox/expression/tags/
svn commit: r648005 - /commons/sandbox/expression/trunk/
Author: rahul Date: Mon Apr 14 14:27:18 2008 New Revision: 648005 URL: http://svn.apache.org/viewvc?rev=648005&view=rev Log: Creating [expression] trunk. Added: commons/sandbox/expression/trunk/
svn commit: r648009 - /commons/trunks-sandbox/
Author: rahul Date: Mon Apr 14 14:32:13 2008 New Revision: 648009 URL: http://svn.apache.org/viewvc?rev=648009&view=rev Log: Add [expression] to trunks-sandbox externals. Modified: commons/trunks-sandbox/ (props changed) Propchange: commons/trunks-sandbox/ -- --- svn:externals (original) +++ svn:externals Mon Apr 14 14:32:13 2008 @@ -3,6 +3,7 @@ compress https://svn.apache.org/repos/asf/commons/sandbox/compress/trunk csv https://svn.apache.org/repos/asf/commons/sandbox/csv/trunk exec https://svn.apache.org/repos/asf/commons/sandbox/exec/trunk +expression https://svn.apache.org/repos/asf/commons/sandbox/expression/trunk finder https://svn.apache.org/repos/asf/commons/sandbox/finder/trunk functor https://svn.apache.org/repos/asf/commons/sandbox/functor/trunk i18n https://svn.apache.org/repos/asf/commons/sandbox/i18n/trunk
svn commit: r648015 - in /commons/sandbox/expression/trunk: LICENSE.txt NOTICE.txt PROPOSAL.html doap_expression.rdf
Author: rahul Date: Mon Apr 14 14:43:48 2008 New Revision: 648015 URL: http://svn.apache.org/viewvc?rev=648015&view=rev Log: Bootstrap trunk with self-descriptive artifacts: * Proposal (for archival) * LICENSE * NOTICE * DOAP Added: commons/sandbox/expression/trunk/LICENSE.txt (with props) commons/sandbox/expression/trunk/NOTICE.txt (with props) commons/sandbox/expression/trunk/PROPOSAL.html (with props) commons/sandbox/expression/trunk/doap_expression.rdf (with props) Added: commons/sandbox/expression/trunk/LICENSE.txt URL: http://svn.apache.org/viewvc/commons/sandbox/expression/trunk/LICENSE.txt?rev=648015&view=auto == --- commons/sandbox/expression/trunk/LICENSE.txt (added) +++ commons/sandbox/expression/trunk/LICENSE.txt Mon Apr 14 14:43:48 2008 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative W
svn commit: r648027 - /commons/proper/scxml/branches/J5/BRANCHINFO.txt
Author: rahul Date: Mon Apr 14 15:06:07 2008 New Revision: 648027 URL: http://svn.apache.org/viewvc?rev=648027&view=rev Log: Since branch has moved to J6, we can more easily eliminate the dependency on Commons Digester (and BeanUtils) -- add a rewrite parser TODO to that effect. Modified: commons/proper/scxml/branches/J5/BRANCHINFO.txt Modified: commons/proper/scxml/branches/J5/BRANCHINFO.txt URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J5/BRANCHINFO.txt?rev=648027&r1=648026&r2=648027&view=diff == --- commons/proper/scxml/branches/J5/BRANCHINFO.txt (original) +++ commons/proper/scxml/branches/J5/BRANCHINFO.txt Mon Apr 14 15:06:07 2008 @@ -51,4 +51,5 @@ * Static imports - WONTFIX J6 * Use javax.script for more pluggable ELs - Added env.javascript package - + * Rewrite parser: switch to javax.xml.stream and eliminate dependency on + Commons Digester (and thereby, Commons BeanUtils as well)
svn commit: r648034 - in /commons/proper/scxml/branches: J5/ J6/
Author: rahul Date: Mon Apr 14 15:30:04 2008 New Revision: 648034 URL: http://svn.apache.org/viewvc?rev=648034&view=rev Log: Update to a more appropriate name for the branch, given recent changes. Added: commons/proper/scxml/branches/J6/ - copied from r648033, commons/proper/scxml/branches/J5/ Removed: commons/proper/scxml/branches/J5/
svn commit: r648036 - /commons/proper/scxml/branches/J6/BRANCHINFO.txt
Author: rahul Date: Mon Apr 14 15:32:06 2008 New Revision: 648036 URL: http://svn.apache.org/viewvc?rev=648036&view=rev Log: Branch was renamed, update name in BRANCHINFO. Modified: commons/proper/scxml/branches/J6/BRANCHINFO.txt Modified: commons/proper/scxml/branches/J6/BRANCHINFO.txt URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/BRANCHINFO.txt?rev=648036&r1=648035&r2=648036&view=diff == --- commons/proper/scxml/branches/J6/BRANCHINFO.txt (original) +++ commons/proper/scxml/branches/J6/BRANCHINFO.txt Mon Apr 14 15:32:06 2008 @@ -16,7 +16,7 @@ $Id$ COMMONS SCXML - J5 BRANCH + J6 BRANCH -- PURPOSE --
svn commit: r649736 - /commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
Author: rahul Date: Fri Apr 18 18:34:34 2008 New Revision: 649736 URL: http://svn.apache.org/viewvc?rev=649736&view=rev Log: Javadoc notes, some operations shouldn't be performed (i.e. behavior is undefined) once the executor is initiated. Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java?rev=649736&r1=649735&r2=649736&view=diff == --- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java (original) +++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java Fri Apr 18 18:34:34 2008 @@ -274,6 +274,7 @@ /** * Set the expression evaluator. + * NOTE: Should only be used before the executor is set in motion. * * @param evaluator The evaluator to set. */ @@ -292,6 +293,7 @@ /** * Set the root context for this execution. + * NOTE: Should only be used before the executor is set in motion. * * @param rootContext The Context that ties to the host environment. */ @@ -319,6 +321,7 @@ /** * Set the state machine to be executed. + * NOTE: Should only be used before the executor is set in motion. * * @param stateMachine The stateMachine to set. */
svn commit: r649737 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
Author: rahul Date: Fri Apr 18 18:36:53 2008 New Revision: 649737 URL: http://svn.apache.org/viewvc?rev=649737&view=rev Log: Port r649736 from trunk: Javadoc notes, some operations shouldn't be performed (i.e. behavior is undefined) once the executor is initiated. Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java?rev=649737&r1=649736&r2=649737&view=diff == --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java Fri Apr 18 18:36:53 2008 @@ -271,6 +271,7 @@ /** * Set the expression evaluator. + * NOTE: Should only be used before the executor is set in motion. * * @param evaluator The evaluator to set. */ @@ -289,6 +290,7 @@ /** * Set the root context for this execution. + * NOTE: Should only be used before the executor is set in motion. * * @param rootContext The Context that ties to the host environment. */ @@ -316,6 +318,7 @@ /** * Set the state machine to be executed. + * NOTE: Should only be used before the executor is set in motion. * * @param stateMachine The stateMachine to set. */
svn commit: r649742 - /commons/trunks-dormant/
Author: rahul Date: Fri Apr 18 19:42:52 2008 New Revision: 649742 URL: http://svn.apache.org/viewvc?rev=649742&view=rev Log: Remove [functor] since its moved to the sandbox. Modified: commons/trunks-dormant/ (props changed) Propchange: commons/trunks-dormant/ -- --- svn:externals (original) +++ svn:externals Fri Apr 18 19:42:52 2008 @@ -8,7 +8,6 @@ events https://svn.apache.org/repos/asf/commons/dormant/events/trunk feedparser https://svn.apache.org/repos/asf/commons/dormant/feedparser/trunk filters https://svn.apache.org/repos/asf/commons/dormant/filters/trunk -functor https://svn.apache.org/repos/asf/commons/dormant/functor/trunk graph2 https://svn.apache.org/repos/asf/commons/dormant/graph2/trunk httphttps://svn.apache.org/repos/asf/commons/dormant/http/trunk jex https://svn.apache.org/repos/asf/commons/dormant/jex/trunk
svn commit: r651742 - in /commons/proper/scxml/trunk/src: main/java/org/apache/commons/scxml/io/ test/java/org/apache/commons/scxml/issues/
Author: rahul
Date: Fri Apr 25 16:48:13 2008
New Revision: 651742
URL: http://svn.apache.org/viewvc?rev=651742&view=rev
Log:
Enhancement request for supporting fragment URLs in 's src attribute.
SCXML-62
Added:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java
(with props)
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue62-01-ext.xml
(with props)
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue62-01.xml
(with props)
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue62-02-ext.xml
(with props)
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue62-02.xml
(with props)
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue62-03-ext.xml
(with props)
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue62-03.xml
(with props)
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/IssuesTestSuite.java
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java?rev=651742&r1=651741&r2=651742&view=diff
==
---
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
(original)
+++
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
Fri Apr 25 16:48:13 2008
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.net.URL;
import java.text.MessageFormat;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -1419,55 +1420,137 @@
if (SCXMLHelper.isStringEmpty(src)) {
return;
}
+
+// 1) Digest the external SCXML file
Digester digester = getDigester();
SCXML scxml = (SCXML) digester.peek(digester.getCount() - 1);
-// 1) Digest the external SCXML file
-SCXML externalSCXML = null;
+SCXML parent = root;
+if (parent == null) {
+parent = scxml;
+}
String path;
-Digester externalSrcDigester;
+PathResolver nextpr = null;
if (pr == null) {
path = src;
-if (root != null) {
-externalSrcDigester = newInstance(root, null,
-customActions);
-} else {
-externalSrcDigester = newInstance(scxml, null,
-customActions);
-}
} else {
path = pr.resolvePath(src);
-if (root != null) {
-externalSrcDigester = newInstance(root,
-pr.getResolver(src), customActions);
-} else {
-externalSrcDigester = newInstance(scxml,
-pr.getResolver(src), customActions);
-}
+nextpr = pr.getResolver(src);
}
-
+String[] fragments = path.split("#", 2);
+String location = fragments[0];
+String fragment = null;
+if (fragments.length > 1) {
+fragment = fragments[1];
+}
+Digester externalSrcDigester;
+if (fragment != null) {
+// Cannot pull in all targets just yet, i.e. null parent
+externalSrcDigester = newInstance(null, nextpr,
+customActions);
+} else {
+externalSrcDigester = newInstance(parent, nextpr,
+customActions);
+}
+SCXML externalSCXML = null;
try {
-externalSCXML = (SCXML) externalSrcDigester.parse(path);
+externalSCXML = (SCXML) externalSrcDigester.parse(location);
} catch (Exception e) {
org.apache.commons.logging.Log log = LogFactory.
getLog(SCXMLDigester.class);
log.error(e.getMessage(), e);
}
+
// 2) Adopt the children and datamodel
if (externalSCXML == null) {
return;
}
State s = (State) digester.peek();
-Transition t = new Transition();
-t.setNext(externalSCXML.getInitialstate());
-Initial ini = new Initial();
-ini.setTransition(t);
-s.setInitial(ini);
-Map children = externalSCXML.getS
svn commit: r651743 - in /commons/proper/scxml/branches/J6/src: main/java/org/apache/commons/scxml/io/ test/java/org/apache/commons/scxml/issues/
Author: rahul
Date: Fri Apr 25 16:55:11 2008
New Revision: 651743
URL: http://svn.apache.org/viewvc?rev=651743&view=rev
Log:
Port r651742 to J6 branch, with appropriate changes.
Enhancement request for supporting fragment URLs in 's src attribute.
SCXML-62
Added:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue62Test.java
(with props)
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue62-01-ext.xml
(with props)
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue62-01.xml
(with props)
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue62-02-ext.xml
(with props)
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue62-02.xml
(with props)
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue62-03-ext.xml
(with props)
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue62-03.xml
(with props)
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/IssuesTestSuite.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java?rev=651743&r1=651742&r2=651743&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
Fri Apr 25 16:55:11 2008
@@ -19,9 +19,8 @@
import java.io.IOException;
import java.net.URL;
import java.text.MessageFormat;
+import java.util.Collection;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -1418,55 +1417,134 @@
if (SCXMLHelper.isStringEmpty(src)) {
return;
}
+
+// 1) Digest the external SCXML file
Digester digester = getDigester();
SCXML scxml = (SCXML) digester.peek(digester.getCount() - 1);
-// 1) Digest the external SCXML file
-SCXML externalSCXML = null;
+SCXML parent = root;
+if (parent == null) {
+parent = scxml;
+}
String path;
-Digester externalSrcDigester;
+PathResolver nextpr = null;
if (pr == null) {
path = src;
-if (root != null) {
-externalSrcDigester = newInstance(root, null,
-customActions);
-} else {
-externalSrcDigester = newInstance(scxml, null,
-customActions);
-}
} else {
path = pr.resolvePath(src);
-if (root != null) {
-externalSrcDigester = newInstance(root,
-pr.getResolver(src), customActions);
-} else {
-externalSrcDigester = newInstance(scxml,
-pr.getResolver(src), customActions);
-}
+nextpr = pr.getResolver(src);
}
-
+String[] fragments = path.split("#", 2);
+String location = fragments[0];
+String fragment = null;
+if (fragments.length > 1) {
+fragment = fragments[1];
+}
+Digester externalSrcDigester;
+if (fragment != null) {
+// Cannot pull in all targets just yet, i.e. null parent
+externalSrcDigester = newInstance(null, nextpr,
+customActions);
+} else {
+externalSrcDigester = newInstance(parent, nextpr,
+customActions);
+}
+SCXML externalSCXML = null;
try {
-externalSCXML = (SCXML) externalSrcDigester.parse(path);
+externalSCXML = (SCXML) externalSrcDigester.parse(location);
} catch (Exception e) {
org.apache.commons.logging.Log log = LogFactory.
getLog(SCXMLDigester.class);
log.error(e.getMessage(), e);
}
+
// 2) Adopt the children and datamodel
if (externalSCXML == null) {
return;
}
State s = (State) digester.peek();
-
svn commit: r651744 - /commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
Author: rahul
Date: Fri Apr 25 16:55:51 2008
New Revision: 651744
URL: http://svn.apache.org/viewvc?rev=651744&view=rev
Log:
Reduce ambiguity in test names.
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java?rev=651744&r1=651743&r2=651744&view=diff
==
---
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
(original)
+++
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
Fri Apr 25 16:55:51 2008
@@ -63,12 +63,12 @@
exec = null;
}
-public void test01() {
+public void test01issue64() {
exec = SCXMLTestHelper.getExecutor(SCXMLTestHelper.parse(works));
SCXMLTestHelper.assertPostTriggerState(exec, "show.bug", "end");
}
-public void test02() {
+public void test02issue64() {
exec = SCXMLTestHelper.getExecutor(SCXMLTestHelper.parse(fails));
SCXMLTestHelper.assertPostTriggerState(exec, "show.bug", "end");
}
svn commit: r651745 - /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
Author: rahul
Date: Fri Apr 25 16:57:12 2008
New Revision: 651745
URL: http://svn.apache.org/viewvc?rev=651745&view=rev
Log:
Port r651744 from trunk (reduce ambiguity in test names).
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java?rev=651745&r1=651744&r2=651745&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/Issue64Test.java
Fri Apr 25 16:57:12 2008
@@ -63,12 +63,12 @@
exec = null;
}
-public void test01() {
+public void test01issue64() {
exec = SCXMLTestHelper.getExecutor(SCXMLTestHelper.parse(works));
SCXMLTestHelper.assertPostTriggerState(exec, "show.bug", "end");
}
-public void test02() {
+public void test02issue64() {
exec = SCXMLTestHelper.getExecutor(SCXMLTestHelper.parse(fails));
SCXMLTestHelper.assertPostTriggerState(exec, "show.bug", "end");
}
svn commit: r651750 - in /commons/proper/scxml/branches/J6/src: main/java/org/apache/commons/scxml/io/ main/java/org/apache/commons/scxml/model/ test/java/org/apache/commons/scxml/model/
Author: rahul
Date: Fri Apr 25 17:46:43 2008
New Revision: 651750
URL: http://svn.apache.org/viewvc?rev=651750&view=rev
Log:
Type safety improvements.
Remove one test that is made obsolete by these improvements.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/CustomAction.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/CustomActionTest.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java?rev=651750&r1=651749&r2=651750&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLDigester.java
Fri Apr 25 17:46:43 2008
@@ -1033,7 +1033,7 @@
} else {
scxmlRules.setNamespaceURI(ca.getNamespaceURI());
String xpfLocalName = STR_SLASH + ca.getLocalName();
-Class klass = ca.getActionClass();
+Class klass = ca.getActionClass();
if (SCXMLHelper.implementationOf(klass,
ExternalContent.class)) {
addCustomActionRulesTuple(xp + xpfLocalName, scxmlRules,
@@ -1078,8 +1078,8 @@
* NodeCreateRule
*/
private static void addCustomActionRulesTuple(final String xp,
-final ExtendedBaseRules scxmlRules, final Class klass,
-final boolean bodyContent) {
+final ExtendedBaseRules scxmlRules,
+final Class klass, final boolean bodyContent) {
addActionRulesTuple(xp, scxmlRules, klass);
if (bodyContent) {
try {
@@ -1121,7 +1121,8 @@
* in the ObjectCreateRule for this action
*/
private static void addActionRulesTuple(final String xp,
-final ExtendedBaseRules scxmlRules, final Class klass) {
+final ExtendedBaseRules scxmlRules,
+final Class klass) {
addSimpleRulesTuple(xp, scxmlRules, klass, null, null, "addAction");
scxmlRules.add(xp, new SetExecutableParentRule());
scxmlRules.add(xp, new SetCurrentNamespacesRule());
@@ -1140,7 +1141,7 @@
* @param addMethod The method that the SetNextRule should call
*/
private static void addSimpleRulesTuple(final String xp,
-final ExtendedBaseRules scxmlRules, final Class klass,
+final ExtendedBaseRules scxmlRules, final Class klass,
final String[] args, final String[] props,
final String addMethod) {
scxmlRules.add(xp, new ObjectCreateRule(klass));
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java?rev=651750&r1=651749&r2=651750&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
Fri Apr 25 17:46:43 2008
@@ -1065,7 +1065,7 @@
} else {
scxmlRules.setNamespaceURI(ca.getNamespaceURI());
String xpfLocalName = STR_SLASH + ca.getLocalName();
-Class klass = ca.getActionClass();
+Class klass = ca.getActionClass();
if (SCXMLHelper.implementationOf(klass,
ExternalContent.class)) {
addCustomActionRulesTuple(xp + xpfLocalName, scxmlRules,
@@ -1110,8 +1110,8 @@
* NodeCreateRule
*/
private static void addCustomActionRulesTuple(final String xp,
-final ExtendedBaseRules scxmlRules, final Class klass,
-final boolean bodyContent) {
+final ExtendedBaseRules scxmlRules,
+final Class klass, final boolean bodyContent) {
addActionRulesTuple(xp, scxmlRules, klass);
if (bodyContent) {
try {
@@ -1153,7 +1153,8 @@
* in the ObjectCreateRule for this action
*/
private static void addActionRulesTuple(final String xp,
-final ExtendedBaseRules scxmlRules, final Class klass) {
+final ExtendedBaseRules scxmlRules,
+final Class klass) {
addSimpleRulesTuple(xp, scx
svn commit: r651760 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Builtin.java
Author: rahul
Date: Fri Apr 25 17:51:02 2008
New Revision: 651760
URL: http://svn.apache.org/viewvc?rev=651760&view=rev
Log:
Type safety improvements.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Builtin.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Builtin.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Builtin.java?rev=651760&r1=651759&r2=651760&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Builtin.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Builtin.java
Fri Apr 25 17:51:02 2008
@@ -256,25 +256,25 @@
private static class DataPrefixResolver implements PrefixResolver {
/** Cached namespaces. */
-private Map namespaces;
+private Map namespaces;
/**
* Constructor.
* @param namespaces The prefix to namespace URI map.
*/
-private DataPrefixResolver(final Map namespaces) {
+private DataPrefixResolver(final Map namespaces) {
this.namespaces = namespaces;
}
/** [EMAIL PROTECTED] */
public String getNamespaceForPrefix(final String prefix) {
-return (String) namespaces.get(prefix);
+return namespaces.get(prefix);
}
/** [EMAIL PROTECTED] */
public String getNamespaceForPrefix(final String prefix,
final Node nsContext) {
-return (String) namespaces.get(prefix);
+return namespaces.get(prefix);
}
/** [EMAIL PROTECTED] */
svn commit: r651761 - in /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml: Context.java env/faces/SessionContext.java
Author: rahul
Date: Fri Apr 25 17:59:08 2008
New Revision: 651761
URL: http://svn.apache.org/viewvc?rev=651761&view=rev
Log:
Eliminate raw type warnings.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Context.java
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Context.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Context.java?rev=651761&r1=651760&r2=651761&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Context.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/Context.java
Fri Apr 25 17:59:08 2008
@@ -66,7 +66,7 @@
* To get variables in parent Context, call getParent().getVars().
* @see #getParent()
*/
-Map getVars();
+Map getVars();
/**
* Clear this Context.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java?rev=651761&r1=651760&r2=651761&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/faces/SessionContext.java
Fri Apr 25 17:59:08 2008
@@ -37,7 +37,7 @@
/** Serial version UID. */
private static final long serialVersionUID = 1L;
/** The map of session scoped variables. */
-private Map sessionMap;
+private Map sessionMap;
/** Bark if FacesContext is null. */
private static final String ERR_HOST_FACES_CTX_NULL =
"Host FacesContext cannot be null";
@@ -57,13 +57,15 @@
* @param fc The current FacesContext
* @param parent A parent Context, can be null
*/
+@SuppressWarnings("unchecked")
public SessionContext(final FacesContext fc, final Context parent) {
super(parent);
if (fc == null) {
throw new IllegalArgumentException(ERR_HOST_FACES_CTX_NULL);
} else {
- // only retain the session map
- this.sessionMap = fc.getExternalContext().getSessionMap();
+// only retain the session map
+// legacy code, suppress warning
+this.sessionMap = fc.getExternalContext().getSessionMap();
}
}
svn commit: r651762 - in /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml: EventDispatcher.java env/SimpleDispatcher.java
Author: rahul
Date: Fri Apr 25 18:00:20 2008
New Revision: 651762
URL: http://svn.apache.org/viewvc?rev=651762&view=rev
Log:
Eliminate raw type warnings.
TBD whether DOM API is too polluting.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/EventDispatcher.java
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/EventDispatcher.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/EventDispatcher.java?rev=651762&r1=651761&r2=651762&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/EventDispatcher.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/EventDispatcher.java
Fri Apr 25 18:00:20 2008
@@ -19,6 +19,8 @@
import java.util.List;
import java.util.Map;
+import org.w3c.dom.Node;
+
/**
* The event controller interface used to send messages containing
* events or other information directly to another SCXML Interpreter,
@@ -52,8 +54,8 @@
* the <send> element.
*/
void send(String sendId, String target, String targetType,
-String event, Map params, Object hints, long delay,
-List externalNodes);
+String event, Map params, Object hints,
+long delay, List externalNodes);
}
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java?rev=651762&r1=651761&r2=651762&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleDispatcher.java
Fri Apr 25 18:00:20 2008
@@ -23,6 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.scxml.EventDispatcher;
+import org.w3c.dom.Node;
/**
* Trivial EventDispatcher implementation.
@@ -56,8 +57,9 @@
@see EventDispatcher#send(String,String,String,String,Map,Object,long,List)
*/
public void send(final String sendId, final String target,
-final String targetType, final String event, final Map params,
-final Object hints, final long delay, final List externalNodes) {
+final String targetType, final String event,
+final Map params, final Object hints, final long
delay,
+final List externalNodes) {
if (log.isInfoEnabled()) {
StringBuffer buf = new StringBuffer();
buf.append("send ( sendId: ").append(sendId);
svn commit: r651763 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
Author: rahul
Date: Fri Apr 25 18:02:08 2008
New Revision: 651763
URL: http://svn.apache.org/viewvc?rev=651763&view=rev
Log:
Eliminate raw type warnings.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLHelper.java
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=651763&r1=651762&r2=651763&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 Apr 25 18:02:08 2008
@@ -293,11 +293,11 @@
* @param parent The supertype
* @return true if child is subtype of parent, otherwise false
*/
-public static boolean subtypeOf(final Class child, final Class parent) {
+public static boolean subtypeOf(final Class child, final Class
parent) {
if (child == null || parent == null) {
return false;
}
-for (Class current = child; current != Object.class;
+for (Class current = child; current != Object.class;
current = current.getSuperclass()) {
if (current == parent) {
return true;
@@ -313,14 +313,14 @@
* @param interfayce The interface
* @return true if clas implements interfayce, otherwise false
*/
-public static boolean implementationOf(final Class clas,
-final Class interfayce) {
+public static boolean implementationOf(final Class clas,
+final Class interfayce) {
if (clas == null || interfayce == null || !interfayce.isInterface()) {
return false;
}
-for (Class current = clas; current != Object.class;
+for (Class current = clas; current != Object.class;
current = current.getSuperclass()) {
-Class[] implementedInterfaces = current.getInterfaces();
+Class[] implementedInterfaces = current.getInterfaces();
for (int i = 0; i < implementedInterfaces.length; i++) {
if (implementedInterfaces[i] == interfayce) {
return true;
svn commit: r651765 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
Author: rahul
Date: Fri Apr 25 18:09:26 2008
New Revision: 651765
URL: http://svn.apache.org/viewvc?rev=651765&view=rev
Log:
Eliminate raw type warnings and type safety improvements.
Suppress warnings since error contexts come in flavors that haven't been
abstracted over (and there is no intent to).
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java?rev=651765&r1=651764&r2=651765&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleErrorReporter.java
Fri Apr 25 18:09:26 2008
@@ -49,6 +49,7 @@
/**
* @see ErrorReporter#onError(String, String, Object)
*/
+@SuppressWarnings("unchecked")
public void onError(final String errorCode, final String errDetail,
final Object errCtx) {
//Note: the if-then-else below is based on the actual usage
@@ -71,24 +72,26 @@
msg.append("Action: " + errCtx.getClass().getName());
} else if (errCode == ErrorConstants.ILLEGAL_CONFIG) {
//isLegalConfig
-if (errCtx instanceof Map.Entry) {
-TransitionTarget tt = (TransitionTarget)
-(((Map.Entry) errCtx).getKey());
-Set vals = (Set) (((Map.Entry) errCtx).getValue());
+if (errCtx instanceof Map.Entry) { //unchecked cast below
+Map.Entry>
badConfigMap =
+(Map.Entry>)
errCtx;
+TransitionTarget tt = badConfigMap.getKey();
+Set vals = badConfigMap.getValue();
msg.append(LogUtils.getTTPath(tt) + " : [");
-for (Iterator i = vals.iterator(); i.hasNext();) {
-TransitionTarget tx = (TransitionTarget) i.next();
+for (Iterator i = vals.iterator();
+i.hasNext();) {
+TransitionTarget tx = i.next();
msg.append(LogUtils.getTTPath(tx));
-if (i.hasNext()) {
+if (i.hasNext()) { // reason for iterator usage
msg.append(", ");
}
}
msg.append(']');
-} else if (errCtx instanceof Set) {
-Set vals = (Set) errCtx;
+} else if (errCtx instanceof Set) { //unchecked cast below
+Set vals = (Set) errCtx;
msg.append(" : [");
-for (Iterator i = vals.iterator(); i.hasNext();) {
-TransitionTarget tx = (TransitionTarget) i.next();
+for (Iterator i = vals.iterator();
i.hasNext();) {
+TransitionTarget tx = i.next();
msg.append(LogUtils.getTTPath(tx));
if (i.hasNext()) {
msg.append(", ");
svn commit: r651766 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java
Author: rahul
Date: Fri Apr 25 18:10:11 2008
New Revision: 651766
URL: http://svn.apache.org/viewvc?rev=651766&view=rev
Log:
Eliminate raw type warnings.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java?rev=651766&r1=651765&r2=651766&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/SimpleScheduler.java
Fri Apr 25 18:10:11 2008
@@ -31,6 +31,7 @@
import org.apache.commons.scxml.SCXMLHelper;
import org.apache.commons.scxml.TriggerEvent;
import org.apache.commons.scxml.model.ModelException;
+import org.w3c.dom.Node;
/**
* EventDispatcher implementation that can schedule delayed
@@ -101,8 +102,9 @@
@see EventDispatcher#send(String,String,String,String,Map,Object,long,List)
*/
public void send(final String sendId, final String target,
-final String targettype, final String event, final Map params,
-final Object hints, final long delay, final List externalNodes) {
+final String targettype, final String event,
+final Map params, final Object hints, final long
delay,
+final List externalNodes) {
// Log callback
if (log.isInfoEnabled()) {
StringBuffer buf = new StringBuffer();
@@ -168,7 +170,7 @@
*
* @return The currently scheduled timers
*/
-protected Map getTimers() {
+protected Map getTimers() {
return timers;
}
svn commit: r651767 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
Author: rahul
Date: Fri Apr 25 18:10:57 2008
New Revision: 651767
URL: http://svn.apache.org/viewvc?rev=651767&view=rev
Log:
Eliminate raw type warnings.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java?rev=651767&r1=651766&r2=651767&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/AbstractStateMachine.java
Fri Apr 25 18:10:57 2008
@@ -83,7 +83,7 @@
* The method signature for the activities corresponding to each
* state in the SCXML document.
*/
-private static final Class[] SIGNATURE = new Class[0];
+private static final Class[] SIGNATURE = new Class[0];
/**
* The method parameters for the activities corresponding to each
@@ -250,7 +250,7 @@
* @return Whether the invoke was successful.
*/
public boolean invoke(final String methodName) {
-Class clas = this.getClass();
+Class clas = this.getClass();
try {
Method method = clas.getDeclaredMethod(methodName, SIGNATURE);
method.invoke(this, PARAMETERS);
svn commit: r651768 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
Author: rahul
Date: Fri Apr 25 18:15:20 2008
New Revision: 651768
URL: http://svn.apache.org/viewvc?rev=651768&view=rev
Log:
Eliminate raw type warnings.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java?rev=651768&r1=651767&r2=651768&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/jsp/ELEvaluator.java
Fri Apr 25 18:15:20 2008
@@ -261,7 +261,7 @@
public Method resolveFunction(final String prefix,
final String localName) {
if (localName.equals("In")) {
-Class[] attrs = new Class[] {Set.class, String.class};
+Class[] attrs = new Class[] {Set.class, String.class};
try {
return Builtin.class.getMethod("isMember", attrs);
} catch (SecurityException e) {
@@ -271,7 +271,7 @@
}
} else if (localName.equals("Data")) {
// rvalue in expressions, coerce to String
-Class[] attrs =
+Class[] attrs =
new Class[] {Map.class, Object.class, String.class};
try {
return Builtin.class.getMethod("data", attrs);
@@ -282,7 +282,7 @@
}
} else if (localName.equals("LData")) {
// lvalue in expressions, retain as Node
-Class[] attrs =
+Class[] attrs =
new Class[] {Map.class, Object.class, String.class};
try {
return Builtin.class.getMethod("dataNode", attrs);
svn commit: r651769 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java
Author: rahul
Date: Fri Apr 25 18:25:18 2008
New Revision: 651769
URL: http://svn.apache.org/viewvc?rev=651769&view=rev
Log:
Add serialVersionUID and reformat code (use 4 space indentation).
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java?rev=651769&r1=651768&r2=651769&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java
Fri Apr 25 18:25:18 2008
@@ -30,26 +30,29 @@
*/
public class JSContext extends SimpleContext {
- // CONSTRUCTORS
+/** Serial version UID. */
+private static final long serialVersionUID = 1L;
- /**
-* Default constructor - just invokes the SimpleContext default
-* constructor.
-*/
- public JSContext() {
- super();
- }
+// CONSTRUCTORS
- /**
-* Child constructor. Just invokes the identical SimpleContext
- * constructor.
-*
-* @param parent Parent context for this context.
-*
-*/
- public JSContext(Context parent) {
- super(parent);
- }
+/**
+ * Default constructor - just invokes the SimpleContext default
+ * constructor.
+ */
+public JSContext() {
+ super();
+}
+
+/**
+ * Child constructor. Just invokes the identical SimpleContext
+ * constructor.
+ *
+ * @param parent Parent context for this context.
+ *
+ */
+public JSContext(Context parent) {
+ super(parent);
+ }
}
svn commit: r651770 - in /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml: SCInstance.java SCXMLExecutor.java
Author: rahul
Date: Fri Apr 25 18:26:17 2008
New Revision: 651770
URL: http://svn.apache.org/viewvc?rev=651770&view=rev
Log:
Type safety improvements.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCInstance.java
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCInstance.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCInstance.java?rev=651770&r1=651769&r2=651770&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCInstance.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCInstance.java
Fri Apr 25 18:26:17 2008
@@ -68,7 +68,7 @@
* The Invoker classes Map, keyed by
* <invoke> target types (specified using "targettype" attribute).
*/
-private final Map invokerClasses;
+private final Map> invokerClasses;
/**
* The Map of active Invokers, keyed by
@@ -100,7 +100,7 @@
this.notificationRegistry = new NotificationRegistry();
this.contexts = Collections.synchronizedMap(new
HashMap());
this.histories = Collections.synchronizedMap(new HashMap>());
-this.invokerClasses = Collections.synchronizedMap(new HashMap());
+this.invokerClasses = Collections.synchronizedMap(new HashMap>());
this.invokers = Collections.synchronizedMap(new
HashMap());
this.completions = Collections.synchronizedMap(new
HashMap());
this.evaluator = null;
@@ -284,7 +284,7 @@
* @param invokerClass The Invoker Class.
*/
void registerInvokerClass(final String targettype,
-final Class invokerClass) {
+final Class invokerClass) {
invokerClasses.put(targettype, invokerClass);
}
@@ -314,14 +314,14 @@
*/
public Invoker newInvoker(final String targettype)
throws InvokerException {
-Class invokerClass = invokerClasses.get(targettype);
+Class invokerClass = invokerClasses.get(targettype);
if (invokerClass == null) {
throw new InvokerException("No Invoker registered for "
+ "targettype \"" + targettype + "\"");
}
Invoker invoker = null;
try {
-invoker = (Invoker) invokerClass.newInstance();
+invoker = invokerClass.newInstance();
} catch (InstantiationException ie) {
throw new InvokerException(ie.getMessage(), ie.getCause());
} catch (IllegalAccessException iae) {
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java?rev=651770&r1=651769&r2=651770&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
Fri Apr 25 18:26:17 2008
@@ -25,6 +25,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.scxml.invoke.Invoker;
import org.apache.commons.scxml.model.Datamodel;
import org.apache.commons.scxml.model.History;
import org.apache.commons.scxml.model.ModelException;
@@ -433,7 +434,7 @@
* @param invokerClass The Invoker Class.
*/
public void registerInvokerClass(final String targettype,
-final Class invokerClass) {
+final Class invokerClass) {
scInstance.registerInvokerClass(targettype, invokerClass);
}
svn commit: r651771 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java
Author: rahul
Date: Fri Apr 25 18:29:56 2008
New Revision: 651771
URL: http://svn.apache.org/viewvc?rev=651771&view=rev
Log:
One more whitespace update.
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java?rev=651771&r1=651770&r2=651771&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/env/javascript/JSContext.java
Fri Apr 25 18:29:56 2008
@@ -40,7 +40,7 @@
* constructor.
*/
public JSContext() {
- super();
+super();
}
/**
@@ -51,8 +51,8 @@
*
*/
public JSContext(Context parent) {
- super(parent);
- }
+super(parent);
+}
}
svn commit: r651774 - in /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env: StopWatch.java javascript/JSExampleTest.java jexl/StaticMethodTest.java jsp/MockJspContext.java
Author: rahul
Date: Fri Apr 25 18:40:53 2008
New Revision: 651774
URL: http://svn.apache.org/viewvc?rev=651774&view=rev
Log:
Type safety improvements.
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatch.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/MockJspContext.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatch.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatch.java?rev=651774&r1=651773&r2=651774&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatch.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/StopWatch.java
Fri Apr 25 18:40:53 2008
@@ -20,7 +20,7 @@
import java.util.Timer;
import java.util.TimerTask;
-import org.apache.commons.scxml.env.AbstractStateMachine;
+import org.apache.commons.scxml.model.TransitionTarget;
/**
* A SCXML document driven stop watch.
@@ -94,9 +94,8 @@
// used by the demonstration (see StopWatchDisplay usecase)
public String getCurrentState() {
-Set states = getEngine().getCurrentStatus().getStates();
-return ((org.apache.commons.scxml.model.State) states.iterator().
-next()).getId();
+Set states =
getEngine().getCurrentStatus().getStates();
+return states.iterator().next().getId();
}
private void increment() {
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java?rev=651774&r1=651773&r2=651774&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
Fri Apr 25 18:40:53 2008
@@ -29,7 +29,7 @@
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.State;
+import org.apache.commons.scxml.model.TransitionTarget;
/**
* SCXML application for the example JavaScript scripts.
@@ -77,10 +77,9 @@
assertNotNull(exec);
try {
-Set currentStates = exec.getCurrentStatus().getStates();
+Set currentStates =
exec.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("end", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("end", currentStates.iterator().next().getId());
} catch (Exception e) {
fail(e.getMessage());
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java?rev=651774&r1=651773&r2=651774&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/StaticMethodTest.java
Fri Apr 25 18:40:53 2008
@@ -26,7 +26,7 @@
import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
-import org.apache.commons.scxml.model.State;
+import org.apache.commons.scxml.model.TransitionTarget;
public class StaticMethodTest extends TestCase {
@@ -65,10 +65,9 @@
jc.set("System", System.class);
SCXMLExecutor exec = SCXMLTestHelper.getExecutor(staticmethod,
jc, new JexlEvaluator());
-Set currentStates = exec.getCurrentStatus().getStates();
+Set currentStates =
exec.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("static", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("static", currentStates.iterator().next().getId());
}
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/j
svn commit: r651775 - /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
Author: rahul
Date: Fri Apr 25 18:41:47 2008
New Revision: 651775
URL: http://svn.apache.org/viewvc?rev=651775&view=rev
Log:
Remove tabs.
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java?rev=651775&r1=651774&r2=651775&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/JSExampleTest.java
Fri Apr 25 18:41:47 2008
@@ -70,10 +70,10 @@
public void testExample01Sample() {
- SCXML scxml = SCXMLTestHelper.parse(example01);
- Evaluator evaluator = new JSEvaluator();
+SCXML scxml = SCXMLTestHelper.parse(example01);
+Evaluator evaluator = new JSEvaluator();
Context context = new JSContext();
- exec = SCXMLTestHelper.getExecutor(scxml, context, evaluator);
+exec = SCXMLTestHelper.getExecutor(scxml, context, evaluator);
assertNotNull(exec);
try {
svn commit: r651776 - /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
Author: rahul
Date: Fri Apr 25 18:42:24 2008
New Revision: 651776
URL: http://svn.apache.org/viewvc?rev=651776&view=rev
Log:
Type safety improvements.
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java?rev=651776&r1=651775&r2=651776&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTest.java
Fri Apr 25 18:42:24 2008
@@ -33,7 +33,7 @@
import org.apache.commons.scxml.env.jexl.JexlEvaluator;
import org.apache.commons.scxml.io.SCXMLParser;
import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.State;
+import org.apache.commons.scxml.model.TransitionTarget;
/**
* Unit tests [EMAIL PROTECTED] org.apache.commons.scxml.SCXMLExecutor}.
@@ -91,10 +91,9 @@
exec.setStateMachine(scxml);
exec.registerInvokerClass("scxml", SimpleSCXMLInvoker.class);
exec.go();
-Set currentStates = exec.getCurrentStatus().getStates();
+Set currentStates =
exec.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("invoker", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("invoker", currentStates.iterator().next().getId());
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -112,7 +111,7 @@
exec.setStateMachine(scxml);
exec.registerInvokerClass("scxml", SimpleSCXMLInvoker.class);
exec.go();
-Set currentStates = exec.getCurrentStatus().getStates();
+Set currentStates =
exec.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
} catch (Exception e) {
e.printStackTrace();
@@ -131,7 +130,7 @@
exec.setStateMachine(scxml);
exec.registerInvokerClass("scxml", SimpleSCXMLInvoker.class);
exec.go();
-Set currentStates = exec.getCurrentStatus().getStates();
+Set currentStates =
exec.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
SCXMLTestHelper.fireEvent(exec, "s1.next");
SCXMLTestHelper.fireEvent(exec, "state1.next");
svn commit: r651778 - in /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io: SCXMLDigesterTest.java StateSrcTest.java
Author: rahul
Date: Fri Apr 25 18:44:22 2008
New Revision: 651778
URL: http://svn.apache.org/viewvc?rev=651778&view=rev
Log:
Type safety improvements.
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLDigesterTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLDigesterTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLDigesterTest.java?rev=651778&r1=651777&r2=651778&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLDigesterTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/SCXMLDigesterTest.java
Fri Apr 25 18:44:22 2008
@@ -25,6 +25,7 @@
import junit.textui.TestRunner;
import org.apache.commons.scxml.SCXMLTestHelper;
+import org.apache.commons.scxml.model.Action;
import org.apache.commons.scxml.model.SCXML;
import org.apache.commons.scxml.model.Send;
import org.apache.commons.scxml.model.State;
@@ -113,10 +114,10 @@
scxml = SCXMLTestHelper.digest(send01);
State ten = (State) scxml.getInitialTarget();
assertEquals("ten", ten.getId());
-List ten_done = ten.getTransitionsList("ten.done");
+List ten_done = ten.getTransitionsList("ten.done");
assertEquals(1, ten_done.size());
Transition ten2twenty = (Transition) ten_done.get(0);
-List actions = ten2twenty.getActions();
+List actions = ten2twenty.getActions();
assertEquals(1, actions.size());
Send send = (Send) actions.get(0);
assertEquals("send1", send.getSendid());
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java?rev=651778&r1=651777&r2=651778&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/StateSrcTest.java
Fri Apr 25 18:44:22 2008
@@ -27,7 +27,7 @@
import org.apache.commons.scxml.SCXMLExecutor;
import org.apache.commons.scxml.SCXMLTestHelper;
import org.apache.commons.scxml.model.SCXML;
-import org.apache.commons.scxml.model.State;
+import org.apache.commons.scxml.model.TransitionTarget;
/**
* Unit tests [EMAIL PROTECTED] org.apache.commons.scxml.SCXMLDigester}
* Test white box nature of element "src" attribute.
@@ -77,12 +77,12 @@
assertNotNull(scxml);
exec = SCXMLTestHelper.getExecutor(scxml);
assertNotNull(exec);
-Set states = exec.getCurrentStatus().getStates();
+Set states = exec.getCurrentStatus().getStates();
assertEquals(1, states.size());
-assertEquals("srctest3", ((State) states.iterator().next()).getId());
+assertEquals("srctest3", states.iterator().next().getId());
states = SCXMLTestHelper.fireEvent(exec, "src.test");
assertEquals(1, states.size());
-assertEquals("srctest1end", ((State)
states.iterator().next()).getId());
+assertEquals("srctest1end", states.iterator().next().getId());
assertTrue(exec.getCurrentStatus().isFinal());
}
svn commit: r651781 - in /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model: AssignTest.java DatamodelTest.java HistoryTest.java StateTest.java StatelessModelTest.java
Author: rahul
Date: Fri Apr 25 18:47:06 2008
New Revision: 651781
URL: http://svn.apache.org/viewvc?rev=651781&view=rev
Log:
Type safety improvements.
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/HistoryTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StateTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/StatelessModelTest.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java?rev=651781&r1=651780&r2=651781&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/AssignTest.java
Fri Apr 25 18:47:06 2008
@@ -67,10 +67,9 @@
* Test the implementation
*/
public void testAssignSrc() {
-Set currentStates = exec.getCurrentStatus().getStates();
+Set currentStates =
exec.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("assign3", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("assign3", currentStates.iterator().next().getId());
assertTrue(exec.getCurrentStatus().isFinal());
}
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java?rev=651781&r1=651780&r2=651781&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/DatamodelTest.java
Fri Apr 25 18:47:06 2008
@@ -118,10 +118,9 @@
exec01 = SCXMLTestHelper.getExecutor(datamodel04jexl,
new JexlContext(), new JexlEvaluator());
assertNotNull(exec01);
-Set currentStates = exec01.getCurrentStatus().getStates();
+Set currentStates =
exec01.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("ten", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("ten", currentStates.iterator().next().getId());
Map payload = new HashMap();
payload.put("one", "1");
payload.put("two", "2");
@@ -129,64 +128,54 @@
SCXMLTestHelper.fireEvent(exec01, te);
currentStates = exec01.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("twenty", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("twenty", currentStates.iterator().next().getId());
SCXMLTestHelper.fireEvent(exec01, "twenty.done");
currentStates = exec01.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("thirty", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("thirty", currentStates.iterator().next().getId());
}
private void runtest() {
try {
Interleaved
// exec01
-Set currentStates = exec01.getCurrentStatus().getStates();
+Set currentStates =
exec01.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("ten", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("ten", currentStates.iterator().next().getId());
exec01 = SCXMLTestHelper.testExecutorSerializability(exec01);
currentStates = fireEvent("ten.done", exec01);
assertEquals(1, currentStates.size());
-assertEquals("twenty", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("twenty", currentStates.iterator().next().getId());
// exec02
currentStates = exec02.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("ten", ((State)currentStates.iterator().
-
svn commit: r651785 - /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/
Author: rahul
Date: Fri Apr 25 18:56:55 2008
New Revision: 651785
URL: http://svn.apache.org/viewvc?rev=651785&view=rev
Log:
Type safety improvements.
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/EventDataTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/NamespacePrefixedXPathsTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCInstanceTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLExecutorTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLHelperTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestHelper.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/TieBreakerTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WildcardTest.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/WizardsTest.java
Modified:
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/EventDataTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/EventDataTest.java?rev=651785&r1=651784&r2=651785&view=diff
==
---
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/EventDataTest.java
(original)
+++
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/EventDataTest.java
Fri Apr 25 18:56:55 2008
@@ -24,7 +24,7 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.commons.scxml.model.State;
+import org.apache.commons.scxml.model.TransitionTarget;
/**
* Unit tests [EMAIL PROTECTED] org.apache.commons.scxml.SCXMLExecutor}.
* Testing special variable "_eventdata"
@@ -74,29 +74,25 @@
exec = SCXMLTestHelper.getExecutor(eventdata01);
assertNotNull(exec);
try {
-Set currentStates = exec.getCurrentStatus().getStates();
+Set currentStates =
exec.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("state1", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("state1", currentStates.iterator().next().getId());
TriggerEvent te = new TriggerEvent("event.foo",
TriggerEvent.SIGNAL_EVENT, new Integer(3));
currentStates = SCXMLTestHelper.fireEvent(exec, te);
assertEquals(1, currentStates.size());
-assertEquals("state3", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("state3", currentStates.iterator().next().getId());
TriggerEvent[] evts = new TriggerEvent[] { te,
new TriggerEvent("event.bar", TriggerEvent.SIGNAL_EVENT,
new Integer(6))};
currentStates = SCXMLTestHelper.fireEvents(exec, evts);
assertEquals(1, currentStates.size());
-assertEquals("state6", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("state6", currentStates.iterator().next().getId());
te = new TriggerEvent("event.baz",
TriggerEvent.SIGNAL_EVENT, new Integer(7));
currentStates = SCXMLTestHelper.fireEvent(exec, te);
assertEquals(1, currentStates.size());
-assertEquals("state7", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("state7", currentStates.iterator().next().getId());
} catch (Exception e) {
fail(e.getMessage());
}
@@ -106,23 +102,20 @@
exec = SCXMLTestHelper.getExecutor(eventdata02);
assertNotNull(exec);
try {
-Set currentStates = exec.getCurrentStatus().getStates();
+Set currentStates =
exec.getCurrentStatus().getStates();
assertEquals(1, currentStates.size());
-assertEquals("state0", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("state0", currentStates.iterator().next().getId());
TriggerEvent te1 = new TriggerEvent("connection.alerting",
TriggerEvent.SIGNAL_EVENT, "line2");
currentStates = SCXMLTestHelper.fireEvent(exec, te1);
assertEquals(1, currentStates.size());
-assertEquals("state2", ((State)currentStates.iterator().
-next()).getId());
+assertEquals("state2", currentStates.iterator().next().getId());
TriggerEvent te2 = new
svn commit: r652101 - /commons/proper/commons-parent/trunk/pom.xml
Author: rahul
Date: Tue Apr 29 13:51:04 2008
New Revision: 652101
URL: http://svn.apache.org/viewvc?rev=652101&view=rev
Log:
Change distributionManagement/repository contents (i.e. change only relevant if
"final" version is used) in the rc profile so per-RC staging repositories can
be set up under p.a.o/builds/commons/... without the need to define additional
command-line properties etc.
New property "commons.rc.version" for constructing such staging repo URLs.
COMMONSSITE-27
Modified:
commons/proper/commons-parent/trunk/pom.xml
Modified: commons/proper/commons-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=652101&r1=652100&r2=652101&view=diff
==
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Tue Apr 29 13:51:04 2008
@@ -451,7 +451,7 @@
apache.snapshots
Apache Development Snapshot Repository
-
${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
+
${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/staged
apache.snapshots
@@ -557,6 +557,9 @@
${project.artifactId}
+
+RC1
+
org.apache.commons.${commons.componentid}
org.apache.commons.*;version=${pom.version}
svn commit: r652115 - /commons/proper/scxml/trunk/pom.xml
Author: rahul
Date: Tue Apr 29 14:00:46 2008
New Revision: 652115
URL: http://svn.apache.org/viewvc?rev=652115&view=rev
Log:
* Add site stuff that should be in the parent POM (see COMMONSSITE-26 for why
its not).
* Add the RC version property.
Modified:
commons/proper/scxml/trunk/pom.xml
Modified: commons/proper/scxml/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/pom.xml?rev=652115&r1=652114&r2=652115&view=diff
==
--- commons/proper/scxml/trunk/pom.xml (original)
+++ commons/proper/scxml/trunk/pom.xml Tue Apr 29 14:00:46 2008
@@ -168,11 +168,21 @@
+
+
+
+ apache.website
+ Apache Commons Site
+
${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/scxml
+
+
+
1.4
1.4
scxml
0.7
+RC1
SCXML
12310492
@@ -251,4 +261,19 @@
+
+
+
+ rc
+
+
+
+ apache.website
+ Apache Commons Release Candidate Staging Site
+
${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site
+
+
+
+
+
svn commit: r652118 - /commons/proper/scxml/branches/J6/pom.xml
Author: rahul
Date: Tue Apr 29 14:03:13 2008
New Revision: 652118
URL: http://svn.apache.org/viewvc?rev=652118&view=rev
Log:
Port r652115 from trunk.
Modified:
commons/proper/scxml/branches/J6/pom.xml
Modified: commons/proper/scxml/branches/J6/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/pom.xml?rev=652118&r1=652117&r2=652118&view=diff
==
--- commons/proper/scxml/branches/J6/pom.xml (original)
+++ commons/proper/scxml/branches/J6/pom.xml Tue Apr 29 14:03:13 2008
@@ -168,11 +168,21 @@
+
+
+
+ apache.website
+ Apache Commons Site
+
${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/scxml
+
+
+
1.6
1.6
scxml
0.7
+RC1
SCXML
12310492
@@ -252,4 +262,19 @@
+
+
+
+ rc
+
+
+
+ apache.website
+ Apache Commons Release Candidate Staging Site
+
${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site
+
+
+
+
+
svn commit: r652870 - /commons/proper/commons-parent/trunk/pom.xml
Author: rahul Date: Fri May 2 11:45:48 2008 New Revision: 652870 URL: http://svn.apache.org/viewvc?rev=652870&view=rev Log: Remove dev list notifier so we can configure with finer granularity using the Continuum UI (particularly, avoid "on error" build notifications). See: http://markmail.org/message/rqjyzqlu4yhbzk5l Modified: commons/proper/commons-parent/trunk/pom.xml Modified: commons/proper/commons-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=652870&r1=652869&r2=652870&view=diff == --- commons/proper/commons-parent/trunk/pom.xml (original) +++ commons/proper/commons-parent/trunk/pom.xml Fri May 2 11:45:48 2008 @@ -36,14 +36,6 @@ continuum http://vmbuild.apache.org/continuum/ - - -mail - - [EMAIL PROTECTED] - - -
svn commit: r653172 - in /commons/proper/scxml/trunk/src: main/java/org/apache/commons/scxml/io/SCXMLParser.java test/java/org/apache/commons/scxml/issues/issue64-02.xml
Author: rahul
Date: Sat May 3 19:45:17 2008
New Revision: 653172
URL: http://svn.apache.org/viewvc?rev=653172&view=rev
Log:
Better error reporting for ignored / misplaced elements by parser.
SCXML-64
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml
Modified:
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java?rev=653172&r1=653171&r2=653172&view=diff
==
---
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
(original)
+++
commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
Sat May 3 19:45:17 2008
@@ -34,6 +34,7 @@
import org.apache.commons.digester.Rule;
import org.apache.commons.digester.SetNextRule;
import org.apache.commons.digester.SetPropertiesRule;
+import org.apache.commons.digester.WithDefaultsRulesWrapper;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.scxml.PathResolver;
import org.apache.commons.scxml.SCXMLHelper;
@@ -76,6 +77,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
import org.xml.sax.SAXException;
/**
@@ -487,7 +489,10 @@
digester.setNamespaceAware(true);
//Uncomment next line after SCXML DTD is available
//digester.setValidating(true);
-digester.setRules(initRules(scxml, pr, customActions));
+WithDefaultsRulesWrapper rules =
+new WithDefaultsRulesWrapper(initRules(scxml, pr, customActions));
+rules.addDefault(new IgnoredElementRule());
+digester.setRules(rules);
return digester;
}
@@ -1642,5 +1647,33 @@
}
}
+/**
+ * Custom digestion rule logging ignored elements.
+ */
+private static class IgnoredElementRule extends Rule {
+
+/**
+ * @see Rule#begin(String, String, Attributes)
+ */
+public final void begin(final String namespace, final String name,
+final Attributes attributes) {
+org.apache.commons.logging.Log log = LogFactory.
+getLog(SCXMLParser.class);
+Locator l = digester.getDocumentLocator();
+String identifier = l.getSystemId();
+if (identifier == null) {
+identifier = l.getPublicId();
+}
+StringBuffer sb = new StringBuffer();
+sb.append("Ignoring element <").append(name).
+append("> in namespace \"").append(namespace).
+append("\" at ").append(identifier).append(":").
+append(l.getLineNumber()).append(":").
+append(l.getColumnNumber()).append(" and digester match \"").
+append(digester.getMatch()).append("\"");
+log.warn(sb.toString());
+}
+}
+
}
Modified:
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml?rev=653172&r1=653171&r2=653172&view=diff
==
---
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml
(original)
+++
commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml
Sat May 3 19:45:17 2008
@@ -15,17 +15,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
+
http://www.w3.org/2005/07/scxml";
+ xmlns:my="http://my.foo.example/";
version="1.0"
initialstate="tranbug">
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -33,6 +45,8 @@
+
+
svn commit: r653173 - in /commons/proper/scxml/branches/J6/src: main/java/org/apache/commons/scxml/io/SCXMLParser.java test/java/org/apache/commons/scxml/issues/issue64-02.xml
Author: rahul
Date: Sat May 3 19:50:19 2008
New Revision: 653173
URL: http://svn.apache.org/viewvc?rev=653173&view=rev
Log:
Port r653172 from trunk.
Better error reporting for ignored / misplaced elements by parser.
SCXML-64
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/issue64-02.xml
Modified:
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java?rev=653173&r1=653172&r2=653173&view=diff
==
---
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
(original)
+++
commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/io/SCXMLParser.java
Sat May 3 19:50:19 2008
@@ -33,6 +33,7 @@
import org.apache.commons.digester.Rule;
import org.apache.commons.digester.SetNextRule;
import org.apache.commons.digester.SetPropertiesRule;
+import org.apache.commons.digester.WithDefaultsRulesWrapper;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.scxml.PathResolver;
import org.apache.commons.scxml.SCXMLHelper;
@@ -75,6 +76,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
import org.xml.sax.SAXException;
/**
@@ -486,7 +488,10 @@
digester.setNamespaceAware(true);
//Uncomment next line after SCXML DTD is available
//digester.setValidating(true);
-digester.setRules(initRules(scxml, pr, customActions));
+WithDefaultsRulesWrapper rules =
+new WithDefaultsRulesWrapper(initRules(scxml, pr, customActions));
+rules.addDefault(new IgnoredElementRule());
+digester.setRules(rules);
return digester;
}
@@ -1639,5 +1644,32 @@
}
}
+/**
+ * Custom digestion rule logging ignored elements.
+ */
+private static class IgnoredElementRule extends Rule {
+
+/**
+ * @see Rule#begin(String, String, Attributes)
+ */
+public final void begin(final String namespace, final String name,
+final Attributes attributes) {
+org.apache.commons.logging.Log log = LogFactory.
+getLog(SCXMLParser.class);
+Locator l = digester.getDocumentLocator();
+String identifier = l.getSystemId();
+if (identifier == null) {
+identifier = l.getPublicId();
+}
+StringBuffer sb = new StringBuffer();
+sb.append("Ignoring element <").append(name).
+append("> in namespace \"").append(namespace).
+append("\" at ").append(identifier).append(":").
+append(l.getLineNumber()).append(":").
+append(l.getColumnNumber()).append(" and digester match \"").
+append(digester.getMatch()).append("\"");
+log.warn(sb.toString());
+}
+}
}
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=653173&r1=653172&r2=653173&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
Sat May 3 19:50:19 2008
@@ -15,17 +15,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
-
+
http://www.w3.org/2005/07/scxml";
+ xmlns:my="http://my.foo.example/";
version="1.0"
initialstate="tranbug">
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -34,6 +46,8 @@
+
+
svn commit: r653174 - /commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-test.xml
Author: rahul Date: Sat May 3 19:53:51 2008 New Revision: 653174 URL: http://svn.apache.org/viewvc?rev=653174&view=rev Log: is a Commons SCXML custom action. Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-test.xml Modified: commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-test.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-test.xml?rev=653174&r1=653173&r2=653174&view=diff == --- commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-test.xml (original) +++ commons/proper/scxml/trunk/src/test/java/org/apache/commons/scxml/model/actions-test.xml Sat May 3 19:53:51 2008 @@ -40,7 +40,7 @@ - +
svn commit: r653175 - /commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/actions-test.xml
Author: rahul Date: Sat May 3 19:55:22 2008 New Revision: 653175 URL: http://svn.apache.org/viewvc?rev=653175&view=rev Log: Porting r653174: is a Commons SCXML custom action. Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/actions-test.xml Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/actions-test.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/actions-test.xml?rev=653175&r1=653174&r2=653175&view=diff == --- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/actions-test.xml (original) +++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/actions-test.xml Sat May 3 19:55:22 2008 @@ -40,7 +40,7 @@ - +
svn commit: r653888 - /commons/proper/scxml/trunk/RELEASE-NOTES.txt
Author: rahul Date: Tue May 6 12:33:14 2008 New Revision: 653888 URL: http://svn.apache.org/viewvc?rev=653888&view=rev Log: Updating release notes for Commons SCXML v0.8. Modified: commons/proper/scxml/trunk/RELEASE-NOTES.txt Modified: commons/proper/scxml/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/RELEASE-NOTES.txt?rev=653888&r1=653887&r2=653888&view=diff == --- commons/proper/scxml/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/scxml/trunk/RELEASE-NOTES.txt Tue May 6 12:33:14 2008 @@ -22,117 +22,28 @@ INTRODUCTION: -Commons SCXML 0.7 primarily contains new features, along with a -handful of bug fixes. See about section at the end for general information -on Commons SCXML. - -IMPORTANT NOTES: - - o State IDs can no longer contain whitespace. Any IDs that contain spaces - must be changed to conform before switching to v0.7. - - o Behavior related to wild card event name handling for transitions has - changed (now aligns with latest Working Draft). - - o org.apache.commons.scxml.io.SCXMLDigester has been deprecated in favor - of SCXMLParser in same package. See Javadocs for changes before switching. +Commons SCXML 0.8 is a minor release containing a few enhancements and +bug fixes. See about section at the end for general information on +Commons SCXML. NEW FEATURES: - o Conflicts between transitions are now resolved based on document order - of the transitions. - - o Transition targets can now be specified as a space separated list of - state IDs. When more than one targets are specified, they must belong - to regions of the same parallel. - - o is supported (by org.apache.commons.scxml.io.SCXMLParser). - - o is supported (by org.apache.commons.scxml.io.SCXMLParser). - -DEPRECATIONS: - -See Javadocs of each item for details. All deprecated items are scheduled for -removal in v1.0. - - o org.apache.commons.scxml.env.AbstractStateMachine#getStateMachine() - - o org.apache.commons.scxml.io.SCXMLDigester - - o org.apache.commons.scxml.io.SCXMLSerializer#serializeTarget(StringBuffer, - Transition,String) - - o org.apache.commons.scxml.model.Parallel#addState(State) - org.apache.commons.scxml.model.Parallel#getStates() - - o org.apache.commons.scxml.model.SCXML#addState(State) - org.apache.commons.scxml.model.SCXML#getInitialState() - org.apache.commons.scxml.model.SCXML#getStates() - org.apache.commons.scxml.model.SCXML#setInitialState(State) - - o org.apache.commons.scxml.model.State#addChild(State) - org.apache.commons.scxml.model.State#getIsFinal() - org.apache.commons.scxml.model.State#getParallel() - org.apache.commons.scxml.model.State#getTransitions() - org.apache.commons.scxml.model.State#isDone() - org.apache.commons.scxml.model.State#isOrthogonal() - org.apache.commons.scxml.model.State#setDone(boolean) - org.apache.commons.scxml.model.State#setIsFinal(boolean) - org.apache.commons.scxml.model.State#setParallel(Parallel) - - o org.apache.commons.scxml.model.Transition#getPath() - org.apache.commons.scxml.model.Transition#getRuntimeTarget() - org.apache.commons.scxml.model.Transition#getTarget() - org.apache.commons.scxml.model.Transition#setTarget(TransitionTarget) + o [SCXML-62] - Fragment URLs are now supported by the src attribute of the + element - o org.apache.commons.scxml.semantics.ErrorConstants#NON_DETERMINISTIC + o [SCXML-64] - Better error reporting for ignored or misplaced elements by +parser (SCXMLParser class) BUG FIXES: - o [SCXML-45] - Payload of events sent to current scxml session using -tag not injected into engine - o [SCXML-48] - Cannot create more than one subclass of AbstractStateMachine - o [SCXML-49] - SimpleSCXMLInvoker may miss transition to final state - o [SCXML-51] - with location and expr both containing datamodel -expressions concatenates old and new values - o [SCXML-52] - Error on resolving conflicting transitions for compound states - o [SCXML-53] - Wild card event name handling on transitions is not in line -with W3C WD - o [SCXML-54] - Events from custom actions missing payload - o [SCXML-56] - onentry and onexit child elements of parallel do not have -parent - o [SCXML-58] - SCXML not stateless because of State class - o [SCXML-60] - Possible race condition in AsyncTrigger - o [SCXML-61] - Clarify interaction patterns for Invoker implementations with -parent state machine executor - -IMPROVEMENTS: - - o [SCXML-41] - Adding information about original expression to evaluation -error messages - o [SCXML-46] - Provide a SCXMLListener abstract adapter class - o [SCXML-55] - Add support for tag - -OTHER CHANGES: - - o SCXMLExecutor logs state at a lower severity (changed from log level - 'info' to log level &#x
svn commit: r653889 - /commons/proper/scxml/branches/J6/RELEASE-NOTES.txt
Author: rahul Date: Tue May 6 12:34:00 2008 New Revision: 653889 URL: http://svn.apache.org/viewvc?rev=653889&view=rev Log: Create empty template for v1.0 release notes. Modified: commons/proper/scxml/branches/J6/RELEASE-NOTES.txt Modified: commons/proper/scxml/branches/J6/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/RELEASE-NOTES.txt?rev=653889&r1=653888&r2=653889&view=diff == --- commons/proper/scxml/branches/J6/RELEASE-NOTES.txt (original) +++ commons/proper/scxml/branches/J6/RELEASE-NOTES.txt Tue May 6 12:34:00 2008 @@ -17,122 +17,34 @@ $Id$ Commons SCXML Package - Version 0.8-SNAPSHOT + Version 1.0-SNAPSHOT Release Notes INTRODUCTION: -Commons SCXML 0.7 primarily contains new features, along with a -handful of bug fixes. See about section at the end for general information -on Commons SCXML. +Commons SCXML 1.0 is a major release. It contains non backwards compatible +changes from the 0.x releases. See about section at the end for general +information on Commons SCXML. IMPORTANT NOTES: - o State IDs can no longer contain whitespace. Any IDs that contain spaces - must be changed to conform before switching to v0.7. - - o Behavior related to wild card event name handling for transitions has - changed (now aligns with latest Working Draft). - - o org.apache.commons.scxml.io.SCXMLDigester has been deprecated in favor - of SCXMLParser in same package. See Javadocs for changes before switching. + o NEW FEATURES: - o Conflicts between transitions are now resolved based on document order - of the transitions. - - o Transition targets can now be specified as a space separated list of - state IDs. When more than one targets are specified, they must belong - to regions of the same parallel. - - o is supported (by org.apache.commons.scxml.io.SCXMLParser). - - o is supported (by org.apache.commons.scxml.io.SCXMLParser). - -DEPRECATIONS: - -See Javadocs of each item for details. All deprecated items are scheduled for -removal in v1.0. - - o org.apache.commons.scxml.env.AbstractStateMachine#getStateMachine() - - o org.apache.commons.scxml.io.SCXMLDigester - - o org.apache.commons.scxml.io.SCXMLSerializer#serializeTarget(StringBuffer, - Transition,String) - - o org.apache.commons.scxml.model.Parallel#addState(State) - org.apache.commons.scxml.model.Parallel#getStates() - - o org.apache.commons.scxml.model.SCXML#addState(State) - org.apache.commons.scxml.model.SCXML#getInitialState() - org.apache.commons.scxml.model.SCXML#getStates() - org.apache.commons.scxml.model.SCXML#setInitialState(State) - - o org.apache.commons.scxml.model.State#addChild(State) - org.apache.commons.scxml.model.State#getIsFinal() - org.apache.commons.scxml.model.State#getParallel() - org.apache.commons.scxml.model.State#getTransitions() - org.apache.commons.scxml.model.State#isDone() - org.apache.commons.scxml.model.State#isOrthogonal() - org.apache.commons.scxml.model.State#setDone(boolean) - org.apache.commons.scxml.model.State#setIsFinal(boolean) - org.apache.commons.scxml.model.State#setParallel(Parallel) - - o org.apache.commons.scxml.model.Transition#getPath() - org.apache.commons.scxml.model.Transition#getRuntimeTarget() - org.apache.commons.scxml.model.Transition#getTarget() - org.apache.commons.scxml.model.Transition#setTarget(TransitionTarget) - - o org.apache.commons.scxml.semantics.ErrorConstants#NON_DETERMINISTIC + o BUG FIXES: - o [SCXML-45] - Payload of events sent to current scxml session using -tag not injected into engine - o [SCXML-48] - Cannot create more than one subclass of AbstractStateMachine - o [SCXML-49] - SimpleSCXMLInvoker may miss transition to final state - o [SCXML-51] - with location and expr both containing datamodel -expressions concatenates old and new values - o [SCXML-52] - Error on resolving conflicting transitions for compound states - o [SCXML-53] - Wild card event name handling on transitions is not in line -with W3C WD - o [SCXML-54] - Events from custom actions missing payload - o [SCXML-56] - onentry and onexit child elements of parallel do not have -parent - o [SCXML-58] - SCXML not stateless because of State class - o [SCXML-60] - Possible race condition in AsyncTrigger - o [SCXML-61] - Clarify interaction patterns for Invoker implementations with -parent state machine executor + o IMPROVEMENTS: - o [SCXML-41] - Adding information about original expression to evaluation -error messages - o [SCXML-46] - Provide a SCXMLListener abstract adapter class - o [SCXML-55] - Add support for tag + o OTHER CHANGES: - o SCXMLExecutor logs state at a lower severity (changed from log lev
svn commit: r653891 - /commons/proper/scxml/trunk/xdocs/changes.xml
Author: rahul Date: Tue May 6 12:48:51 2008 New Revision: 653891 URL: http://svn.apache.org/viewvc?rev=653891&view=rev Log: Update to changes file. Modified: commons/proper/scxml/trunk/xdocs/changes.xml Modified: commons/proper/scxml/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/xdocs/changes.xml?rev=653891&r1=653890&r2=653891&view=diff == --- commons/proper/scxml/trunk/xdocs/changes.xml (original) +++ commons/proper/scxml/trunk/xdocs/changes.xml Tue May 6 12:48:51 2008 @@ -36,6 +36,25 @@ + + [05-03-2008] Better error reporting for ignored or misplaced elements + by parser (SCXMLParser class). + + + + [04-25-2008] Enhancement request for supporting fragment URLs in + <state> element's src attribute. + + + + [02-09-2008] Process <parallel> child of <state> correctly. + + + + [01-26-2008] Improve first-hit performance for following transitions + by working out the paths at parse-time. + + [01-03-2008] Clarify via Javadocs that the SCXMLParser assumes the input to be a well-formed and correct SCXML document.
svn commit: r653893 - /commons/proper/scxml/branches/J6/xdocs/changes.xml
Author: rahul Date: Tue May 6 12:52:36 2008 New Revision: 653893 URL: http://svn.apache.org/viewvc?rev=653893&view=rev Log: Update to changes file. Modified: commons/proper/scxml/branches/J6/xdocs/changes.xml Modified: commons/proper/scxml/branches/J6/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/xdocs/changes.xml?rev=653893&r1=653892&r2=653893&view=diff == --- commons/proper/scxml/branches/J6/xdocs/changes.xml (original) +++ commons/proper/scxml/branches/J6/xdocs/changes.xml Tue May 6 12:52:36 2008 @@ -33,9 +33,38 @@ - + + [03-07-2008] Enable JavaScript as one of the pluggable ELs in SCXML + documents. + + + + + + + + [05-03-2008] Better error reporting for ignored or misplaced elements + by parser (SCXMLParser class). + + + + [04-25-2008] Enhancement request for supporting fragment URLs in + <state> element's src attribute. + + + + [02-09-2008] Process <parallel> child of <state> correctly. + + + + [01-26-2008] Improve first-hit performance for following transitions + by working out the paths at parse-time. + + [01-03-2008] Clarify via Javadocs that the SCXMLParser assumes the input to be a well-formed and correct SCXML document.
svn commit: r653898 - /commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
Author: rahul Date: Tue May 6 13:05:55 2008 New Revision: 653898 URL: http://svn.apache.org/viewvc?rev=653898&view=rev Log: Clarify one to many relationship between state machine definition and executor instance. Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java?rev=653898&r1=653897&r2=653898&view=diff == --- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java (original) +++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java Tue May 6 13:05:55 2008 @@ -312,6 +312,13 @@ /** * Get the state machine that is being executed. + * NOTE: This is the state machine definition or model used by this + * executor instance. It may be shared across multiple executor instances + * and as a best practice, should not be altered. Also note that + * manipulation of instance data for the executor should happen through + * its root context or state contexts only, never through the direct + * manipulation of any [EMAIL PROTECTED] Datamodel}s associated with this state + * machine definition. * * @return Returns the stateMachine. */
svn commit: r653899 - /commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java
Author: rahul Date: Tue May 6 13:07:06 2008 New Revision: 653899 URL: http://svn.apache.org/viewvc?rev=653899&view=rev Log: Port r653898 from trunk: Clarify one to many relationship between state machine definition and executor instance. Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java?rev=653899&r1=653898&r2=653899&view=diff == --- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java (original) +++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/SCXMLExecutor.java Tue May 6 13:07:06 2008 @@ -310,6 +310,13 @@ /** * Get the state machine that is being executed. + * NOTE: This is the state machine definition or model used by this + * executor instance. It may be shared across multiple executor instances + * and as a best practice, should not be altered. Also note that + * manipulation of instance data for the executor should happen through + * its root context or state contexts only, never through the direct + * manipulation of any [EMAIL PROTECTED] Datamodel}s associated with this state + * machine definition. * * @return Returns the stateMachine. */
svn commit: r654309 - /commons/proper/commons-parent/trunk/pom.xml
Author: rahul Date: Wed May 7 15:37:38 2008 New Revision: 654309 URL: http://svn.apache.org/viewvc?rev=654309&view=rev Log: [maven-release-plugin] prepare release commons-parent-10 Modified: commons/proper/commons-parent/trunk/pom.xml Modified: commons/proper/commons-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=654309&r1=654308&r2=654309&view=diff == --- commons/proper/commons-parent/trunk/pom.xml (original) +++ commons/proper/commons-parent/trunk/pom.xml Wed May 7 15:37:38 2008 @@ -28,7 +28,7 @@ commons-parent pom - 10-SNAPSHOT + 10 Commons Parent http://commons.apache.org/ 2001 @@ -57,9 +57,9 @@ a release of the commons-parent POM. --> - scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-parent/trunk - scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-parent/trunk -http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk + scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-10 + scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-10 + http://svn.apache.org/viewvc/commons/proper/commons-parent/tags/commons-parent-10
svn commit: r654310 - in /commons/proper/commons-parent/tags/commons-parent-10: ./ pom.xml
Author: rahul Date: Wed May 7 15:37:44 2008 New Revision: 654310 URL: http://svn.apache.org/viewvc?rev=654310&view=rev Log: [maven-release-plugin] copy for tag commons-parent-10 Added: commons/proper/commons-parent/tags/commons-parent-10/ - copied from r654306, commons/proper/commons-parent/trunk/ commons/proper/commons-parent/tags/commons-parent-10/pom.xml - copied unchanged from r654309, commons/proper/commons-parent/trunk/pom.xml
