You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2017/03/02 01:25:14 UTC
[1/2] beam git commit: Update javadoc ant to include runners/ and
exclude modules with a wildcard
Repository: beam
Updated Branches:
refs/heads/master bc1a301b0 -> 7d22dbcab
Update javadoc ant to include runners/ and exclude modules with a wildcard
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/71a3fd76
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/71a3fd76
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/71a3fd76
Branch: refs/heads/master
Commit: 71a3fd769ff4622df07633b5e7b27b5c309de29e
Parents: bc1a301
Author: Ahmet Altay <al...@google.com>
Authored: Wed Mar 1 16:04:49 2017 -0800
Committer: Ahmet Altay <al...@google.com>
Committed: Wed Mar 1 17:08:30 2017 -0800
----------------------------------------------------------------------
sdks/java/javadoc/ant.xml | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/71a3fd76/sdks/java/javadoc/ant.xml
----------------------------------------------------------------------
diff --git a/sdks/java/javadoc/ant.xml b/sdks/java/javadoc/ant.xml
index 48b8913..80dbdc2 100644
--- a/sdks/java/javadoc/ant.xml
+++ b/sdks/java/javadoc/ant.xml
@@ -35,6 +35,16 @@
results in one Java source tree. -->
<mapper type="regexp" from="^.*/src/main/java/(.*)$$" to="\1"/>
</copy>
+
+ <copy todir="${collect.dir}">
+ <fileset dir="../../../runners">
+ <include name="**/src/main/java/**/*.java"/>
+ </fileset>
+ <!-- For each pathname, turn X/src/main/java/Y to Y. This
+ results in one Java source tree. -->
+ <mapper type="regexp" from="^.*/src/main/java/(.*)$$" to="\1"/>
+ </copy>
+
<!-- Run javadoc. -->
<javadoc sourcepath="${collect.dir}"
destdir="${output.dir}"
@@ -70,20 +80,15 @@
<link href="http://junit.sourceforge.net/javadoc/"
offline="true" packageListLoc="junit-docs"/>
- <excludepackage name="org.apache.beam.examples"/>
- <excludepackage name="org.apache.beam.examples.common"/>
- <excludepackage name="org.apache.beam.examples.cookbook"/>
- <excludepackage name="org.apache.beam.examples.complete"/>
- <excludepackage name="org.apache.beam.examples.complete.game"/>
- <excludepackage name="org.apache.beam.examples.complete.game.injector"/>
- <excludepackage name="org.apache.beam.examples.complete.game.utils"/>
- <excludepackage name="org.apache.beam.runners.apex.translation"/>
- <excludepackage name="org.apache.beam.runners.dataflow.internal"/>
- <excludepackage name="org.apache.beam.runners.flink.examples"/>
- <excludepackage name="org.apache.beam.runners.flink.translation"/>
- <excludepackage name="org.apache.beam.runners.spark.examples"/>
- <excludepackage name="org.apache.beam.runners.spark.translation"/>
- <excludepackage name="org.openjdk.jmh.infra.generated"/>
+ <excludepackage name="org.apache.beam.examples.*"/>
+ <excludepackage name="org.apache.beam.fn.*"/>
+ <excludepackage name="org.apache.beam.runners.apex.translation.*"/>
+ <excludepackage name="org.apache.beam.runners.core.*"/>
+ <excludepackage name="org.apache.beam.runners.dataflow.internal.*"/>
+ <excludepackage name="org.apache.beam.runners.flink.examples.*"/>
+ <excludepackage name="org.apache.beam.runners.flink.translation.*"/>
+ <excludepackage name="org.apache.beam.runners.spark.examples.*"/>
+ <excludepackage name="org.apache.beam.runners.spark.translation.*"/>
</javadoc>
<!-- make a jar file to push to central -->
<jar destfile="${output.jar}" basedir="${output.dir}"/>
[2/2] beam git commit: This closes #2137
Posted by al...@apache.org.
This closes #2137
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/7d22dbca
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/7d22dbca
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/7d22dbca
Branch: refs/heads/master
Commit: 7d22dbcabacd456eccedb0e68b5a019571c76108
Parents: bc1a301 71a3fd7
Author: Ahmet Altay <al...@google.com>
Authored: Wed Mar 1 17:08:40 2017 -0800
Committer: Ahmet Altay <al...@google.com>
Committed: Wed Mar 1 17:08:40 2017 -0800
----------------------------------------------------------------------
sdks/java/javadoc/ant.xml | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------