Unify java and record project. Removed api suffix from projects.

bbejeck · Dec 19, 2013 · e632ef0 · e632ef0
1 parent 79496c0
commit e632ef0
Show file tree

Hide file tree

Showing 148 changed files with 325 additions and 401 deletions.
diff --git a/pom.xml b/pom.xml
@@ -38,9 +38,8 @@
 
  <modules>
  <module>stratosphere-core</module>
- <module>stratosphere-java-api</module>
- <module>stratosphere-record-api</module>
- <module>stratosphere-scala-api</module>
+ <module>stratosphere-java</module>
+ <module>stratosphere-scala</module>
  <module>stratosphere-runtime</module>
  <module>stratosphere-compiler</module>
  <module>stratosphere-examples</module>

diff --git a/stratosphere-addons/hbase/pom.xml b/stratosphere-addons/hbase/pom.xml
@@ -41,7 +41,7 @@
 
  <dependency>
  <groupId>eu.stratosphere</groupId>
- <artifactId>stratosphere-record-api</artifactId>
+ <artifactId>stratosphere-java</artifactId>
  <version>${project.version}</version>
  </dependency>
 

diff --git a/stratosphere-addons/jdbc/pom.xml b/stratosphere-addons/jdbc/pom.xml
@@ -20,7 +20,7 @@
  <dependencies>
  <dependency>
  <groupId>eu.stratosphere</groupId>
- <artifactId>stratosphere-record-api</artifactId>
+ <artifactId>stratosphere-java</artifactId>
  <version>${project.version}</version>
  </dependency>
 

diff --git a/stratosphere-addons/spargel/pom.xml b/stratosphere-addons/spargel/pom.xml
@@ -25,7 +25,7 @@
  </dependency>
  <dependency>
  <groupId>eu.stratosphere</groupId>
- <artifactId>stratosphere-record-api</artifactId>
+ <artifactId>stratosphere-java</artifactId>
  <version>${project.version}</version>
  </dependency>
  <dependency>

diff --git a/stratosphere-dist/pom.xml b/stratosphere-dist/pom.xml
@@ -25,19 +25,13 @@
 
  <dependency>
  <groupId>eu.stratosphere</groupId>
- <artifactId>stratosphere-java-api</artifactId>
+ <artifactId>stratosphere-java</artifactId>
  <version>${project.version}</version>
  </dependency>
 
  <dependency>
  <groupId>eu.stratosphere</groupId>
- <artifactId>stratosphere-scala-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>eu.stratosphere</groupId>
- <artifactId>stratosphere-record-api</artifactId>
+ <artifactId>stratosphere-scala</artifactId>
  <version>${project.version}</version>
  </dependency>
 
@@ -71,12 +65,6 @@
  <version>${project.version}</version>
  </dependency>
 
- <dependency>
- <groupId>eu.stratosphere</groupId>
- <artifactId>stratosphere-record-examples</artifactId>
- <version>${project.version}</version>
- </dependency>
-
  <dependency>
  <groupId>eu.stratosphere</groupId>
  <artifactId>swt-visualization</artifactId>

diff --git a/stratosphere-examples/pom.xml b/stratosphere-examples/pom.xml
@@ -30,7 +30,6 @@
 
  <modules>
  <module>stratosphere-java-examples</module>
- <module>stratosphere-record-examples</module>
  <module>stratosphere-scala-examples</module>
  </modules>
 

diff --git a/stratosphere-examples/stratosphere-java-examples/pom.xml b/stratosphere-examples/stratosphere-java-examples/pom.xml
@@ -17,9 +17,315 @@
  <dependencies>
  <dependency>
  <groupId>eu.stratosphere</groupId>
- <artifactId>stratosphere-java-api</artifactId>
+ <artifactId>stratosphere-java</artifactId>
  <version>${project.version}</version>
  </dependency>
  </dependencies>
