Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 1593 - Flow Statistics manager is updating store with incorrect key Statis...
[controller.git]
/
opendaylight
/
md-sal
/
sal-rest-docgen
/
src
/
main
/
resources
/
WEB-INF
/
web.xml
diff --git
a/opendaylight/md-sal/sal-rest-docgen/src/main/resources/WEB-INF/web.xml
b/opendaylight/md-sal/sal-rest-docgen/src/main/resources/WEB-INF/web.xml
index 356a395b97ba81200dc59ad9fc40adeb4a864c94..c470b3237ea7fe2dd69f37254cae4b38439c8861 100644
(file)
--- a/
opendaylight/md-sal/sal-rest-docgen/src/main/resources/WEB-INF/web.xml
+++ b/
opendaylight/md-sal/sal-rest-docgen/src/main/resources/WEB-INF/web.xml
@@
-2,7
+2,9
@@
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
-
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
<servlet>
<servlet-name>JAXRSApiDoc</servlet-name>
<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
<servlet>
<servlet-name>JAXRSApiDoc</servlet-name>
<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
@@
-31,7
+33,7
@@
</init-param>
<init-param>
<param-name>cors.allowed.headers</param-name>
</init-param>
<init-param>
<param-name>cors.allowed.headers</param-name>
- <param-value>Content-Type,X-Requested-With,accept,authorization,
+ <param-value>Content-Type,X-Requested-With,accept,authorization,
origin,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
</init-param>
<init-param>
origin,Origin,Access-Control-Request-Method,Access-Control-Request-Headers</param-value>
</init-param>
<init-param>