[seam-commits] Seam SVN: r8712 - trunk/src/main/org/jboss/seam/bpm.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-08-16 19:44:37 -0400 (Sat, 16 Aug 2008)
New Revision: 8712

Modified:
   trunk/src/main/org/jboss/seam/bpm/Jbpm.java
Log:
JBSEAM-3107

Modified: trunk/src/main/org/jboss/seam/bpm/Jbpm.java
===================================================================
--- trunk/src/main/org/jboss/seam/bpm/Jbpm.java	2008-08-16 17:40:43 UTC (rev 8711)
+++ trunk/src/main/org/jboss/seam/bpm/Jbpm.java	2008-08-16 23:44:37 UTC (rev 8712)
@@ -7,6 +7,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -241,12 +242,14 @@
    }
    
    private void installPageflowDefinitions() {
-      Set<String> mergedPageflowDefinitions = new TreeSet<String>();
-      mergedPageflowDefinitions.addAll(((PageflowDeploymentHandler) ((DeploymentStrategy) Contexts.getEventContext().get(StandardDeploymentStrategy.NAME)).getDeploymentHandlers().get(PageflowDeploymentHandler.NAME)).getPageflowDefinitions());
+      Set<String> mergedPageflowDefinitions = new LinkedHashSet<String>();
       if ( pageflowDefinitions!=null )
       {
          mergedPageflowDefinitions.addAll(Arrays.asList(pageflowDefinitions));
       }
+      
+      mergedPageflowDefinitions.addAll(((PageflowDeploymentHandler) ((DeploymentStrategy) Contexts.getEventContext().get(StandardDeploymentStrategy.NAME)).getDeploymentHandlers().get(PageflowDeploymentHandler.NAME)).getPageflowDefinitions());
+      
       for (String pageflow: mergedPageflowDefinitions)
       {
          ProcessDefinition pd = getPageflowDefinitionFromResource(pageflow);