You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2012/12/03 19:25:18 UTC

svn commit: r1416620 - in /oozie/trunk: core/pom.xml core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java core/src/main/resources/oozie-default.xml pom.xml release-log.txt webapp/pom.xml

Author: virag
Date: Mon Dec  3 18:25:16 2012
New Revision: 1416620

URL: http://svn.apache.org/viewvc?rev=1416620&view=rev
Log:
OOZIE-1100 HFTP coordinator input check fails due to missing commons-httpclient.jar (ryota via virag)

Modified:
    oozie/trunk/core/pom.xml
    oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
    oozie/trunk/core/src/main/resources/oozie-default.xml
    oozie/trunk/pom.xml
    oozie/trunk/release-log.txt
    oozie/trunk/webapp/pom.xml

Modified: oozie/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/core/pom.xml?rev=1416620&r1=1416619&r2=1416620&view=diff
==============================================================================
--- oozie/trunk/core/pom.xml (original)
+++ oozie/trunk/core/pom.xml Mon Dec  3 18:25:16 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/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java?rev=1416620&r1=1416619&r2=1416620&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java Mon Dec  3 18:25:16 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.
@@ -125,7 +125,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/trunk/core/src/main/resources/oozie-default.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/resources/oozie-default.xml?rev=1416620&r1=1416619&r2=1416620&view=diff
==============================================================================
--- oozie/trunk/core/src/main/resources/oozie-default.xml (original)
+++ oozie/trunk/core/src/main/resources/oozie-default.xml Mon Dec  3 18:25:16 2012
@@ -1657,7 +1657,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/trunk/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/pom.xml?rev=1416620&r1=1416619&r2=1416620&view=diff
==============================================================================
--- oozie/trunk/pom.xml (original)
+++ oozie/trunk/pom.xml Mon Dec  3 18:25:16 2012
@@ -636,7 +636,7 @@
             <dependency>
                 <groupId>commons-httpclient</groupId>
                 <artifactId>commons-httpclient</artifactId>
-                <version>3.0.1</version>
+                <version>3.1</version>
             </dependency>
 
             <dependency>

Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1416620&r1=1416619&r2=1416620&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Dec  3 18:25:16 2012
@@ -53,6 +53,7 @@ OOZIE-944 Implement Workflow Generator U
 
 -- Oozie 3.3.0 release (unreleased)
 
+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/trunk/webapp/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/webapp/pom.xml?rev=1416620&r1=1416619&r2=1416620&view=diff
==============================================================================
--- oozie/trunk/webapp/pom.xml (original)
+++ oozie/trunk/webapp/pom.xml Mon Dec  3 18:25:16 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>