[jboss-cvs] JBossAS SVN: r99120 - in projects/jboss-deployers/trunk/deployers-impl/src: test/java/org/jboss/test/deployers/deployer and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Jan 7 11:20:15 EST 2010


Author: alesj
Date: 2010-01-07 11:20:14 -0500 (Thu, 07 Jan 2010)
New Revision: 99120

Added:
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/InOutTopologicalDeployerSorter.java
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/InOutTopologicalOrderingUnitTestCase.java
Removed:
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/TopologicalDeployerSorter.java
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/TopologicalOrderingUnitTestCase.java
Modified:
   projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/TopologicalOrderingDeployerSorter.java
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/DeployersDeployerTestSuite.java
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DominoOrderingUnitTestCase.java
   projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/KahnOrderingUnitTestCase.java
Log:
Simple code fixup.

Copied: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/InOutTopologicalDeployerSorter.java (from rev 99113, projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/TopologicalDeployerSorter.java)
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/InOutTopologicalDeployerSorter.java	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/InOutTopologicalDeployerSorter.java	2010-01-07 16:20:14 UTC (rev 99120)
@@ -0,0 +1,193 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright (c) 2009, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.deployers.plugins.sort;
+
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
+import java.util.TreeSet;
+
+import org.jboss.deployers.spi.Ordered;
+import org.jboss.deployers.spi.deployer.Deployer;
+import org.jboss.util.graph.Edge;
+import org.jboss.util.graph.Graph;
+import org.jboss.util.graph.Vertex;
+
+/**
+ * Simple topological sorting: http://en.wikipedia.org/wiki/Topological_sorting.
+ * 
+ * Each input or output is a task, dependency between tasks is determined by deployer.
+ * e.g. Deployer D has input X and output Y, hence we have 2 tasks and the dependency between them,
+ * meaning that task X needs to be finished before task Y.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class InOutTopologicalDeployerSorter implements DeployerSorter
+{
+   @SuppressWarnings({"unchecked"})
+   public List<Deployer> sortDeployers(List<Deployer> original, Deployer newDeployer)
+   {
+      Graph<Integer> graph = new Graph<Integer>();
+      Map<String, Set<Deployer>> output2deployer = new HashMap<String, Set<Deployer>>();
+      List<Deployer> splitList = new SplitList<Deployer>(original, newDeployer);
+      Set<Deployer> notUsed = new TreeSet<Deployer>(Ordered.COMPARATOR);
+      for (Deployer deployer : splitList)
+      {
+         boolean used = false;
+
+         Set<String> inputs = deployer.getInputs();
+         Set<Vertex<Integer>> ivd = fillVertices(inputs, graph);
+         Set<String> outputs = deployer.getOutputs();
+         Set<Vertex<Integer>> ovd = fillVertices(outputs, graph);
+         ivd.retainAll(ovd); // intersection
+         for (String output : outputs)
+         {
+            Set<Deployer> deployers = output2deployer.get(output);
+            if (deployers == null)
+            {
+               deployers = new TreeSet<Deployer>(Ordered.COMPARATOR);
+               output2deployer.put(output, deployers);
+            }
+            deployers.add(deployer);
+            used = true;
+
+            for (String input : inputs)
+            {
+               Vertex<Integer> from = graph.findVertexByName(input);
+               Vertex<Integer> to = graph.findVertexByName(output);
+               // ignore pass-through
+               if (from != to && ivd.contains(from) == false)
+                  graph.addEdge(from, to, 0);
+            }
+         }
+
+         if (used == false)
+            notUsed.add(deployer);
+      }
+      Stack<Vertex<Integer>> noIncoming = new Stack<Vertex<Integer>>();
+      for (Vertex<Integer> vertex : graph.getVerticies())
+      {
+         if (vertex.getIncomingEdgeCount() == 0)
+            noIncoming.push(vertex);
+      }
+      List<Vertex<Integer>> sorted = new ArrayList<Vertex<Integer>>();
+      while(noIncoming.isEmpty() == false)
+      {
+         Vertex<Integer> n = noIncoming.pop();
+         sorted.add(n);
+         n.setData(sorted.size());
+         List<Edge<Integer>> edges = new ArrayList<Edge<Integer>>(n.getOutgoingEdges());
+         for (Edge<Integer> edge : edges)
+         {
+            Vertex<Integer> m = edge.getTo();
+            graph.removeEdge(n, m);
+            if (m.getIncomingEdgeCount() == 0)
+               noIncoming.push(m);
+         }
+      }
+      if (graph.getEdges().isEmpty() == false)
+         throw new IllegalStateException("We have a cycle: " + newDeployer + ", previous: " + original);
+
+      Set<Deployer> sortedDeployers = new LinkedHashSet<Deployer>();
+      for (Vertex<Integer> v : sorted)
+      {
+         Set<Deployer> deployers = output2deployer.get(v.getName());
+         if (deployers != null)
+         {
+            Deployer first = deployers.iterator().next();
+            Iterator<Deployer> notUsedIter = notUsed.iterator();
+            while(notUsedIter.hasNext())
+            {
+               Deployer next = notUsedIter.next();
+               if (next.getInputs().isEmpty() && Ordered.COMPARATOR.compare(next, first) < 0)
+               {
+                  sortedDeployers.add(next);
+                  notUsedIter.remove();
+               }
+            }
+            for (Deployer deployer : deployers)
+            {
+               if (sortedDeployers.contains(deployer) == false)
+                  sortedDeployers.add(deployer);               
+            }
+         }
+      }
+      sortedDeployers.addAll(notUsed); // add the one's with no output
+      return new ArrayList<Deployer>(sortedDeployers);
+   }
+
+   private static Set<Vertex<Integer>> fillVertices(Set<String> keys, Graph<Integer> graph)
+   {
+      Map<Vertex<Integer>, Object> dv = new IdentityHashMap<Vertex<Integer>, Object>();
+      for (String key : keys)
+         dv.put(getVertex(key, graph), 0);
+      return dv.keySet();
+   }
+
+   private static Vertex<Integer> getVertex(String key, Graph<Integer> graph)
+   {
+      Vertex<Integer> vertex = graph.findVertexByName(key);
+      if (vertex == null)
+      {
+         vertex = new Vertex<Integer>(key);
+         graph.addVertex(vertex);
+      }
+      return vertex;
+   }
+
+   private class SplitList<T> extends AbstractList<T>
+   {
+      private List<T> head;
+      private List<T> tail;
+
+      private SplitList(List<T> head, T tail)
+      {
+         this.head = head;
+         this.tail = Collections.singletonList(tail);
+      }
+
+      @Override
+      public T get(int index)
+      {
+         int headSize = head.size();
+         if (index < headSize)
+            return head.get(index);
+         else
+            return tail.get(index - headSize);
+      }
+
+      @Override
+      public int size()
+      {
+         return head.size() + tail.size();
+      }
+   }
+}
\ No newline at end of file

Deleted: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/TopologicalDeployerSorter.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/TopologicalDeployerSorter.java	2010-01-07 15:47:29 UTC (rev 99119)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/TopologicalDeployerSorter.java	2010-01-07 16:20:14 UTC (rev 99120)
@@ -1,193 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright (c) 2009, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.deployers.plugins.sort;
-
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-import java.util.TreeSet;
-
-import org.jboss.deployers.spi.Ordered;
-import org.jboss.deployers.spi.deployer.Deployer;
-import org.jboss.util.graph.Edge;
-import org.jboss.util.graph.Graph;
-import org.jboss.util.graph.Vertex;
-
-/**
- * Simple topological sorting: http://en.wikipedia.org/wiki/Topological_sorting.
- * 
- * Each input or output is a task, dependency between tasks is determined by deployer.
- * e.g. Deployer D has input X and output Y, hence we have 2 tasks and the dependency between them,
- * meaning that task X needs to be finished before task Y.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class TopologicalDeployerSorter implements DeployerSorter
-{
-   @SuppressWarnings({"unchecked"})
-   public List<Deployer> sortDeployers(List<Deployer> original, Deployer newDeployer)
-   {
-      Graph<Integer> graph = new Graph<Integer>();
-      Map<String, Set<Deployer>> output2deployer = new HashMap<String, Set<Deployer>>();
-      List<Deployer> splitList = new SplitList<Deployer>(original, newDeployer);
-      Set<Deployer> notUsed = new TreeSet<Deployer>(Ordered.COMPARATOR);
-      for (Deployer deployer : splitList)
-      {
-         boolean used = false;
-
-         Set<String> inputs = deployer.getInputs();
-         Set<Vertex<Integer>> ivd = fillVertices(inputs, graph);
-         Set<String> outputs = deployer.getOutputs();
-         Set<Vertex<Integer>> ovd = fillVertices(outputs, graph);
-         ivd.retainAll(ovd); // intersection
-         for (String output : outputs)
-         {
-            Set<Deployer> deployers = output2deployer.get(output);
-            if (deployers == null)
-            {
-               deployers = new TreeSet<Deployer>(Ordered.COMPARATOR);
-               output2deployer.put(output, deployers);
-            }
-            deployers.add(deployer);
-            used = true;
-
-            for (String input : inputs)
-            {
-               Vertex<Integer> from = graph.findVertexByName(input);
-               Vertex<Integer> to = graph.findVertexByName(output);
-               // ignore pass-through
-               if (from != to && ivd.contains(from) == false)
-                  graph.addEdge(from, to, 0);
-            }
-         }
-
-         if (used == false)
-            notUsed.add(deployer);
-      }
-      Stack<Vertex<Integer>> noIncoming = new Stack<Vertex<Integer>>();
-      for (Vertex<Integer> vertex : graph.getVerticies())
-      {
-         if (vertex.getIncomingEdgeCount() == 0)
-            noIncoming.push(vertex);
-      }
-      List<Vertex<Integer>> sorted = new ArrayList<Vertex<Integer>>();
-      while(noIncoming.isEmpty() == false)
-      {
-         Vertex<Integer> n = noIncoming.pop();
-         sorted.add(n);
-         n.setData(sorted.size());
-         List<Edge<Integer>> edges = new ArrayList<Edge<Integer>>(n.getOutgoingEdges());
-         for (Edge<Integer> edge : edges)
-         {
-            Vertex<Integer> m = edge.getTo();
-            graph.removeEdge(n, m);
-            if (m.getIncomingEdgeCount() == 0)
-               noIncoming.push(m);
-         }
-      }
-      if (graph.getEdges().isEmpty() == false)
-         throw new IllegalStateException("We have a cycle: " + newDeployer + ", previous: " + original);
-
-      Set<Deployer> sortedDeployers = new LinkedHashSet<Deployer>();
-      for (Vertex<Integer> v : sorted)
-      {
-         Set<Deployer> deployers = output2deployer.get(v.getName());
-         if (deployers != null)
-         {
-            Deployer first = deployers.iterator().next();
-            Iterator<Deployer> notUsedIter = notUsed.iterator();
-            while(notUsedIter.hasNext())
-            {
-               Deployer next = notUsedIter.next();
-               if (next.getInputs().isEmpty() && Ordered.COMPARATOR.compare(next, first) < 0)
-               {
-                  sortedDeployers.add(next);
-                  notUsedIter.remove();
-               }
-            }
-            for (Deployer deployer : deployers)
-            {
-               if (sortedDeployers.contains(deployer) == false)
-                  sortedDeployers.add(deployer);               
-            }
-         }
-      }
-      sortedDeployers.addAll(notUsed); // add the one's with no output
-      return new ArrayList<Deployer>(sortedDeployers);
-   }
-
-   private static Set<Vertex<Integer>> fillVertices(Set<String> keys, Graph<Integer> graph)
-   {
-      Map<Vertex<Integer>, Object> dv = new IdentityHashMap<Vertex<Integer>, Object>();
-      for (String key : keys)
-         dv.put(getVertex(key, graph), 0);
-      return dv.keySet();
-   }
-
-   private static Vertex<Integer> getVertex(String key, Graph<Integer> graph)
-   {
-      Vertex<Integer> vertex = graph.findVertexByName(key);
-      if (vertex == null)
-      {
-         vertex = new Vertex<Integer>(key);
-         graph.addVertex(vertex);
-      }
-      return vertex;
-   }
-
-   private class SplitList<T> extends AbstractList<T>
-   {
-      private List<T> head;
-      private List<T> tail;
-
-      private SplitList(List<T> head, T tail)
-      {
-         this.head = head;
-         this.tail = Collections.singletonList(tail);
-      }
-
-      @Override
-      public T get(int index)
-      {
-         int headSize = head.size();
-         if (index < headSize)
-            return head.get(index);
-         else
-            return tail.get(index - headSize);
-      }
-
-      @Override
-      public int size()
-      {
-         return head.size() + tail.size();
-      }
-   }
-}
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/TopologicalOrderingDeployerSorter.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/TopologicalOrderingDeployerSorter.java	2010-01-07 15:47:29 UTC (rev 99119)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/sort/TopologicalOrderingDeployerSorter.java	2010-01-07 16:20:14 UTC (rev 99120)
@@ -44,7 +44,6 @@
  */
 public class TopologicalOrderingDeployerSorter implements DeployerSorter
 {
-
    /**
     * @see {@link DeployerSorter#sortDeployers(List, Deployer)}
     */
@@ -66,7 +65,6 @@
       return graph;
    }
 