+
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+
+
+ <!-- EXAMPLE FOR THE JAVA RECORD API -->
+
+ <!-- Connected Components -->
+ <execution>
+ <id>ConnectedComponents</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>ConnectedComponents</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.connectedcomponents.WorksetConnectedComponents</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/connectedcomponents/*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- DanglingPageRank -->
+ <execution>
+ <id>DanglingPageRank</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>DanglingPageRank</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.pagerank.DanglingPageRank</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/pagerank/*.class</include>
+ <include>**/util/ConfigUtils.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- KMeansSingleStep -->
+ <execution>
+ <id>KMeansSingleStep</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+
+ <configuration>
+ <classifier>KMeansSingleStep</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.kmeans.KMeansSingleStep</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/kmeans/KMeansSingleStep.class</include>
+ <include>**/kmeans/KMeansSingleStep$*.class</include>
+ <include>**/kmeans/udfs/*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- KMeansIterative -->
+ <execution>
+ <id>KMeansIterative</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+
+ <configuration>
+ <classifier>KMeansIterative</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.kmeans.KMeansIterative</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/kmeans/KMeansIterative.class</include>
+ <include>**/kmeans/KMeansIterative$*.class</include>
+ <include>**/kmeans/udfs/*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- Pairwise Shortest Paths -->
+ <execution>
+ <id>PairwiseSP</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>PairwiseSP</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.shortestpaths.PairwiseSP</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/shortestpaths/PairwiseSP.class</include>
+ <include>**/shortestpaths/PairwiseSP$*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- EnumTriangles on pre-computed vertex degrees-->
+ <execution>
+ <id>EnumTrianglesOnEdgesWithDegrees</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>EnumTrianglesOnEdgesWithDegrees</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.triangles.EnumTrianglesOnEdgesWithDegrees</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/triangles/EnumTrianglesWithDegrees.class</include>
+ <include>**/triangles/EnumTrianglesWithDegrees$*.class</include>
+ <include>**/triangles/ComputeEdgeDegrees.class</include>
+ <include>**/triangles/ComputeEdgeDegrees$*.class</include>
+ <include>**/triangles/EnumTrianglesOnEdgesWithDegrees.class</include>
+ <include>**/triangles/EnumTrianglesOnEdgesWithDegrees$*.class</include>
+ <include>**/triangles/io/*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- EnumTriangles including Degree Computation-->
+ <execution>
+ <id>EnumTrianglesWithDegrees</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>EnumTrianglesWithDegrees</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.triangles.EnumTrianglesWithDegrees</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/triangles/EnumTrianglesWithDegrees.class</include>
+ <include>**/triangles/EnumTrianglesWithDegrees$*.class</include>
+ <include>**/triangles/ComputeEdgeDegrees.class</include>
+ <include>**/triangles/ComputeEdgeDegrees$*.class</include>
+ <include>**/triangles/EnumTrianglesOnEdgesWithDegrees.class</include>
+ <include>**/triangles/EnumTrianglesOnEdgesWithDegrees$*.class</include>
+ <include>**/triangles/io/*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- EnumTrianglesRdfFoaf-->
+ <execution>
+ <id>EnumTrianglesRdfFoaf</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>EnumTrianglesRdfFoaf</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.triangles.EnumTrianglesRdfFoaf</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/triangles/EnumTrianglesRdfFoaf.class</include>
+ <include>**/triangles/EnumTrianglesRdfFoaf$*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- TPCHQuery3 -->
+ <execution>
+ <id>TPCHQuery3</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>TPCHQuery3</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.relational.TPCHQuery3</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/relational/TPCHQuery3.class</include>
+ <include>**/relational/TPCHQuery3$*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- WebLogAnalysis -->
+ <execution>
+ <id>WebLogAnalysis</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>WebLogAnalysis</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.relational.WebLogAnalysis</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/relational/WebLogAnalysis.class</include>
+ <include>**/relational/WebLogAnalysis$*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- WordCount -->
+ <execution>
+ <id>WordCount</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>WordCount</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.wordcount.WordCount</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/wordcount/*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+
+ <!-- TeraSort -->
+ <execution>
+ <id>TeraSort</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>TeraSort</classifier>
+
+ <archive>
+ <manifestEntries>
+ <program-class>eu.stratosphere.example.record.sort.TeraSort</program-class>
+ </manifestEntries>
+ </archive>
+
+ <includes>
+ <include>**/sort/TeraSort.class</include>
+ <include>**/sort/terasort/*.class</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
 
 </project>
diff --git a/...omponents/WorksetConnectedComponents.java → ...omponents/WorksetConnectedComponents.java b/...omponents/WorksetConnectedComponents.java → ...omponents/WorksetConnectedComponents.java
diff --git a/...orksetConnectedComponentsWithCoGroup.java → ...orksetConnectedComponentsWithCoGroup.java b/...orksetConnectedComponentsWithCoGroup.java → ...orksetConnectedComponentsWithCoGroup.java
diff --git a/...erank/DeltaPageRankWithInitialDeltas.java → ...erank/DeltaPageRankWithInitialDeltas.java b/...erank/DeltaPageRankWithInitialDeltas.java → ...erank/DeltaPageRankWithInitialDeltas.java
diff --git a/.../PRDependenciesComputationMatchDelta.java → .../PRDependenciesComputationMatchDelta.java b/.../PRDependenciesComputationMatchDelta.java → .../PRDependenciesComputationMatchDelta.java
diff --git a/...xample/record/kmeans/KMeansIterative.java → ...xample/record/kmeans/KMeansIterative.java b/...xample/record/kmeans/KMeansIterative.java → ...xample/record/kmeans/KMeansIterative.java
diff --git a/...ord/kmeans/KMeansSampleDataGenerator.java → ...ord/kmeans/KMeansSampleDataGenerator.java b/...ord/kmeans/KMeansSampleDataGenerator.java → ...ord/kmeans/KMeansSampleDataGenerator.java
diff --git a/...ample/record/kmeans/KMeansSingleStep.java → ...ample/record/kmeans/KMeansSingleStep.java b/...ample/record/kmeans/KMeansSingleStep.java → ...ample/record/kmeans/KMeansSingleStep.java
diff --git a/...e/record/kmeans/udfs/ComputeDistance.java → ...e/record/kmeans/udfs/ComputeDistance.java b/...e/record/kmeans/udfs/ComputeDistance.java → ...e/record/kmeans/udfs/ComputeDistance.java
diff --git a/...ample/record/kmeans/udfs/CoordVector.java → ...ample/record/kmeans/udfs/CoordVector.java b/...ample/record/kmeans/udfs/CoordVector.java → ...ample/record/kmeans/udfs/CoordVector.java
diff --git a/...record/kmeans/udfs/FindNearestCenter.java → ...record/kmeans/udfs/FindNearestCenter.java b/...record/kmeans/udfs/FindNearestCenter.java → ...record/kmeans/udfs/FindNearestCenter.java
diff --git a/...ple/record/kmeans/udfs/PointInFormat.java → ...ple/record/kmeans/udfs/PointInFormat.java b/...ple/record/kmeans/udfs/PointInFormat.java → ...ple/record/kmeans/udfs/PointInFormat.java
diff --git a/...le/record/kmeans/udfs/PointOutFormat.java → ...le/record/kmeans/udfs/PointOutFormat.java b/...le/record/kmeans/udfs/PointOutFormat.java → ...le/record/kmeans/udfs/PointOutFormat.java
diff --git a/...d/kmeans/udfs/RecomputeClusterCenter.java → ...d/kmeans/udfs/RecomputeClusterCenter.java b/...d/kmeans/udfs/RecomputeClusterCenter.java → ...d/kmeans/udfs/RecomputeClusterCenter.java
diff --git a/...e/record/pagerank/AsciiLongArrayView.java → ...e/record/pagerank/AsciiLongArrayView.java b/...e/record/pagerank/AsciiLongArrayView.java → ...e/record/pagerank/AsciiLongArrayView.java
diff --git a/...ple/record/pagerank/DanglingPageRank.java → ...ple/record/pagerank/DanglingPageRank.java b/...ple/record/pagerank/DanglingPageRank.java → ...ple/record/pagerank/DanglingPageRank.java
diff --git a/...pagerank/DanglingPageRankInputFormat.java → ...pagerank/DanglingPageRankInputFormat.java b/...pagerank/DanglingPageRankInputFormat.java → ...pagerank/DanglingPageRankInputFormat.java
diff --git a/...erank/DiffL1NormConvergenceCriterion.java → ...erank/DiffL1NormConvergenceCriterion.java b/...erank/DiffL1NormConvergenceCriterion.java → ...erank/DiffL1NormConvergenceCriterion.java
diff --git a/...le/record/pagerank/DotProductCoGroup.java → ...le/record/pagerank/DotProductCoGroup.java b/...le/record/pagerank/DotProductCoGroup.java → ...le/record/pagerank/DotProductCoGroup.java
diff --git a/...mple/record/pagerank/DotProductMatch.java → ...mple/record/pagerank/DotProductMatch.java b/...mple/record/pagerank/DotProductMatch.java → ...mple/record/pagerank/DotProductMatch.java
diff --git a/...ank/ImprovedAdjacencyListInputFormat.java → ...ank/ImprovedAdjacencyListInputFormat.java b/...ank/ImprovedAdjacencyListInputFormat.java → ...ank/ImprovedAdjacencyListInputFormat.java
diff --git a/...xample/record/pagerank/LongArrayView.java → ...xample/record/pagerank/LongArrayView.java b/...xample/record/pagerank/LongArrayView.java → ...xample/record/pagerank/LongArrayView.java
diff --git a/...xample/record/pagerank/PageRankStats.java → ...xample/record/pagerank/PageRankStats.java b/...xample/record/pagerank/PageRankStats.java → ...xample/record/pagerank/PageRankStats.java
diff --git a/...ord/pagerank/PageRankStatsAggregator.java → ...ord/pagerank/PageRankStatsAggregator.java b/...ord/pagerank/PageRankStatsAggregator.java → ...ord/pagerank/PageRankStatsAggregator.java
diff --git a/...ecord/pagerank/PageWithRankOutFormat.java → ...ecord/pagerank/PageWithRankOutFormat.java b/...ecord/pagerank/PageWithRankOutFormat.java → ...ecord/pagerank/PageWithRankOutFormat.java
diff --git a/...ample/record/pagerank/SimplePageRank.java → ...ample/record/pagerank/SimplePageRank.java b/...ample/record/pagerank/SimplePageRank.java → ...ample/record/pagerank/SimplePageRank.java
diff --git a/...example/record/relational/TPCHQuery3.java → ...example/record/relational/TPCHQuery3.java b/...example/record/relational/TPCHQuery3.java → ...example/record/relational/TPCHQuery3.java
diff --git a/...e/record/relational/TPCHQueryAsterix.java → ...e/record/relational/TPCHQueryAsterix.java b/...e/record/relational/TPCHQueryAsterix.java → ...e/record/relational/TPCHQueryAsterix.java
diff --git a/...ple/record/relational/WebLogAnalysis.java → ...ple/record/relational/WebLogAnalysis.java b/...ple/record/relational/WebLogAnalysis.java → ...ple/record/relational/WebLogAnalysis.java
diff --git a/...relational/generator/WebLogGenerator.java → ...relational/generator/WebLogGenerator.java b/...relational/generator/WebLogGenerator.java → ...relational/generator/WebLogGenerator.java
diff --git a/...mple/record/shortestpaths/PairwiseSP.java → ...mple/record/shortestpaths/PairwiseSP.java b/...mple/record/shortestpaths/PairwiseSP.java → ...mple/record/shortestpaths/PairwiseSP.java
diff --git a/.../example/record/sort/ReduceGroupSort.java → .../example/record/sort/ReduceGroupSort.java b/.../example/record/sort/ReduceGroupSort.java → .../example/record/sort/ReduceGroupSort.java
diff --git a/...osphere/example/record/sort/TeraSort.java → ...osphere/example/record/sort/TeraSort.java b/...osphere/example/record/sort/TeraSort.java → ...osphere/example/record/sort/TeraSort.java
diff --git a/...ecord/sort/terasort/TeraDistribution.java → ...ecord/sort/terasort/TeraDistribution.java b/...ecord/sort/terasort/TeraDistribution.java → ...ecord/sort/terasort/TeraDistribution.java
diff --git a/...record/sort/terasort/TeraInputFormat.java → ...record/sort/terasort/TeraInputFormat.java b/...record/sort/terasort/TeraInputFormat.java → ...record/sort/terasort/TeraInputFormat.java
diff --git a/...example/record/sort/terasort/TeraKey.java → ...example/record/sort/terasort/TeraKey.java b/...example/record/sort/terasort/TeraKey.java → ...example/record/sort/terasort/TeraKey.java
diff --git a/...ecord/sort/terasort/TeraOutputFormat.java → ...ecord/sort/terasort/TeraOutputFormat.java b/...ecord/sort/terasort/TeraOutputFormat.java → ...ecord/sort/terasort/TeraOutputFormat.java
diff --git a/...ample/record/sort/terasort/TeraValue.java → ...ample/record/sort/terasort/TeraValue.java b/...ample/record/sort/terasort/TeraValue.java → ...ample/record/sort/terasort/TeraValue.java
diff --git a/.../record/triangles/ComputeEdgeDegrees.java → .../record/triangles/ComputeEdgeDegrees.java b/.../record/triangles/ComputeEdgeDegrees.java → .../record/triangles/ComputeEdgeDegrees.java
diff --git a/...gles/EnumTrianglesOnEdgesWithDegrees.java → ...gles/EnumTrianglesOnEdgesWithDegrees.java b/...gles/EnumTrianglesOnEdgesWithDegrees.java → ...gles/EnumTrianglesOnEdgesWithDegrees.java
diff --git a/...ecord/triangles/EnumTrianglesRdfFoaf.java → ...ecord/triangles/EnumTrianglesRdfFoaf.java b/...ecord/triangles/EnumTrianglesRdfFoaf.java → ...ecord/triangles/EnumTrianglesRdfFoaf.java
diff --git a/...d/triangles/EnumTrianglesWithDegrees.java → ...d/triangles/EnumTrianglesWithDegrees.java b/...d/triangles/EnumTrianglesWithDegrees.java → ...d/triangles/EnumTrianglesWithDegrees.java
diff --git a/.../record/triangles/io/EdgeInputFormat.java → .../record/triangles/io/EdgeInputFormat.java b/.../record/triangles/io/EdgeInputFormat.java → .../record/triangles/io/EdgeInputFormat.java
diff --git a/...angles/io/EdgeWithDegreesInputFormat.java → ...angles/io/EdgeWithDegreesInputFormat.java b/...angles/io/EdgeWithDegreesInputFormat.java → ...angles/io/EdgeWithDegreesInputFormat.java
diff --git a/...ngles/io/EdgeWithDegreesOutputFormat.java → ...ngles/io/EdgeWithDegreesOutputFormat.java b/...ngles/io/EdgeWithDegreesOutputFormat.java → ...ngles/io/EdgeWithDegreesOutputFormat.java
diff --git a/...rd/triangles/io/TriangleOutputFormat.java → ...rd/triangles/io/TriangleOutputFormat.java b/...rd/triangles/io/TriangleOutputFormat.java → ...rd/triangles/io/TriangleOutputFormat.java
diff --git a/...here/example/record/util/ConfigUtils.java → ...here/example/record/util/ConfigUtils.java b/...here/example/record/util/ConfigUtils.java → ...here/example/record/util/ConfigUtils.java
diff --git a/...e/example/record/wordcount/WordCount.java → ...e/example/record/wordcount/WordCount.java b/...e/example/record/wordcount/WordCount.java → ...e/example/record/wordcount/WordCount.java
diff --git a/...cord/wordcount/WordCountAccumulators.java → ...cord/wordcount/WordCountAccumulators.java b/...cord/wordcount/WordCountAccumulators.java → ...cord/wordcount/WordCountAccumulators.java
diff --git a/.../record/wordcount/WordCountOptimized.java → .../record/wordcount/WordCountOptimized.java b/.../record/wordcount/WordCountOptimized.java → .../record/wordcount/WordCountOptimized.java