You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/08/02 20:19:42 UTC
incubator-quarks git commit: Quarks-205 fix gradle broken javadoc
doc-files links
Repository: incubator-quarks
Updated Branches:
refs/heads/master 3f89af516 -> fc575465b
Quarks-205 fix gradle broken javadoc doc-files links
- Explicitly pickup doc-files files to fix topology/package-info:"Edgent
Source Streams" link and analytics/sensors/Filters:"Deadband example"
link
- cleanup two javadoc warnings/errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/fc575465
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/fc575465
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/fc575465
Branch: refs/heads/master
Commit: fc575465b66cc268f2e06b0dc4b4f31e87d1e2ac
Parents: 3f89af5
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Aug 2 15:30:01 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Aug 2 15:30:01 2016 -0400
----------------------------------------------------------------------
.../apache/edgent/execution/services/RuntimeServices.java | 1 -
build.gradle | 10 ++++++++++
.../edgent/connectors/command/runtime/CommandReader.java | 4 ++--
3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/fc575465/api/execution/src/main/java/org/apache/edgent/execution/services/RuntimeServices.java
----------------------------------------------------------------------
diff --git a/api/execution/src/main/java/org/apache/edgent/execution/services/RuntimeServices.java b/api/execution/src/main/java/org/apache/edgent/execution/services/RuntimeServices.java
index b5d2c39..0e51704 100644
--- a/api/execution/src/main/java/org/apache/edgent/execution/services/RuntimeServices.java
+++ b/api/execution/src/main/java/org/apache/edgent/execution/services/RuntimeServices.java
@@ -43,7 +43,6 @@ package org.apache.edgent.execution.services;
* }
* </code>
* </pre>
- * </P>
*
*/
public interface RuntimeServices {
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/fc575465/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 7a98394..21b6726 100644
--- a/build.gradle
+++ b/build.gradle
@@ -181,6 +181,16 @@ task aggregateJavadoc(type: Javadoc) {
classpath = files(subprojects.collect
{ project -> project.sourceSets.main.compileClasspath }
)
+
+ // doc-files aren't picked up automatically so get them now.
+ doLast {
+ copy {
+ from subprojects.collect { project -> project.sourceSets.main.java.srcDirs }
+ include '**/doc-files/**'
+ includeEmptyDirs = false
+ into "$rootProject.ext.target_javadoc_dir"
+ }
+ }
}
build.dependsOn aggregateJavadoc
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/fc575465/connectors/command/src/main/java/org/apache/edgent/connectors/command/runtime/CommandReader.java
----------------------------------------------------------------------
diff --git a/connectors/command/src/main/java/org/apache/edgent/connectors/command/runtime/CommandReader.java b/connectors/command/src/main/java/org/apache/edgent/connectors/command/runtime/CommandReader.java
index 44b2004..ec2bc31 100644
--- a/connectors/command/src/main/java/org/apache/edgent/connectors/command/runtime/CommandReader.java
+++ b/connectors/command/src/main/java/org/apache/edgent/connectors/command/runtime/CommandReader.java
@@ -30,8 +30,8 @@ import org.apache.edgent.function.Supplier;
* and restart it upon process termination/error if so configured.
* </P>
* <P>
- * The iterator returned by {@link Iterable#iterator()) returns
- * {@hasNext()==true} until a read from {@link Process#getOutputStream()}
+ * The iterator returned by {@link Iterable#iterator()} returns
+ * {@code hasNext()==true} until a read from {@link Process#getOutputStream()}
* returns EOF or an IOError.
*/
public class CommandReader extends CommandConnector implements Supplier<Iterable<String>>, AutoCloseable {