FALCON-2283 Issue with jersey multi part with mime type 1.6 version Author: sandeep <[email protected]>
Reviewers: @ajayyadava Closes #367 from sandeepSamudrala/FALCON-2283 and squashes the following commits: 43544bc [sandeep] FALCON-2283 Issue with jersey multi part with mime type 1.6 version 0780363 [sandeep] Merge branch 'master' of https://github.com/apache/falcon a3bd0e9 [sandeep] Merge branch 'master' of https://github.com/apache/falcon db425c5 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 3f67fed [sandeep] Merge branch 'master' of https://github.com/apache/falcon cb2b00d [sandeep] Merge branch 'master' of https://github.com/apache/falcon 79e8d64 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 7de7798 [sandeep] go -b FALCON-2263Merge branch 'master' of https://github.com/apache/falcon c5da0a2 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 7e16263 [sandeep] Merge branch 'master' of https://github.com/apache/falcon a234d94 [sandeep] FALCON-2231 Incoporated review comments and small fixes for duplicate submission and colo addition to schedule command 26e3350 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 73fbf75 [sandeep] Merge branch 'master' of https://github.com/apache/falcon cc28658 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 089b10d [sandeep] Merge branch 'master' of https://github.com/apache/falcon 456d4ee [sandeep] Merge branch 'master' of https://github.com/apache/falcon 0cf9af6 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 4a2e23e [sandeep] Merge branch 'master' of https://github.com/apache/falcon b1546ed [sandeep] Merge branch 'master' of https://github.com/apache/falcon 0a433fb [sandeep] Merge branch 'master' of https://github.com/apache/falcon 194f36a [sandeep] Merge branch 'master' of https://github.com/apache/falcon e0ad358 [sandeep] Merge branch 'master' of https://github.com/apache/falcon f96a084 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 9cf36e9 [sandeep] Merge branch 'master' of https://github.com/apache/falcon bbca081 [sandeep] Merge branch 'master' of https://github.com/apache/falcon 48f6afa [sandeep] Merge branch 'master' of https://github.com/apache/falcon 250cc46 [sandeep] Merge branch 'master' of https://github.com/apache/falcon d0393e9 [sandeep] Merge branch 'master' of https://github.com/apache/falcon a178805 [sandeep] Merge branch 'master' of https://github.com/apache/falcon d6dc8bf [sandeep] Merge branch 'master' of https://github.com/apache/falcon 1bb8d3c [sandeep] Merge branch 'master' of https://github.com/apache/falcon c065566 [sandeep] reverting last line changes made 1a4dcd2 [sandeep] rebased and resolved the conflicts from master 271318b [sandeep] FALCON-2097. Adding UT to the new method for getting next instance time with Delay. a94d4fe [sandeep] rebasing from master 9e68a57 [sandeep] FALCON-298. Feed update with replication delay creates holes (cherry picked from commit 25f423ce9982e702fde614411dce91ac4bcecb89) Signed-off-by: Pallavi Rao <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/06f5fa5b Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/06f5fa5b Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/06f5fa5b Branch: refs/heads/master Commit: 06f5fa5bef16145418780b30ff2a7cb8a8e5eb1b Parents: 3a78efe Author: sandeep <[email protected]> Authored: Mon Feb 20 10:46:01 2017 +0530 Committer: Pallavi Rao <[email protected]> Committed: Mon Feb 20 10:46:17 2017 +0530 ---------------------------------------------------------------------- client/pom.xml | 5 +++++ .../main/java/org/apache/falcon/ExtensionHandler.java | 2 ++ pom.xml | 12 ++++++++++++ prism/pom.xml | 5 +++++ 4 files changed, 24 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/06f5fa5b/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 53a71ef..85905aa 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -87,6 +87,11 @@ </dependency> <dependency> + <groupId>org.jvnet.mimepull</groupId> + <artifactId>mimepull</artifactId> + </dependency> + + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/falcon/blob/06f5fa5b/client/src/main/java/org/apache/falcon/ExtensionHandler.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/falcon/ExtensionHandler.java b/client/src/main/java/org/apache/falcon/ExtensionHandler.java index 7d63d11..e17f8e6 100644 --- a/client/src/main/java/org/apache/falcon/ExtensionHandler.java +++ b/client/src/main/java/org/apache/falcon/ExtensionHandler.java @@ -27,6 +27,7 @@ import org.apache.falcon.extensions.ExtensionBuilder; import org.apache.falcon.hadoop.HadoopClientFactory; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.util.StringUtils; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.slf4j.Logger; @@ -110,6 +111,7 @@ public final class ExtensionHandler { public static List<Entity> prepare(String extensionName, String jobName, InputStream configStream, List<URL> urls) throws IOException, FalconException { ClassLoader extensionClassLoader = ExtensionClassLoader.load(urls); + LOG.debug("Urls loaded:" + StringUtils.join(", ", urls)); if (extensionClassLoader.getResourceAsStream(EXTENSION_BUILDER_INTERFACE_SERVICE_FILE) == null) { throw new FalconCLIException("The extension build time jars do not contain " + EXTENSION_BUILDER_INTERFACE_SERVICE_FILE); http://git-wip-us.apache.org/repos/asf/falcon/blob/06f5fa5b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 95a101b..0bfeea4 100644 --- a/pom.xml +++ b/pom.xml @@ -702,6 +702,18 @@ <groupId>com.sun.jersey.contribs</groupId> <artifactId>jersey-multipart</artifactId> <version>${jersey.version}</version> + <exclusions> + <exclusion> + <groupId>org.jvnet</groupId> + <artifactId>mimepull</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jvnet.mimepull</groupId> + <artifactId>mimepull</artifactId> + <version>1.9</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/falcon/blob/06f5fa5b/prism/pom.xml ---------------------------------------------------------------------- diff --git a/prism/pom.xml b/prism/pom.xml index 57cdfe7..1735332 100644 --- a/prism/pom.xml +++ b/prism/pom.xml @@ -129,6 +129,11 @@ </dependency> <dependency> + <groupId>org.jvnet.mimepull</groupId> + <artifactId>mimepull</artifactId> + </dependency> + + <dependency> <groupId>com.googlecode.json-simple</groupId> <artifactId>json-simple</artifactId> </dependency>
