[
https://issues.apache.org/jira/browse/FLINK-1712?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15096186#comment-15096186
]
ASF GitHub Bot commented on FLINK-1712:
---------------------------------------
Github user fhueske commented on a diff in the pull request:
https://github.com/apache/flink/pull/1492#discussion_r49589855
--- Diff: flink-examples/flink-examples-batch/pom.xml ---
@@ -280,208 +246,155 @@ under the License.
<!-- EnumTriangles Basic -->
<execution>
- <id>EnumTrianglesBasic</id>
+ <id>EnumerateGraphTriangles</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
-
<classifier>EnumTrianglesBasic</classifier>
+
<classifier>EnumerateGraphTriangles</classifier>
<archive>
<manifestEntries>
-
<program-class>org.apache.flink.examples.scala.graph.EnumTrianglesBasic</program-class>
+
<program-class>org.apache.flink.examples.java.graph.EnumTriangles</program-class>
</manifestEntries>
</archive>
<includes>
-
<include>**/scala/graph/EnumTrianglesBasic.class</include>
-
<include>**/scala/graph/EnumTrianglesBasic$*.class</include>
+
<include>**/java/graph/EnumTriangles.class</include>
+
<include>**/java/graph/EnumTriangles$*.class</include>
+
<include>**/java/graph/util/EnumTrianglesDataTypes.class</include>
+
<include>**/java/graph/util/EnumTrianglesDataTypes$*.class</include>
<include>**/java/graph/util/EnumTrianglesData.class</include>
</includes>
</configuration>
</execution>
- <!-- EnumTriangles Opt -->
+ <!-- PageRank -->
<execution>
- <id>EnumTrianglesOpt</id>
+ <id>PageRank</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
-
<classifier>EnumTrianglesOpt</classifier>
+
<classifier>PageRank</classifier>
<archive>
<manifestEntries>
-
<program-class>org.apache.flink.examples.scala.graph.EnumTrianglesOpt</program-class>
+
<program-class>org.apache.flink.examples.java.graph.PageRank</program-class>
</manifestEntries>
</archive>
<includes>
-
<include>**/scala/graph/EnumTrianglesOpt.class</include>
-
<include>**/scala/graph/EnumTrianglesOpt$*.class</include>
-
<include>**/java/graph/util/EnumTrianglesData.class</include>
+
<include>**/java/graph/PageRank.class</include>
+
<include>**/java/graph/PageRank$*.class</include>
+
<include>**/java/graph/util/PageRankData.class</include>
</includes>
</configuration>
</execution>
-
- <!-- PageRank Basic-->
+
+ <!-- WebLogAnalysis -->
<execution>
- <id>PageRankBasic</id>
+ <id>WebLogAnalysis</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
-
<classifier>PageRankBasic</classifier>
+
<classifier>WebLogAnalysis</classifier>
<archive>
<manifestEntries>
-
<program-class>org.apache.flink.examples.scala.graph.PageRankBasic</program-class>
+
<program-class>org.apache.flink.examples.java.relational.WebLogAnalysis</program-class>
</manifestEntries>
</archive>
<includes>
-
<include>**/scala/graph/PageRankBasic.class</include>
-
<include>**/scala/graph/PageRankBasic$*.class</include>
-
<include>**/java/graph/util/PageRankData.class</include>
+
<include>**/java/relational/WebLogAnalysis.class</include>
+
<include>**/java/relational/WebLogAnalysis$*.class</include>
+
<include>**/java/relational/util/WebLogData.class</include>
+
<include>**/java/relational/util/WebLogDataGenerator.class</include>
</includes>
</configuration>
</execution>
-
- <!-- These queries are currently not
self-contained -->
- <!-- TPC-H Query 10 -->
-
- <!--
+ <!-- WordCount -->
<execution>
- <id>TPCHQuery10</id>
+ <id>WordCount</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
-
<classifier>TPCHQuery10</classifier>
+
<classifier>WordCount</classifier>
<archive>
<manifestEntries>
-
<program-class>org.apache.flink.examples.scala.relational.TPCHQuery10</program-class>
+
<program-class>org.apache.flink.examples.java.wordcount.WordCount</program-class>
</manifestEntries>
</archive>
- <includes>
-
<include>**/scala/relational/TPCHQuery10.class</include>
-
<include>**/scala/relational/TPCHQuery10$*.class</include>
- </includes>
- </configuration>
- </execution> -->
-
- <!-- TPC-H Query 3 -->
- <!--
- <execution>
- <id>TPCHQuery3</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
-
<classifier>TPCHQuery3</classifier>
- <archive>
-
<manifestEntries>
-
<program-class>org.apache.flink.examples.scala.relational.TPCHQuery3</program-class>
-
</manifestEntries>
- </archive>
<includes>
-
<include>**/scala/relational/TPCHQuery3.class</include>
-
<include>**/scala/relational/TPCHQuery3$*.class</include>
+
<include>**/java/wordcount/WordCount.class</include>
+
<include>**/java/wordcount/WordCount$*.class</include>
+
<include>**/java/wordcount/util/WordCountData.class</include>
</includes>
</configuration>
- </execution> -->
-
- <!-- WebLogAnalysis -->
+ </execution>
+
+ <!-- Distributed Copy -->
<execution>
- <id>WebLogAnalysis</id>
+ <id>DistCp</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
-
<classifier>WebLogAnalysis</classifier>
+
<classifier>DistCp</classifier>
<archive>
<manifestEntries>
-
<program-class>org.apache.flink.examples.scala.relational.WebLogAnalysis</program-class>
+
<program-class>org.apache.flink.examples.java.distcp.DistCp</program-class>
</manifestEntries>
</archive>
<includes>
-
<include>**/scala/relational/WebLogAnalysis.class</include>
-
<include>**/scala/relational/WebLogAnalysis$*.class</include>
-
<include>**/java/relational/util/WebLogData.class</include>
-
<include>**/java/relational/util/WebLogDataGenerator.class</include>
+
<include>**/java/distcp/*</include>
</includes>
</configuration>
</execution>
+ </executions>
+ </plugin>
- <!-- WordCount -->
+ <!--simplify the name of example JARs for
build-target/examples -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
<execution>
- <id>WordCount</id>
+ <id>rename</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>run</goal>
</goals>
- <configuration>
-
<classifier>WordCount</classifier>
-
- <archive>
-
<manifestEntries>
-
<program-class>org.apache.flink.examples.scala.wordcount.WordCount</program-class>
-
</manifestEntries>
- </archive>
-
- <includes>
-
<include>**/scala/wordcount/WordCount.class</include>
-
<include>**/scala/wordcount/WordCount$*.class</include>
-
<include>**/java/wordcount/util/WordCountData.class</include>
- </includes>
+ <configuration>
+ <target>
+ <copy
file="${project.basedir}/target/flink-examples-batch-${project.version}-KMeans.jar"
tofile="${project.basedir}/target/KMeans.jar" />
+ <copy
file="${project.basedir}/target/flink-examples-batch-${project.version}-ConnectedComponents.jar"
tofile="${project.basedir}/target/ConnectedComponents.jar" />
+ <copy
file="${project.basedir}/target/flink-examples-batch-${project.version}-EnumerateGraphTriangles.jar"
tofile="${project.basedir}/target/EnumerateGraphTriangles.jar" />
--- End diff --
Rename to `EnumTriangles.jar` to be in sync with class name.
> Restructure Maven Projects
> --------------------------
>
> Key: FLINK-1712
> URL: https://issues.apache.org/jira/browse/FLINK-1712
> Project: Flink
> Issue Type: Improvement
> Components: Build System
> Affects Versions: 0.9
> Reporter: Stephan Ewen
> Assignee: Robert Metzger
> Priority: Minor
>
> Project consolidation
> The new structure could be
> flink-core
> flink-java
> flink-scala
> flink-streaming-core
> flink-streaming-scala
> flink-runtime
> flink-runtime-web
> flink-optimizer
> flink-clients
> flink-shaded
> -> flink-shaded-hadoop
> -> flink-shaded-hadoop2
> -> flink-shaded-include-yarn-tests
> -> flink-shaded-curator
> flink-examples
> -> (have all examples, Scala and Java, Batch and Streaming)
> flink-batch-connectors
> -> flink-avro
> -> flink-jdbc
> -> flink-hadoop-compatibility
> -> flink-hbase
> -> flink-hcatalog
> flink-streaming-connectors
> -> flink-connector-twitter
> -> flink-streaming-examples
> -> flink-connector-flume
> -> flink-connector-kafka
> -> flink-connector-elasticsearch
> -> flink-connector-rabbitmq
> -> flink-connector-filesystem
> flink-libraries
> -> flink-gelly
> -> flink-gelly-scala
> -> flink-ml
> -> flink-table
> -> flink-python
> flink-scala-shell
> flink-test-utils
> flink-tests
> flink-fs-tests
> flink-contrib
> -> flink-storm-compatibility
> -> flink-storm-compatibility-examples
> -> flink-streaming-utils
> -> flink-tweet-inputformat
> -> flink-operator-stats
> -> flink-tez
> flink-quickstart
> -> flink-quickstart-java
> -> flink-quickstart-scala
> -> flink-tez-quickstart
> flink-yarn
> flink-yarn-tests
> flink-dist
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
