From 5cab5523cdf47e809f86514b113db9efc946d4cf Mon Sep 17 00:00:00 2001 From: Gabriel Landais <glandais@kereval.com> Date: Fri, 30 Mar 2012 15:34:36 +0000 Subject: [PATCH] Auto login git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@27145 356b4b1a-1d2b-0410-8bf1-ffa24008f01e --- gazelle-proxy-war/src/main/webapp/layout/template.xhtml | 1 + pom.xml | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gazelle-proxy-war/src/main/webapp/layout/template.xhtml b/gazelle-proxy-war/src/main/webapp/layout/template.xhtml index 97480f98..a7c0840e 100644 --- a/gazelle-proxy-war/src/main/webapp/layout/template.xhtml +++ b/gazelle-proxy-war/src/main/webapp/layout/template.xhtml @@ -17,6 +17,7 @@ </head> <body> <ui:include src="/ajaxStatus.xhtml" /> + <ui:include src="/autoLogin.xhtml" /> <ui:include src="menu.xhtml"> <ui:param name="projectName" diff --git a/pom.xml b/pom.xml index 6d80298a..a794a886 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> <groupId>net.ihe.gazelle.maven</groupId> <artifactId>gazelle-seam</artifactId> - <version>1.48</version> + <version>1.49</version> </parent> + <modelVersion>4.0.0</modelVersion> <groupId>net.ihe.gazelle.proxy</groupId> <artifactId>gazelle-proxy</artifactId> <packaging>pom</packaging> @@ -23,7 +23,6 @@ <jdbc.driver.class>org.postgresql.Driver</jdbc.driver.class> <hibernate.dialect>org.hibernate.dialect.PostgreSQLDialect</hibernate.dialect> <build.year>2012</build.year> - <version.datatable>1.16</version.datatable> <messages.mode>crowdin</messages.mode> </properties> @@ -78,7 +77,7 @@ <activeByDefault>true</activeByDefault> </activation> <properties> - <cas.service>http://127.0.0.1:8080/proxy/</cas.service> + <cas.service>http://bento:8080/proxy/</cas.service> <evsclient.url>http://gazelle.ihe.net/EVSClient/</evsclient.url> <dicom.storage>/tmp/DICOM</dicom.storage> -- GitLab