This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 59f7748d48e4c70d62ece3d70b2f99b0d85ecf7b Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 11 17:03:46 2014 +0100 configure webmotion to not filter on webjars path --- coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 6 ++++++ coselmar-rest/src/main/resources/mapping | 2 ++ coselmar-ui/src/main/webapp/index.html | 8 ++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/coselmar-bundle/src/main/webapp/WEB-INF/web.xml b/coselmar-bundle/src/main/webapp/WEB-INF/web.xml index 1ef6982..02952d9 100644 --- a/coselmar-bundle/src/main/webapp/WEB-INF/web.xml +++ b/coselmar-bundle/src/main/webapp/WEB-INF/web.xml @@ -43,4 +43,10 @@ <filter-name>topiaTransaction</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> + + <context-param> + <param-name>wm.exclude.paths</param-name> + <param-value>/webjars</param-value> +</context-param> + </web-app> \ No newline at end of file diff --git a/coselmar-rest/src/main/resources/mapping b/coselmar-rest/src/main/resources/mapping index 5f30c59..a43119f 100644 --- a/coselmar-rest/src/main/resources/mapping +++ b/coselmar-rest/src/main/resources/mapping @@ -21,6 +21,8 @@ default.render=fr.ifremer.coselmar.services.CoselmarRender [actions] +GET / redirect:index.html + # DocApi GET /v1/doc DocApi.showMapping diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index 4a303d1..7a9a43e 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -37,10 +37,10 @@ <script src="nuiton-js/bootstrap.js"></script> <!--TODO ymartel 20141203 : extract version, or use wro --> - <script src="https://cdn.jsdelivr.net/webjars/angular-ui-select/0.9.0/select.js"></script> - <link rel="stylesheet" href="https://cdn.jsdelivr.net/webjars/angular-ui-select/0.9.0/select.css"> - <script src="https://cdn.jsdelivr.net/webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap.js"></script> - <script src="https://cdn.jsdelivr.net/webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.js"></script> + <script src="webjars/angular-ui-select/0.9.0/select.js"></script> + <link rel="stylesheet" href="webjars/angular-ui-select/0.9.0/select.css"> + <script src="webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap.js"></script> + <script src="webjars/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.js"></script> <script src="js/angular-jwt.js"></script> <script src="js/coselmar.js"></script> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.