You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ve...@apache.org on 2013/11/13 03:02:39 UTC
[1/2] git commit: FALCON-159 Version API endpoint does not emit valid
JSON. Contributed by Srimanth Gunturi
Updated Branches:
refs/heads/master cd78c3aa5 -> 2703d52ca
FALCON-159 Version API endpoint does not emit valid JSON. Contributed by Srimanth Gunturi
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/51c6eb20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/51c6eb20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/51c6eb20
Branch: refs/heads/master
Commit: 51c6eb20353adf603280d0cf08bedf2686043150
Parents: cd78c3a
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Tue Nov 12 17:59:20 2013 -0800
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Tue Nov 12 17:59:20 2013 -0800
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../org/apache/falcon/client/FalconClient.java | 2 +-
docs/src/site/twiki/restapi/AdminVersion.twiki | 12 +++++++++--
.../falcon/resource/admin/AdminResource.java | 22 +++++++++++++++-----
.../falcon/resource/EntityManagerJerseyIT.java | 18 +++++++++++-----
5 files changed, 44 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/51c6eb20/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d86b98a..a54c3cd 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -78,6 +78,9 @@ Trunk (Unreleased)
IMPROVEMENTS
+ FALCON-159 Version API endpoint does not emit valid JSON
+ (Srimanth Gunturi via Venkatesh Seetharam)
+
FALCON-171 Provide status in /api/entities/list.
(Haohui Mai via Venkatesh Seetharam)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/51c6eb20/client/src/main/java/org/apache/falcon/client/FalconClient.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/client/FalconClient.java b/client/src/main/java/org/apache/falcon/client/FalconClient.java
index 9839745..f633db5 100644
--- a/client/src/main/java/org/apache/falcon/client/FalconClient.java
+++ b/client/src/main/java/org/apache/falcon/client/FalconClient.java
@@ -153,7 +153,7 @@ public class FalconClient {
protected static enum AdminOperations {
STACK("api/admin/stack", HttpMethod.GET, MediaType.TEXT_PLAIN),
- VERSION("api/admin/version", HttpMethod.GET, MediaType.TEXT_PLAIN);
+ VERSION("api/admin/version", HttpMethod.GET, MediaType.APPLICATION_JSON);
private String path;
private String method;
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/51c6eb20/docs/src/site/twiki/restapi/AdminVersion.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/restapi/AdminVersion.twiki b/docs/src/site/twiki/restapi/AdminVersion.twiki
index 48315ed..fbf1405 100644
--- a/docs/src/site/twiki/restapi/AdminVersion.twiki
+++ b/docs/src/site/twiki/restapi/AdminVersion.twiki
@@ -21,7 +21,15 @@ Remote-User: rgautam
---+++ Result
<verbatim>
{
- Version:"0.4-incubating-SNAPSHOT-rc0f2701549628f2f97746bd024518512c07d5442",
- Mode:"embedded"
+ "properties":[
+ {
+ "key":"Version",
+ "value":"0.4-incubating-SNAPSHOT-rb47788d1112fcf949c22a3860934167237b395b0"
+ },
+ {
+ "key":"Mode",
+ "value":"embedded"
+ }
+ ]
}
</verbatim>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/51c6eb20/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java b/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java
index 03a9149..41fb1c7 100644
--- a/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java
+++ b/prism/src/main/java/org/apache/falcon/resource/admin/AdminResource.java
@@ -64,15 +64,27 @@ public class AdminResource {
return builder.toString();
}
- private String version;
+ private PropertyList version;
@GET
@Path("version")
- @Produces({MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON})
- public String getVersion() {
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_JSON})
+ public PropertyList getVersion() {
if (version == null) {
- version = "{Version:\"" + BuildProperties.get().getProperty("build.version")
- + "\",Mode:\"" + DeploymentProperties.get().getProperty("deploy.mode") + "\"}";
+ List<Property> props = new ArrayList<Property>();
+
+ Property property = new Property();
+ property.key = "Version";
+ property.value = BuildProperties.get().getProperty("build.version");
+ props.add(property);
+
+ property = new Property();
+ property.key = "Mode";
+ property.value = DeploymentProperties.get().getProperty("deploy.mode");
+ props.add(property);
+
+ version = new PropertyList();
+ version.properties = props;
}
return version;
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/51c6eb20/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java b/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
index 3cebb60..767ff4b 100644
--- a/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
+++ b/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
+import java.util.regex.Pattern;
import javax.servlet.ServletInputStream;
import javax.ws.rs.core.MediaType;
@@ -345,11 +346,18 @@ public class EntityManagerJerseyIT {
response = context.service
.path("api/admin/version")
.header("Remote-User", TestContext.REMOTE_USER)
- .accept(MediaType.TEXT_PLAIN).get(ClientResponse.class);
- String status = response.getEntity(String.class);
- Assert.assertEquals(status, "{Version:\""
- + BuildProperties.get().getProperty("build.version") + "\",Mode:\""
- + DeploymentProperties.get().getProperty("deploy.mode") + "\"}");
+ .accept(MediaType.APPLICATION_JSON).get(ClientResponse.class);
+ String json = response.getEntity(String.class);
+ String buildVersion = BuildProperties.get().getProperty("build.version");
+ String deployMode = DeploymentProperties.get().getProperty("deploy.mode");
+ Assert.assertTrue(Pattern.matches(
+ ".*\\{\\s*\"key\"\\s*:\\s*\"Version\"\\s*,\\s*\"value\"\\s*:\\s*\""
+ + buildVersion + "\"\\s*}.*", json),
+ "No build.version found in /api/admin/version");
+ Assert.assertTrue(Pattern.matches(
+ ".*\\{\\s*\"key\"\\s*:\\s*\"Mode\"\\s*,\\s*\"value\"\\s*:\\s*\""
+ + deployMode + "\"\\s*}.*", json),
+ "No deploy.mode found in /api/admin/version");
}
@Test
[2/2] git commit: FALCON-188 hadoop-2 profile is not carried through
to oozie package. Contributed by Haohui Mai
Posted by ve...@apache.org.
FALCON-188 hadoop-2 profile is not carried through to oozie package. Contributed by Haohui Mai
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/2703d52c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/2703d52c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/2703d52c
Branch: refs/heads/master
Commit: 2703d52ca3291b9f99f9b4422ea5d7a418de84e0
Parents: 51c6eb2
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Tue Nov 12 18:02:17 2013 -0800
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Tue Nov 12 18:02:17 2013 -0800
----------------------------------------------------------------------
CHANGES.txt | 3 +
build-tools/src/bin/oozie-patch-pkg.sh | 3 +
.../src/patch/oozie-1551-hadoop-2-profile.patch | 63 ++++++++++++++++++++
build-tools/src/patch/oozie-4.0.0-falcon.patch | 12 ++--
src/bin/package.sh | 3 +
5 files changed, 78 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2703d52c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a54c3cd..26baa73 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -78,6 +78,9 @@ Trunk (Unreleased)
IMPROVEMENTS
+ FALCON-188 hadoop-2 profile is not carried through to
+ oozie package (Haohui Mai via Venkatesh Seetharam)
+
FALCON-159 Version API endpoint does not emit valid JSON
(Srimanth Gunturi via Venkatesh Seetharam)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2703d52c/build-tools/src/bin/oozie-patch-pkg.sh
----------------------------------------------------------------------
diff --git a/build-tools/src/bin/oozie-patch-pkg.sh b/build-tools/src/bin/oozie-patch-pkg.sh
index 5750ef4..8eacae5 100755
--- a/build-tools/src/bin/oozie-patch-pkg.sh
+++ b/build-tools/src/bin/oozie-patch-pkg.sh
@@ -31,7 +31,10 @@ curl -v "http://www.apache.org/dist/oozie/4.0.0/oozie-4.0.0.tar.gz" -o oozie-4.0
tar -xzvf oozie-4.0.0.tgz
cd oozie-4.0.0
pwd
+
+patch -p1 < ../../build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
patch -p0 < ../../build-tools/src/patch/oozie-4.0.0-falcon.patch
+
if [ -z "${MAVEN_HOME}" ]
then
export MVN_CMD=`which mvn`;
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2703d52c/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
----------------------------------------------------------------------
diff --git a/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch b/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
new file mode 100644
index 0000000..3a4d496
--- /dev/null
+++ b/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
@@ -0,0 +1,63 @@
+diff -urN oozie-4.0.0/hadooplibs/hadoop-2/pom.xml oozie-4.0.0-new/hadooplibs/hadoop-2/pom.xml
+--- oozie-4.0.0/hadooplibs/hadoop-2/pom.xml 2013-08-27 12:47:42.000000000 -0700
++++ oozie-4.0.0-new/hadooplibs/hadoop-2/pom.xml 2013-11-12 13:06:07.000000000 -0800
+@@ -27,7 +27,7 @@
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop</artifactId>
+- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0</version>
+ <description>Apache Oozie Hadoop ${project.version}</description>
+ <name>Apache Oozie Hadoop ${project.version}</name>
+ <packaging>jar</packaging>
+@@ -36,7 +36,7 @@
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+- <version>2.2.0-SNAPSHOT</version>
++ <version>2.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+diff -urN oozie-4.0.0/hadooplibs/hadoop-distcp-2/pom.xml oozie-4.0.0-new/hadooplibs/hadoop-distcp-2/pom.xml
+--- oozie-4.0.0/hadooplibs/hadoop-distcp-2/pom.xml 2013-08-27 12:47:42.000000000 -0700
++++ oozie-4.0.0-new/hadooplibs/hadoop-distcp-2/pom.xml 2013-11-12 13:06:19.000000000 -0800
+@@ -27,7 +27,7 @@
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-distcp</artifactId>
+- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0</version>
+ <description>Apache Oozie Hadoop Distcp ${project.version}</description>
+ <name>Apache Oozie Hadoop Distcp ${project.version}</name>
+ <packaging>jar</packaging>
+@@ -36,7 +36,7 @@
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+- <version>2.2.0-SNAPSHOT</version>
++ <version>2.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+diff -urN oozie-4.0.0/hadooplibs/hadoop-test-2/pom.xml oozie-4.0.0-new/hadooplibs/hadoop-test-2/pom.xml
+--- oozie-4.0.0/hadooplibs/hadoop-test-2/pom.xml 2013-08-27 12:47:42.000000000 -0700
++++ oozie-4.0.0-new/hadooplibs/hadoop-test-2/pom.xml 2013-11-12 13:06:30.000000000 -0800
+@@ -27,7 +27,7 @@
+ </parent>
+ <groupId>org.apache.oozie</groupId>
+ <artifactId>oozie-hadoop-test</artifactId>
+- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0</version>
+ <description>Apache Oozie Hadoop ${project.version} Test</description>
+ <name>Apache Oozie Hadoop ${project.version} Test</name>
+ <packaging>jar</packaging>
+@@ -36,7 +36,7 @@
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+- <version>2.2.0-SNAPSHOT</version>
++ <version>2.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2703d52c/build-tools/src/patch/oozie-4.0.0-falcon.patch
----------------------------------------------------------------------
diff --git a/build-tools/src/patch/oozie-4.0.0-falcon.patch b/build-tools/src/patch/oozie-4.0.0-falcon.patch
index 131b7fe..e5632f7 100644
--- a/build-tools/src/patch/oozie-4.0.0-falcon.patch
+++ b/build-tools/src/patch/oozie-4.0.0-falcon.patch
@@ -31,8 +31,8 @@ Index: hadooplibs/hadoop-test-2/pom.xml
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop-test</artifactId>
-- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
-+ <version>2.2.0-SNAPSHOT.oozie-4.0.0-falcon</version>
+- <version>2.2.0.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0-falcon</version>
<description>Apache Oozie Hadoop ${project.version} Test</description>
<name>Apache Oozie Hadoop ${project.version} Test</name>
<packaging>jar</packaging>
@@ -107,8 +107,8 @@ Index: hadooplibs/hadoop-2/pom.xml
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop</artifactId>
-- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
-+ <version>2.2.0-SNAPSHOT.oozie-4.0.0-falcon</version>
+- <version>2.2.0.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0-falcon</version>
<description>Apache Oozie Hadoop ${project.version}</description>
<name>Apache Oozie Hadoop ${project.version}</name>
<packaging>jar</packaging>
@@ -201,8 +201,8 @@ Index: hadooplibs/hadoop-distcp-2/pom.xml
</parent>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop-distcp</artifactId>
-- <version>2.2.0-SNAPSHOT.oozie-4.0.0</version>
-+ <version>2.2.0-SNAPSHOT.oozie-4.0.0-falcon</version>
+- <version>2.2.0.oozie-4.0.0</version>
++ <version>2.2.0.oozie-4.0.0-falcon</version>
<description>Apache Oozie Hadoop Distcp ${project.version}</description>
<name>Apache Oozie Hadoop Distcp ${project.version}</name>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2703d52c/src/bin/package.sh
----------------------------------------------------------------------
diff --git a/src/bin/package.sh b/src/bin/package.sh
index 417e7e6..0946e9a 100755
--- a/src/bin/package.sh
+++ b/src/bin/package.sh
@@ -54,9 +54,12 @@ curl "http://www.apache.org/dist/oozie/4.0.0/oozie-4.0.0.tar.gz" -o oozie-4.0.0.
tar -xzvf oozie-4.0.0.tgz 2> /dev/null
rm oozie-4.0.0.tgz
cd oozie-4.0.0
+
echo "Patching oozie with falcon extensions and marking version as 4.0.0 ..."
+patch -p0 < ${FALCON_SRC}/build-tools/src/patch/oozie-1551-hadoop-2-profile.patch
patch -p0 < ${FALCON_SRC}/build-tools/src/patch/oozie-4.0.0-falcon.patch
patch -p0 < ${FALCON_SRC}/build-tools/src/patch/oozie-bundle-el-extension.patch
+
echo "Building oozie & creating tar ball ..."
bin/mkdistro.sh -DskipTests > /dev/null