hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shiv...@apache.org
Subject incubator-hawq git commit: HAWQ-683. Support for aggregate javadoc
Date Wed, 20 Apr 2016 22:16:49 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/HAWQ-683 cb2d98042 -> d6b5150bc


HAWQ-683. Support for aggregate javadoc


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/d6b5150b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/d6b5150b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/d6b5150b

Branch: refs/heads/HAWQ-683
Commit: d6b5150bcb49e1bcd8da6c3e22a984e3c463d4dd
Parents: cb2d980
Author: Shivram Mani <shivram.mani@gmail.com>
Authored: Wed Apr 20 15:16:37 2016 -0700
Committer: Shivram Mani <shivram.mani@gmail.com>
Committed: Wed Apr 20 15:16:37 2016 -0700

----------------------------------------------------------------------
 pxf/Makefile                                    |  3 +++
 pxf/build.gradle                                |  5 +++++
 pxf/pxf-api/src/main/javadoc/overview.html      |  9 --------
 .../pxf/service/MetadataResponseFormatter.java  |  1 +
 .../apache/hawq/pxf/service/package-info.java   | 23 ++++++++++++++++++++
 5 files changed, 32 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/d6b5150b/pxf/Makefile
----------------------------------------------------------------------
diff --git a/pxf/Makefile b/pxf/Makefile
index 9f71478..107a900 100644
--- a/pxf/Makefile
+++ b/pxf/Makefile
@@ -39,6 +39,7 @@ help:
 	@echo	"  -  -  VENDOR=<vendor name> - add vendor name to created RPMs"
 	@echo	"  - tomcat - builds tomcat rpm from downloaded tarball"
 	@echo	"  -  -  LICENSE and VENDOR parameters can be used as well"
+	@echo	"  - doc - creates aggregate javadoc under docs"
 
 all: 
 	./gradlew clean release $(BUILD_PARAMS)
@@ -62,3 +63,5 @@ clean:
 tomcat:
 	./gradlew tomcatRpm $(BUILD_PARAMS)
 
+doc:
+    ./gradlew aggregateJavadoc

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/d6b5150b/pxf/build.gradle
----------------------------------------------------------------------
diff --git a/pxf/build.gradle b/pxf/build.gradle
index ed7b9f0..3f3d31c 100644
--- a/pxf/build.gradle
+++ b/pxf/build.gradle
@@ -37,6 +37,7 @@ buildscript {
     dependencies {
         classpath "com.netflix.nebula:gradle-ospackage-plugin:2.2.6"
         classpath "de.undercouch:gradle-download-task:2.1.0"
+        classpath 'com.netflix.nebula:gradle-aggregate-javadocs-plugin:2.2.+'
     }   
 }
 
@@ -465,3 +466,7 @@ task tomcatRpm(type: Rpm) {
 }
 
 tomcatRpm.dependsOn tomcatGet
+
+
+buildDir = '.'
+apply plugin: 'nebula-aggregate-javadocs'
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/d6b5150b/pxf/pxf-api/src/main/javadoc/overview.html
----------------------------------------------------------------------
diff --git a/pxf/pxf-api/src/main/javadoc/overview.html b/pxf/pxf-api/src/main/javadoc/overview.html
deleted file mode 100644
index 7b8a086..0000000
--- a/pxf/pxf-api/src/main/javadoc/overview.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-    <TITLE>PXF</TITLE>
-</HEAD>
-<BODY>
-This is the API specification of PXF.
-</BODY>
-</HTML>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/d6b5150b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/MetadataResponseFormatter.java
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/MetadataResponseFormatter.java
b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/MetadataResponseFormatter.java
index 92d11de..55a6da5 100644
--- a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/MetadataResponseFormatter.java
+++ b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/MetadataResponseFormatter.java
@@ -42,6 +42,7 @@ public class MetadataResponseFormatter {
      * Converts list of {@link Metadata} to JSON String format.
      *
      * @param metadataList list of metadata objects to convert
+     * @param path path string
      * @return JSON formatted response
      * @throws IOException if converting the data to JSON fails
      */

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/d6b5150b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/package-info.java
----------------------------------------------------------------------
diff --git a/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/package-info.java b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/package-info.java
new file mode 100644
index 0000000..7084f86
--- /dev/null
+++ b/pxf/pxf-service/src/main/java/org/apache/hawq/pxf/service/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Provides PXF Rest API resources.
+ */
+package org.apache.hawq.pxf.service;
\ No newline at end of file


Mime
View raw message