Cleaned up connected components example and tests.

pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/iterations/CoGroupConnectedComponentsTest.java → pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/iterations/WorksetConnectedComponentsCoGroupTest.java

@@ -28,7 +28,7 @@ import eu.stratosphere.pact.compiler.plan.candidate.SourcePlanNode;
 import eu.stratosphere.pact.compiler.plan.candidate.WorksetIterationPlanNode;
 import eu.stratosphere.pact.compiler.plandump.PlanJSONDumpGenerator;
 import eu.stratosphere.pact.compiler.plantranslate.NepheleJobGraphGenerator;
-import eu.stratosphere.pact.example.iterative.CoGroupConnectedComponents;
+import eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponentsWithCoGroup;
 import eu.stratosphere.pact.runtime.shipping.ShipStrategyType;
 import eu.stratosphere.pact.runtime.task.DriverStrategy;
 import eu.stratosphere.pact.runtime.task.util.LocalStrategy;
@@ -36,7 +36,7 @@ import eu.stratosphere.pact.runtime.task.util.LocalStrategy;
 /**
  *
  */
-public class CoGroupConnectedComponentsTest extends CompilerTestBase {
+public class WorksetConnectedComponentsCoGroupTest extends CompilerTestBase {
 	
 	private static final String VERTEX_SOURCE = "Vertices";
 	
@@ -55,7 +55,7 @@ public class CoGroupConnectedComponentsTest extends CompilerTestBase {
 	
 	@Test
 	public void testWorksetConnectedComponents() {
-		CoGroupConnectedComponents cc = new CoGroupConnectedComponents();
+		WorksetConnectedComponentsWithCoGroup cc = new WorksetConnectedComponentsWithCoGroup();
 
 		Plan plan = cc.getPlan(String.valueOf(DEFAULT_PARALLELISM),
 				IN_FILE, IN_FILE, OUT_FILE, String.valueOf(100));

pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/iterations/IncrementalConnectedComponentsTest.java → pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/iterations/WorksetConnectedComponentsTest.java

@@ -29,7 +29,7 @@ import eu.stratosphere.pact.compiler.plan.candidate.SourcePlanNode;
 import eu.stratosphere.pact.compiler.plan.candidate.WorksetIterationPlanNode;
 import eu.stratosphere.pact.compiler.plandump.PlanJSONDumpGenerator;
 import eu.stratosphere.pact.compiler.plantranslate.NepheleJobGraphGenerator;
-import eu.stratosphere.pact.example.iterative.WorksetConnectedComponents;
+import eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponents;
 import eu.stratosphere.pact.runtime.shipping.ShipStrategyType;
 import eu.stratosphere.pact.runtime.task.DriverStrategy;
 import eu.stratosphere.pact.runtime.task.util.LocalStrategy;
@@ -37,7 +37,7 @@ import eu.stratosphere.pact.runtime.task.util.LocalStrategy;
 /**
  *
  */
-public class IncrementalConnectedComponentsTest extends CompilerTestBase {
+public class WorksetConnectedComponentsTest extends CompilerTestBase {
 	
 	private static final String VERTEX_SOURCE = "Vertices";
 	

pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/plandump/CompiledPlanDumpTest.java

@@ -23,7 +23,7 @@ import org.junit.Test;
 import eu.stratosphere.pact.common.plan.Plan;
 import eu.stratosphere.pact.compiler.CompilerTestBase;
 import eu.stratosphere.pact.compiler.plan.candidate.OptimizedPlan;
-import eu.stratosphere.pact.example.iterative.WorksetConnectedComponents;
+import eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponents;
 import eu.stratosphere.pact.example.kmeans.KMeansIterative;
 import eu.stratosphere.pact.example.kmeans.KMeansSingleStep;
 import eu.stratosphere.pact.example.relational.TPCHQuery3;

pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/plandump/PreviewPlanDumpTest.java

@@ -25,7 +25,7 @@ import org.junit.Test;
 import eu.stratosphere.pact.common.plan.Plan;
 import eu.stratosphere.pact.compiler.PactCompiler;
 import eu.stratosphere.pact.compiler.plan.DataSinkNode;
-import eu.stratosphere.pact.example.iterative.WorksetConnectedComponents;
+import eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponents;
 import eu.stratosphere.pact.example.kmeans.KMeansIterative;
 import eu.stratosphere.pact.example.kmeans.KMeansSingleStep;
 import eu.stratosphere.pact.example.relational.TPCHQuery3;

pact/pact-examples/pom.xml

@@ -40,6 +40,28 @@
 				<version>2.4</version>
 				<executions>
 				
+					<!-- Connected Components -->
+					<execution>
+						<id>ConnectedComponents</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<classifier>ConnectedComponents</classifier>
+
+							<archive>
+								<manifestEntries>
+									<Pact-Assembler-Class>eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponents</Pact-Assembler-Class>
+								</manifestEntries>
+							</archive>
+
+							<includes>
+								<include>**/connectedcomponents/*.class</include>
+							</includes>
+						</configuration>
+					</execution>
+				
 					<!-- DanglingPageRank -->
 					<execution>
 						<id>DanglingPageRank</id>

pact/pact-examples/src/main/java/eu/stratosphere/pact/example/iterative/DuplicateLongInputFormat.java → pact/pact-examples/src/main/java/eu/stratosphere/pact/example/connectedcomponents/DuplicateLongInputFormat.java

@@ -13,7 +13,7 @@
  *
  **********************************************************************************************************************/
 
-package eu.stratosphere.pact.example.iterative;
+package eu.stratosphere.pact.example.connectedcomponents;
 
 import eu.stratosphere.pact.common.io.TextInputFormat;
 import eu.stratosphere.pact.common.type.PactRecord;

pact/pact-examples/src/main/java/eu/stratosphere/pact/example/iterative/LongLongInputFormat.java → pact/pact-examples/src/main/java/eu/stratosphere/pact/example/connectedcomponents/LongLongInputFormat.java

@@ -13,7 +13,7 @@
  *
  **********************************************************************************************************************/
 
-package eu.stratosphere.pact.example.iterative;
+package eu.stratosphere.pact.example.connectedcomponents;
 
 import eu.stratosphere.pact.common.io.TextInputFormat;
 import eu.stratosphere.pact.common.type.PactRecord;

pact/pact-examples/src/main/java/eu/stratosphere/pact/example/iterative/WorksetConnectedComponents.java → pact/pact-examples/src/main/java/eu/stratosphere/pact/example/connectedcomponents/WorksetConnectedComponents.java

@@ -13,7 +13,7 @@
  *
  **********************************************************************************************************************/
 
-package eu.stratosphere.pact.example.iterative;
+package eu.stratosphere.pact.example.connectedcomponents;
 
 import java.util.Iterator;
 

pact/pact-examples/src/main/java/eu/stratosphere/pact/example/iterative/CoGroupConnectedComponents.java → pact/pact-examples/src/main/java/eu/stratosphere/pact/example/connectedcomponents/WorksetConnectedComponentsWithCoGroup.java

@@ -13,7 +13,7 @@
  *
  **********************************************************************************************************************/
 
-package eu.stratosphere.pact.example.iterative;
+package eu.stratosphere.pact.example.connectedcomponents;
 
 import java.util.Iterator;
 
@@ -32,14 +32,14 @@ import eu.stratosphere.pact.common.stubs.StubAnnotation.ConstantFieldsFirst;
 import eu.stratosphere.pact.common.stubs.StubAnnotation.ConstantFieldsSecond;
 import eu.stratosphere.pact.common.type.PactRecord;
 import eu.stratosphere.pact.common.type.base.PactLong;
-import eu.stratosphere.pact.example.iterative.DuplicateLongInputFormat;
-import eu.stratosphere.pact.example.iterative.LongLongInputFormat;
+import eu.stratosphere.pact.example.connectedcomponents.DuplicateLongInputFormat;
+import eu.stratosphere.pact.example.connectedcomponents.LongLongInputFormat;
 import eu.stratosphere.pact.generic.contract.WorksetIteration;
 
 /**
  *
  */
-public class CoGroupConnectedComponents implements PlanAssembler, PlanAssemblerDescription {
+public class WorksetConnectedComponentsWithCoGroup implements PlanAssembler, PlanAssemblerDescription {
 	
 	public static final class NeighborWithComponentIDJoin extends MatchStub {
 

pact/pact-tests/src/test/java/eu/stratosphere/pact/test/iterative/CoGroupConnectedComponentsITCase.java

@@ -24,7 +24,7 @@ import org.junit.runners.Parameterized.Parameters;
 
 import eu.stratosphere.nephele.configuration.Configuration;
 import eu.stratosphere.pact.common.plan.Plan;
-import eu.stratosphere.pact.example.iterative.CoGroupConnectedComponents;
+import eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponentsWithCoGroup;
 import eu.stratosphere.pact.test.iterative.nephele.ConnectedComponentsNepheleITCase;
 import eu.stratosphere.pact.test.util.TestBase2;
 
@@ -60,7 +60,7 @@ public class CoGroupConnectedComponentsITCase extends TestBase2 {
 		int maxIterations = config.getInteger("ConnectedComponents#NumIterations", 1);
 		String[] params = { String.valueOf(dop) , verticesPath, edgesPath, resultPath, String.valueOf(maxIterations) };
 		
-		CoGroupConnectedComponents cc = new CoGroupConnectedComponents();
+		WorksetConnectedComponentsWithCoGroup cc = new WorksetConnectedComponentsWithCoGroup();
 		return cc.getPlan(params);
 	}
 

pact/pact-tests/src/test/java/eu/stratosphere/pact/test/iterative/ConnectedComponentsITCase.java

@@ -24,7 +24,7 @@ import org.junit.runners.Parameterized.Parameters;
 
 import eu.stratosphere.nephele.configuration.Configuration;
 import eu.stratosphere.pact.common.plan.Plan;
-import eu.stratosphere.pact.example.iterative.WorksetConnectedComponents;
+import eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponents;
 import eu.stratosphere.pact.test.iterative.nephele.ConnectedComponentsNepheleITCase;
 import eu.stratosphere.pact.test.util.TestBase2;
 

pact/pact-tests/src/test/java/eu/stratosphere/pact/test/iterative/nephele/ConnectedComponentsNepheleITCase.java

@@ -43,9 +43,9 @@ import eu.stratosphere.pact.common.stubs.aggregators.LongSumAggregator;
 import eu.stratosphere.pact.common.type.PactRecord;
 import eu.stratosphere.pact.common.type.base.PactLong;
 import eu.stratosphere.pact.common.type.base.parser.DecimalTextLongParser;
-import eu.stratosphere.pact.example.iterative.WorksetConnectedComponents.MinimumComponentIDReduce;
-import eu.stratosphere.pact.example.iterative.WorksetConnectedComponents.NeighborWithComponentIDJoin;
-import eu.stratosphere.pact.example.iterative.WorksetConnectedComponents.UpdateComponentIdMatch;
+import eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponents.MinimumComponentIDReduce;
+import eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponents.NeighborWithComponentIDJoin;
+import eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponents.UpdateComponentIdMatch;
 import eu.stratosphere.pact.generic.types.TypeComparatorFactory;
 import eu.stratosphere.pact.generic.types.TypePairComparatorFactory;
 import eu.stratosphere.pact.generic.types.TypeSerializerFactory;