Author: virag
Date: Mon Dec 3 18:28:11 2012
New Revision: 1416626
URL: http://svn.apache.org/viewvc?rev=1416626&view=rev
Log:
OOZIE-1100 HFTP coordinator input check fails due to missing
commons-httpclient.jar (ryota via virag)
Modified:
oozie/branches/branch-3.3/core/pom.xml
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
oozie/branches/branch-3.3/core/src/main/resources/oozie-default.xml
oozie/branches/branch-3.3/pom.xml
oozie/branches/branch-3.3/release-log.txt
oozie/branches/branch-3.3/webapp/pom.xml
Modified: oozie/branches/branch-3.3/core/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/pom.xml?rev=1416626&r1=1416625&r2=1416626&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/pom.xml (original)
+++ oozie/branches/branch-3.3/core/pom.xml Mon Dec 3 18:28:11 2012
@@ -162,6 +162,12 @@
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
<!--
Oozie web-app module must exclude it.
-->
Modified:
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java?rev=1416626&r1=1416625&r2=1416626&view=diff
==============================================================================
---
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
(original)
+++
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
Mon Dec 3 18:28:11 2012
@@ -6,9 +6,9 @@
* 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.
@@ -123,7 +123,7 @@ public class HadoopAccessorService imple
preLoadActionConfigs(conf);
supportedSchemes = new HashSet<String>();
- String[] schemesFromConf = conf.getStrings(SUPPORTED_FILESYSTEMS, new
String[]{"hdfs"});
+ String[] schemesFromConf = conf.getStrings(SUPPORTED_FILESYSTEMS, new
String[]{"hdfs","hftp","webhdfs"});
if(schemesFromConf != null) {
for (String scheme: schemesFromConf) {
scheme = scheme.trim();
Modified: oozie/branches/branch-3.3/core/src/main/resources/oozie-default.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/main/resources/oozie-default.xml?rev=1416626&r1=1416625&r2=1416626&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/main/resources/oozie-default.xml
(original)
+++ oozie/branches/branch-3.3/core/src/main/resources/oozie-default.xml Mon Dec
3 18:28:11 2012
@@ -1643,7 +1643,7 @@
<property>
<name>oozie.service.HadoopAccessorService.supported.filesystems</name>
- <value>hdfs</value>
+ <value>hdfs,hftp,webhdfs</value>
<description>
Enlist the different filesystems supported for
federation. If wildcard "*" is specified,
then ALL file schemes will be allowed.
Modified: oozie/branches/branch-3.3/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/pom.xml?rev=1416626&r1=1416625&r2=1416626&view=diff
==============================================================================
--- oozie/branches/branch-3.3/pom.xml (original)
+++ oozie/branches/branch-3.3/pom.xml Mon Dec 3 18:28:11 2012
@@ -630,7 +630,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
+ <version>3.1</version>
</dependency>
<dependency>
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1416626&r1=1416625&r2=1416626&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Dec 3 18:28:11 2012
@@ -1,5 +1,6 @@
-- Oozie 3.3.0 release
+OOZIE-1100 HFTP coordinator input check fails due to missing
commons-httpclient.jar (ryota via virag)
OOZIE-1065 bundle status does not transit after rerun (virag)
OOZIE-1064 Status value of coordinator job not reflected in bundle action and
invalid transition of coordinator job (virag)
OOZIE-1089 DistributedCache workaround for Hadoop 2.0.2-alpha (tucu)
Modified: oozie/branches/branch-3.3/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/webapp/pom.xml?rev=1416626&r1=1416625&r2=1416626&view=diff
==============================================================================
--- oozie/branches/branch-3.3/webapp/pom.xml (original)
+++ oozie/branches/branch-3.3/webapp/pom.xml Mon Dec 3 18:28:11 2012
@@ -42,10 +42,6 @@
<artifactId>commons-cli</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
</exclusion>