-
    private static class Graph
    {
       private Map<String, Dependency> dependencies = new HashMap<String, Dependency>();
@@ -86,7 +84,7 @@
          this.vertices.add(vertex);
 
          // register dependencies
-         Dependency dependency = null;
+         Dependency dependency;
          for (final String in : inputs)
          {
             dependency = this.getDependency(in);
@@ -116,8 +114,8 @@
          Collections.sort(roots, Ordered.COMPARATOR);
 
          // while S is non-empty do
-         Vertex root = null;
-         Set<Vertex> nextLevel = null;
+         Vertex root;
+         Set<Vertex> nextLevel;
          while(!roots.isEmpty())
          {
             // remove a node n from S
@@ -190,8 +188,8 @@
 
       private void createEdges()
       {
-         boolean hasModifiers = false;
-         Dependency dependency = null;
+         boolean hasModifiers;
+         Dependency dependency;
 
          for (final String dependencyName : this.dependencies.keySet())
          {

Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/DeployersDeployerTestSuite.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/DeployersDeployerTestSuite.java	2010-01-07 15:47:29 UTC (rev 99119)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/DeployersDeployerTestSuite.java	2010-01-07 16:20:14 UTC (rev 99120)
@@ -39,10 +39,11 @@
 import org.jboss.test.deployers.deployer.test.DominoOrderingUnitTestCase;
 import org.jboss.test.deployers.deployer.test.HeuristicAllOrNothingUnitTestCase;
 import org.jboss.test.deployers.deployer.test.HeuristicRussionDollUnitTestCase;
+import org.jboss.test.deployers.deployer.test.InOutTopologicalOrderingUnitTestCase;
 import org.jboss.test.deployers.deployer.test.IndexingOrderingUnitTestCase;
 import org.jboss.test.deployers.deployer.test.KahnOrderingUnitTestCase;
 import org.jboss.test.deployers.deployer.test.MultipleComponentTypeUnitTestCase;
-import org.jboss.test.deployers.deployer.test.TopologicalOrderingUnitTestCase;
+import org.jboss.test.deployers.deployer.test.OptimizedTopologicalOrderingUnitTestCase;
 
 /**
  * Deployers Deployer Test Suite.
@@ -79,8 +80,9 @@
       suite.addTest(DeployerFlowUnitTestCase.suite());
       suite.addTest(DominoOrderingUnitTestCase.suite());
       suite.addTest(KahnOrderingUnitTestCase.suite());
-      suite.addTest(TopologicalOrderingUnitTestCase.suite());
+      suite.addTest(InOutTopologicalOrderingUnitTestCase.suite());
       suite.addTest(IndexingOrderingUnitTestCase.suite());
+      suite.addTest(OptimizedTopologicalOrderingUnitTestCase.suite());
 
       // helper deployers
       suite.addTest(ExactAttachmentDeployerWithVisitorTestCase.suite());

Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DominoOrderingUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DominoOrderingUnitTestCase.java	2010-01-07 15:47:29 UTC (rev 99119)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/DominoOrderingUnitTestCase.java	2010-01-07 16:20:14 UTC (rev 99120)
@@ -52,8 +52,6 @@
    
    public void testAlgorithmPerformance()
    {
-      System.out.println("------------------------------------------------------------------------");
-      System.out.println("Exhaustive deployer sorting (" + getClass().getSimpleName() +  ") took: NOT MEASURED (too slow)");
-      System.out.println("------------------------------------------------------------------------");
+      // ignored
    }
 }
\ No newline at end of file

Copied: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/InOutTopologicalOrderingUnitTestCase.java (from rev 99113, projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/TopologicalOrderingUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/InOutTopologicalOrderingUnitTestCase.java	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/InOutTopologicalOrderingUnitTestCase.java	2010-01-07 16:20:14 UTC (rev 99120)
@@ -0,0 +1,63 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.deployer.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.jboss.deployers.plugins.sort.DeployerSorter;
+import org.jboss.deployers.plugins.sort.InOutTopologicalDeployerSorter;
+
+/**
+ * Simple topological sorting.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class InOutTopologicalOrderingUnitTestCase extends AbstractSorterOrderingUnitTest
+{
+   public InOutTopologicalOrderingUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   public static Test suite()
+   {
+      return new TestSuite(InOutTopologicalOrderingUnitTestCase.class);
+   }
+
+   @Override
+   protected DeployerSorter createSorter()
+   {
+      return new InOutTopologicalDeployerSorter();
+   }
+
+   @Override
+   public void testDeployersOrder1() throws Exception
+   {
+      // TODO - how much do we allow pass-through to participate in ordering?
+   }
+
+   public void testAlgorithmPerformance()
+   {
+      // ignored
+   }
+}
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/KahnOrderingUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/KahnOrderingUnitTestCase.java	2010-01-07 15:47:29 UTC (rev 99119)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/KahnOrderingUnitTestCase.java	2010-01-07 16:20:14 UTC (rev 99120)
@@ -52,8 +52,6 @@
    
    public void testAlgorithmPerformance()
    {
-      System.out.println("------------------------------------------------------------------------");
-      System.out.println("Exhaustive deployer sorting (" + getClass().getSimpleName() +  ") took: NOT MEASURED (too slow)");
-      System.out.println("------------------------------------------------------------------------");
+      // ignored
    }
 }
\ No newline at end of file

Deleted: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/TopologicalOrderingUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/TopologicalOrderingUnitTestCase.java	2010-01-07 15:47:29 UTC (rev 99119)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/test/TopologicalOrderingUnitTestCase.java	2010-01-07 16:20:14 UTC (rev 99120)
@@ -1,65 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.deployers.deployer.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.jboss.deployers.plugins.sort.DeployerSorter;
-import org.jboss.deployers.plugins.sort.TopologicalDeployerSorter;
-
-/**
- * Simple topological sorting.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class TopologicalOrderingUnitTestCase extends AbstractSorterOrderingUnitTest
-{
-   public TopologicalOrderingUnitTestCase(String name)
-   {
-      super(name);
-   }
-
-   public static Test suite()
-   {
-      return new TestSuite(TopologicalOrderingUnitTestCase.class);
-   }
-
-   @Override
-   protected DeployerSorter createSorter()
-   {
-      return new TopologicalDeployerSorter();
-   }
-
-   @Override
-   public void testDeployersOrder1() throws Exception
-   {
-      // TODO - how much do we allow pass-through to participate in ordering?
-   }
-
-   public void testAlgorithmPerformance()
-   {
-      System.out.println("------------------------------------------------------------------------");
-      System.out.println("Exhaustive deployer sorting (" + getClass().getSimpleName() +  ") took: NOT MEASURED (too slow)");
-      System.out.println("------------------------------------------------------------------------");
-   }
-}
\ No newline at end of file




More information about the jboss-cvs-commits mailing list