--- a/.hgtags Thu Feb 13 13:14:00 2014 +0100
+++ b/.hgtags Thu Feb 13 13:30:32 2014 +0100
@@ -28,3 +28,4 @@
ee7b5831d382b1d0b3f0c2a8c4f45a44e4da8e39 V00.07.02
570e18094e8734f24ab1a8b4bacb4c6bedd29509 V00.07.04
176ff9c25b8d23f5818685a118cf291e5f80c2e5 V00.07.05
+c14725cb24ae13bf9b1fcad353c5e98d63bed329 V00.07.06
--- a/server/pom.xml Thu Feb 13 13:14:00 2014 +0100
+++ b/server/pom.xml Thu Feb 13 13:30:32 2014 +0100
@@ -4,19 +4,19 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.iri_research.renkan</groupId>
<artifactId>renkan</artifactId>
- <version>0.7.5</version>
+ <version>0.7.6</version>
<packaging>war</packaging>
<properties>
<surefire-version>2.16</surefire-version>
<coweb-version>1.0.1-SNAPSHOT</coweb-version>
<cowebx-version>1.0</cowebx-version>
- <jersey-version>2.3.1</jersey-version>
- <spring-version>3.2.4.RELEASE</spring-version>
- <spring-data-mongodb-version>1.3.1.RELEASE</spring-data-mongodb-version>
- <spring-security-version>3.1.4.RELEASE</spring-security-version>
- <spring-data-commons-version>1.6.1.RELEASE</spring-data-commons-version>
- <spring-data-jpa-version>1.4.1.RELEASE</spring-data-jpa-version>
+ <jersey-version>2.5.1</jersey-version>
+ <spring-version>3.2.6.RELEASE</spring-version>
+ <spring-data-mongodb-version>1.3.3.RELEASE</spring-data-mongodb-version>
+ <spring-security-version>3.2.0.RELEASE</spring-security-version>
+ <spring-data-commons-version>1.6.3.RELEASE</spring-data-commons-version>
+ <spring-data-jpa-version>1.4.3.RELEASE</spring-data-jpa-version>
<jetty-plugin-version>8.1.14.v20131031</jetty-plugin-version>
<jetty-version>8.1.14.v20131031</jetty-version>
<junit-version>4.11</junit-version>
@@ -26,7 +26,7 @@
<cometd-version>2.7.0</cometd-version>
<jackson-version>2.2.3</jackson-version>
<joda-version>2.3</joda-version>
- <mongo-driver-version>2.11.3</mongo-driver-version>
+ <mongo-driver-version>2.11.4</mongo-driver-version>
<jaxrs-api-version>2.0</jaxrs-api-version>
<javax-annotation-version>1.2</javax-annotation-version>
<javax-inject-version>1</javax-inject-version>
@@ -299,7 +299,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
--- a/server/src/main/java/org/iri_research/renkan/Constants.java Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/main/java/org/iri_research/renkan/Constants.java Thu Feb 13 13:30:32 2014 +0100
@@ -10,42 +10,6 @@
public class Constants {
- static {
-
- }
-
- public final static List<String> VERSION = Collections
- .unmodifiableList(new ArrayList<String>() {
- private static final long serialVersionUID = -6935554100028328149L;
- {
- add("0");
- add("7");
- add("5");
- add("final");
- add("0");
- }
- });
-
- public static String getVersion() {
-
- String[] version_array = VERSION.toArray(new String[VERSION.size()]);
-
- String version = String.format("%s.%s", version_array[0],
- version_array[1]);
- if (version_array[2] != null && !version_array[2].isEmpty()
- && Integer.parseInt(version_array[2]) > 0) {
- version = String.format("%s.%s", version, version_array[2]);
- }
- if (version_array[3] == "alpha" && version_array[4] == "0") {
- version = String.format("%s pre-alpha", version);
- } else if (version_array[3] != "final") {
- version = String.format("%s %s %s", version, version_array[3],
- version_array[4]);
- }
- return version;
-
- }
-
public final static String KEYHEX = "f2338d2299ac28ef64f82956fde37337b87a2b9e8fc03e28fa0768cac37d838113c7d0fc78c60fce1e23b1b3e03ac7db4676b3189c267f26baaab10f72544441";
public final static int SALT_LENGTH = 24;
public final static int PAGINATION_SIZE = 10;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/server/src/main/java/org/iri_research/renkan/controller/VersionHandlerInterceptor.java Thu Feb 13 13:30:32 2014 +0100
@@ -0,0 +1,55 @@
+package org.iri_research.renkan.controller;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+@Component
+public class VersionHandlerInterceptor extends HandlerInterceptorAdapter {
+
+ @SuppressWarnings("unused")
+ private final Logger logger = LoggerFactory
+ .getLogger(VersionHandlerInterceptor.class);
+
+ private static String version = null;
+
+ @Override
+ public void postHandle(HttpServletRequest request,
+ HttpServletResponse response, Object handler,
+ ModelAndView modelAndView) throws Exception {
+ if(modelAndView != null) {
+ if(version == null) {
+ ServletContext context = request.getServletContext();
+ InputStream inputStream = context.getResourceAsStream("/META-INF/MANIFEST.MF");
+ if(inputStream != null) {
+ try {
+ Manifest manifest = new Manifest(inputStream);
+ Attributes att = manifest.getMainAttributes();
+ version = att.getValue("Implementation-Version");
+ }
+ catch(IOException e) {
+ version = "N/A";
+ }
+ }
+ if(version == null) {
+ version = "NULL";
+ }
+ else if (version == "") {
+ version = "EMPTY";
+ }
+ }
+ modelAndView.addObject("version", version);
+ }
+ }
+}
--- a/server/src/main/webapp/WEB-INF/applicationContext.xml Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/applicationContext.xml Thu Feb 13 13:30:32 2014 +0100
@@ -6,17 +6,18 @@
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
+ http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-3.0.xsd
+ http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/mvc
- http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd"
+ http://www.springframework.org/schema/mvc/spring-mvc.xsd"
>
-
- <!-- Activates various annotations to be detected in bean classes -->
- <context:annotation-config />
+
+ <!-- Activates various annotations to be detected in bean classes -->
+ <context:annotation-config />
+ <mvc:annotation-driven />
<util:properties id="propsLocations">
<prop key="servletContextProps">WEB-INF/renkan.properties</prop>
@@ -82,6 +83,7 @@
</bean>
</mvc:argument-resolvers>
</mvc:annotation-driven-->
+
<bean class="org.springframework.context.support.ReloadableResourceBundleMessageSource" id="messageSource">
<property name="basenames">
<list>
@@ -92,6 +94,5 @@
<property name="defaultEncoding" value="UTF-8"/>
<property name="fallbackToSystemLocale" value="true" />
</bean>
-
</beans>
--- a/server/src/main/webapp/WEB-INF/spring-security.xml Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/spring-security.xml Thu Feb 13 13:30:32 2014 +0100
@@ -3,12 +3,12 @@
xmlns:util="http://www.springframework.org/schema/util"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/security
- http://www.springframework.org/schema/security/spring-security-3.1.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-3.0.xsd"
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/security
+ http://www.springframework.org/schema/security/spring-security-3.2.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util-3.0.xsd"
>
<util:properties id="propsLocations">
--- a/server/src/main/webapp/WEB-INF/spring-servlet.xml Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/spring-servlet.xml Thu Feb 13 13:30:32 2014 +0100
@@ -30,6 +30,10 @@
</bean>
</mvc:argument-resolvers>
</mvc:annotation-driven>
+ <mvc:interceptors>
+ <bean class="org.iri_research.renkan.controller.VersionHandlerInterceptor"/>
+ </mvc:interceptors>
+
<context:component-scan
base-package="org.iri_research.renkan.controller" />
@@ -54,12 +58,12 @@
<bean id="templateEngine" class="org.thymeleaf.spring3.SpringTemplateEngine">
<property name="templateResolver" ref="templateResolver" />
<property name="additionalDialects">
- <set>
- <bean class="org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect"/>
- </set>
+ <set>
+ <bean class="org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect"/>
+ </set>
</property>
</bean>
-
+
<bean class="org.thymeleaf.spring3.view.ThymeleafViewResolver">
<property name="templateEngine" ref="templateEngine" />
<property name="order" value="1" />
--- a/server/src/main/webapp/WEB-INF/templates/fragment/pageFragment.html Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/fragment/pageFragment.html Thu Feb 13 13:30:32 2014 +0100
@@ -22,7 +22,7 @@
</div>
</header>
<footer id="footer" th:fragment="footerFragment" >
- <div id="version">© <span th:text="${#dates.year(#dates.createNow())}" class="version-date">2013</span> <a href="http://www.iri.centrepompidou.fr" target="_blank">IRI</a> - Version <span th:text="${T(org.iri_research.renkan.Constants).version}" class="version-version">0.0a</span></div>
+ <div id="version">© <span th:text="${#dates.year(#dates.createNow())}" class="version-date">2013</span> <a href="http://www.iri.centrepompidou.fr" target="_blank">IRI</a> - Version <span th:text="${version}" class="version-version">0.0a</span></div>
</footer>
</body>
</html>
\ No newline at end of file
--- a/server/src/main/webapp/WEB-INF/templates/projectIndex.html Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/projectIndex.html Thu Feb 13 13:30:32 2014 +0100
@@ -83,7 +83,7 @@
</div>
</div>
<footer id="footer" th:include="fragment/pageFragment :: footerFragment">
- <div id="version">© <span class="version-date">2013</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
+ <div id="version">© <span class="version-date">2014</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
</footer>
</div>
<script th:inline="javascript" >
@@ -100,7 +100,7 @@
new_renkan = {
title: renkantitle,
- description: "(empty description)",
+ description: "(empty description)",
uri: null,
space_id: /*[[${space.id}]]*/"_",
};
@@ -110,7 +110,7 @@
data:JSON.stringify(new_renkan),
type: "POST",
dataType: "json",
- contentType: "application/json; charset=UTF-8"
+ contentType: "application/json; charset=UTF-8"
}).done(function(project){
window.location.reload();
});
--- a/server/src/main/webapp/WEB-INF/templates/renkanIndex.html Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/renkanIndex.html Thu Feb 13 13:30:32 2014 +0100
@@ -68,7 +68,7 @@
</table>
</div>
<footer id="footer" th:include="fragment/pageFragment :: footerFragment">
- <div id="version">© <span class="version-date">2013</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
+ <div id="version">© <span class="version-date">2014</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
</footer>
</div>
<script th:inline="javascript" >
@@ -94,7 +94,7 @@
data:JSON.stringify(new_space),
type: "POST",
dataType: "json",
- contentType: "application/json; charset=UTF-8"
+ contentType: "application/json; charset=UTF-8"
}).done(function(space){
var template_url = /*[[@{'/s/<%=space_id%>'}]]*/"s/<%=space_id%>";
window.location = _.template(template_url, {space_id: space.id});
--- a/server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Thu Feb 13 13:30:32 2014 +0100
@@ -26,11 +26,11 @@
<script type="text/javascript" src="js/config.js" th:src="@{/static/js/config.js}"></script>
<script type="text/javascript" th:inline="javascript">
var cowebConfig = {
- baseUrl: window.location.protocol + '//' + window.location.host,
- adminUrl : dojoConfig.baseUrl+'ocw_admin',
- debug: /*[[${coweb_debug}]]*/false,
- useWebSockets: /*[[${coweb_websockets}]]*/false
- };
+ baseUrl: window.location.protocol + '//' + window.location.host,
+ adminUrl : dojoConfig.baseUrl+'ocw_admin',
+ debug: /*[[${coweb_debug}]]*/false,
+ useWebSockets: /*[[${coweb_websockets}]]*/false
+ };
</script>
<script type="text/javascript" src="lib/dojo/dojo.js" data-dojo-config="isDebug: true, parseOnLoad: true" th:src="@{/static/lib/dojo/dojo.js}"></script>
<script type="text/javascript" th:inline="javascript">
@@ -75,27 +75,33 @@
/*[[@{/static/data/properties.json}]]*/ "data/properties.json",
],
};
- var space_config = /*[[${space.binConfig}?${space.binConfig}:'{}']]*/"{}";
- space_config = JSON.parse(space_config || "{}");
+ var space_config = /*[[${space.binConfig}?${space.binConfig}:'{}']]*/"{}";
+ space_config = JSON.parse(space_config || "{}");
var _renkan = new Rkns.Renkan($.extend({}, renkan_config, space_config));
var corenkanConfig = {
- projectId: /*[[${project.id}]]*/"new_project",
- renkan : _renkan
- };
+ projectId: /*[[${project.id}]]*/"new_project",
+ renkan : _renkan
+ };
- require({corenkanConfig: corenkanConfig}, ["corenkan"], function(corenkan) {
+ require({corenkanConfig: corenkanConfig}, ["corenkan"], function(corenkan) {
corenkan.app.onStatusChange = function(status) {
};
});
});
</script>
- <link href="../../static/css/style.css" rel="stylesheet" th:href="@{/static/css/style.css}"/>
- <link rel="stylesheet" href="css/renkan.css" th:href="@{/static/css/renkan.css}"/>
+ <link rel="stylesheet" href="css/renkan.css" th:href="@{/static/css/renkan.css}"/>
+ <link rel="stylesheet" href="../../static/css/style.css" th:href="@{/static/css/style.css}"/>
+ <link rel="stylesheet" href="../../static/css/renkanProject.css" th:href="@{/static/css/renkanProject.css}"/>
</head>
<body>
- <div id="renkan"></div>
- <div id="footer" th:include="fragment/pageFragment :: footerFragment">
- <div id="version">© <span class="version-date">2013</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
- </div>
+ <header><a href="/" th:href="@{/}">RENKAN</a> > <a href=".." th:href="@{'/s/'+${space.id}}">Space</a></header>
+ <div id="renkan-wrapper">
+ <div id="renkan-container">
+ <div id="renkan"></div>
+ </div>
+ </div>
+ <footer id="footer" th:include="fragment/pageFragment :: footerFragment">
+ <div id="version">© <span class="version-date">2014</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
+ </footer>
</body>
</html>
--- a/server/src/main/webapp/WEB-INF/templates/renkanProjectPublish.html Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/main/webapp/WEB-INF/templates/renkanProjectPublish.html Thu Feb 13 13:30:32 2014 +0100
@@ -38,14 +38,20 @@
});
/*]]>*/
</script>
+ <link rel="stylesheet" href="css/renkan.css" th:href="@{/static/css/renkan.css}"/>
<link href="../../static/css/style.css" rel="stylesheet" th:href="@{/static/css/style.css}"/>
- <link rel="stylesheet" href="css/renkan.css" th:href="@{/static/css/renkan.css}"/>
+ <link href="../../static/css/renkanProject.css" rel="stylesheet" th:href="@{/static/css/renkanProject.css}"/>
</head>
<body>
- <div id="renkan"></div>
- <div id="footer" th:include="fragment/pageFragment :: footerFragment">
- <div id="version">© <span class="version-date">2013</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
+ <header><a href="/" th:href="@{/}">RENKAN</a> > <a href=".." th:href="@{'/s/'+${space.id}}">Space</a></header>
+ <div id="renkan-wrapper">
+ <div id="renkan-container">
+ <div id="renkan"></div>
+ </div>
</div>
+ <footer id="footer" th:include="fragment/pageFragment :: footerFragment">
+ <div id="version">© <span class="version-date">2014</span> <a href="http://www.iri.centrepompidou.fr" target="_blanck">IRI</a> - Version <span class="version-version">0.0</span></div>
+ </footer>
</body>
</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/server/src/main/webapp/static/css/renkanProject.css Thu Feb 13 13:30:32 2014 +0100
@@ -0,0 +1,51 @@
+/* =============================================================================
+ Renkan
+ ========================================================================== */
+body {
+ background-color: #1E1E1E;
+}
+
+header {
+ font-size: 12px;
+ height: 15px;
+ padding: 5px 0 2px 10px;
+ color: white;
+}
+
+footer {
+ font-size: 10px;
+ position:absolute;
+ bottom: 0;
+ text-align: right;
+ width: 100%;
+ padding: 2px 0;
+ color: white;
+}
+
+a, a:VISITED, a:LINK {
+ color: white;
+ text-decoration: none;
+}
+
+a:HOVER {
+ text-decoration: underline;
+}
+
+
+#renkan-wrapper {
+ position:absolute;
+ top: 25px;
+ left: 0;
+ right: 0;
+ bottom: 18px;
+}
+
+#renkan-container {
+ min-height: 100%;
+ position: relative;
+ width: 100%;
+}
+
+#version {
+ padding-right: 5px;
+}
--- a/server/src/test/java/org/iri_research/renkan/test/controller/GroupsAdminControllerTest.java Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/test/java/org/iri_research/renkan/test/controller/GroupsAdminControllerTest.java Thu Feb 13 13:30:32 2014 +0100
@@ -178,7 +178,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups?version=NULL"));
Group group = this.groupsRepository.findOne(this.groupsUuids.get(0));
@@ -204,7 +204,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups?version=NULL"));
Assert.assertEquals("Must have one more group", GROUP_NB + 1,
this.groupsRepository.count());
@@ -410,7 +410,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups?version=NULL"));
Assert.assertEquals("Must have one less space", GROUP_NB - 1,
this.groupsRepository.count());
@@ -441,7 +441,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups?version=NULL"));
Assert.assertEquals("Must have the same nb of group", GROUP_NB,
this.groupsRepository.count());
@@ -462,7 +462,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups?version=NULL"));
Group group = this.groupsRepository.findOne(this.groupsUuids.get(0));
--- a/server/src/test/java/org/iri_research/renkan/test/controller/SpacesAdminControllerTest.java Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/test/java/org/iri_research/renkan/test/controller/SpacesAdminControllerTest.java Thu Feb 13 13:30:32 2014 +0100
@@ -120,7 +120,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces?version=NULL"));
Space sp = this.spacesRepository.findOne(this.spacesUuids.get(0));
@@ -148,7 +148,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces?version=NULL"));
Assert.assertEquals("Must have one more space", SPACE_NB + 1,
this.spacesRepository.count());
@@ -481,7 +481,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces?version=NULL"));
Assert.assertEquals("Must have one less space", SPACE_NB - 1,
this.spacesRepository.count());
@@ -512,7 +512,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces?version=NULL"));
Assert.assertEquals("Must have the same nb of space", SPACE_NB,
this.spacesRepository.count());
--- a/server/src/test/java/org/iri_research/renkan/test/controller/UsersAdminControllerTest.java Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/test/java/org/iri_research/renkan/test/controller/UsersAdminControllerTest.java Thu Feb 13 13:30:32 2014 +0100
@@ -177,7 +177,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users?version=NULL"));
User user = this.usersRepository.findOne(this.usersUuids.get(0));
@@ -206,7 +206,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users?version=NULL"));
Assert.assertEquals("Must have one more space", USER_NB + 1,
this.usersRepository.count());
@@ -441,7 +441,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users?version=NULL"));
Assert.assertEquals("Must have one less user", USER_NB - 1,
this.usersRepository.count());
@@ -472,7 +472,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users?version=NULL"));
Assert.assertEquals("Must have the same nb of user", USER_NB,
this.usersRepository.count());
@@ -528,7 +528,7 @@
this.mvc.perform(post)
.andExpect(MockMvcResultMatchers.status().isSeeOther())
- .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users"));
+ .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users?version=NULL"));
User user = this.usersRepository.findOne(this.usersUuids.get(0));
--- a/server/src/test/resources/org/iri_research/renkan/test/controller/controller-context.xml Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/test/resources/org/iri_research/renkan/test/controller/controller-context.xml Thu Feb 13 13:30:32 2014 +0100
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/context/spring-context-3.2.xsd">
<!-- Activates various annotations to be detected in bean classes -->
<context:annotation-config />
--- a/server/src/test/resources/org/iri_research/renkan/test/repositories/repositories-context.xml Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/test/resources/org/iri_research/renkan/test/repositories/repositories-context.xml Thu Feb 13 13:30:32 2014 +0100
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/context/spring-context-3.2.xsd">
<!-- Activates various annotations to be detected in bean classes -->
<context:annotation-config />
--- a/server/src/test/resources/org/iri_research/renkan/test/rest/rest-context.xml Thu Feb 13 13:14:00 2014 +0100
+++ b/server/src/test/resources/org/iri_research/renkan/test/rest/rest-context.xml Thu Feb 13 13:30:32 2014 +0100
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+ http://www.springframework.org/schema/context/spring-context-3.2.xsd">
<!-- Activates various annotations to be detected in bean classes -->
<context:annotation-config />