Author: tucu
Date: Mon Mar 12 22:56:58 2012
New Revision: 1299920
URL: http://svn.apache.org/viewvc?rev=1299920&view=rev
Log:
OOZIE-274 move callback HTTP endpoint outside of the versioned WS endpoints
(tucu)
Modified:
incubator/oozie/trunk/core/src/main/resources/oozie-default.xml
incubator/oozie/trunk/release-log.txt
incubator/oozie/trunk/webapp/src/main/webapp/WEB-INF/web.xml
Modified: incubator/oozie/trunk/core/src/main/resources/oozie-default.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/resources/oozie-default.xml?rev=1299920&r1=1299919&r2=1299920&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/resources/oozie-default.xml (original)
+++ incubator/oozie/trunk/core/src/main/resources/oozie-default.xml Mon Mar 12
22:56:58 2012
@@ -1120,7 +1120,7 @@
<property>
<name>oozie.service.CallbackService.base.url</name>
- <value>${oozie.base.url}/v0/callback</value>
+ <value>${oozie.base.url}/callback</value>
<description>
Base callback URL used by ActionExecutors.
</description>
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1299920&r1=1299919&r2=1299920&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Mon Mar 12 22:56:58 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-274 move callback HTTP endpoint outside of the versioned WS endpoints
(tucu)
OOZIE-755 remove hadoop.job.ugi and kerberos principal hardcoded injections
(tucu)
OOZIE-754 remove use of group from HadoopAccessor (tucu)
OOZIE-752 if group.name/oozie.job.acl is not defined in job.properties job
submission fails (tucu)
Modified: incubator/oozie/trunk/webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/webapp/src/main/webapp/WEB-INF/web.xml?rev=1299920&r1=1299919&r2=1299920&view=diff
==============================================================================
--- incubator/oozie/trunk/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/oozie/trunk/webapp/src/main/webapp/WEB-INF/web.xml Mon Mar 12
22:56:58 2012
@@ -108,12 +108,7 @@
<servlet-mapping>
<servlet-name>callback</servlet-name>
- <url-pattern>/v0/callback/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>callback</servlet-name>
- <url-pattern>/v1/callback/*</url-pattern>
+ <url-pattern>/callback/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
@@ -168,32 +163,12 @@
<filter-mapping>
<filter-name>authenticationfilter</filter-name>
- <url-pattern>/v0/admin/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/v1/admin/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/v0/jobs</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/v1/jobs</url-pattern>
+ <url-pattern>/v0/*</url-pattern>
</filter-mapping>
<filter-mapping>
<filter-name>authenticationfilter</filter-name>
- <url-pattern>/v0/job/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
- <filter-name>authenticationfilter</filter-name>
- <url-pattern>/v1/job/*</url-pattern>
+ <url-pattern>/v1/*</url-pattern>
</filter-mapping>
<filter-mapping>
