# HG changeset patch
# User cavaliet
# Date 1392294632 -3600
# Node ID c6aa9772269cd12a2b2b95181cdd9f5547ceb734
# Parent 711b7920fba1f59deccf31b86163de6eb76a1e13# Parent f077b16e9d5fd9dcf2dab9da0972fbe42a69cd83
Merge with f077b16e9d5fd9dcf2dab9da0972fbe42a69cd83
diff -r 711b7920fba1 -r c6aa9772269c .hgtags
--- 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
diff -r 711b7920fba1 -r c6aa9772269c server/pom.xml
--- 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 @@
4.0.0
org.iri_research.renkan
renkan
- 0.7.5
+ 0.7.6
war
2.16
1.0.1-SNAPSHOT
1.0
- 2.3.1
- 3.2.4.RELEASE
- 1.3.1.RELEASE
- 3.1.4.RELEASE
- 1.6.1.RELEASE
- 1.4.1.RELEASE
+ 2.5.1
+ 3.2.6.RELEASE
+ 1.3.3.RELEASE
+ 3.2.0.RELEASE
+ 1.6.3.RELEASE
+ 1.4.3.RELEASE
8.1.14.v20131031
8.1.14.v20131031
4.11
@@ -26,7 +26,7 @@
2.7.0
2.2.3
2.3
- 2.11.3
+ 2.11.4
2.0
1.2
1
@@ -299,7 +299,7 @@
org.springframework
spring-webmvc
${spring-version}
-
+
org.springframework.data
spring-data-commons
diff -r 711b7920fba1 -r c6aa9772269c server/src/main/java/org/iri_research/renkan/Constants.java
--- 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 VERSION = Collections
- .unmodifiableList(new ArrayList() {
- 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;
diff -r 711b7920fba1 -r c6aa9772269c server/src/main/java/org/iri_research/renkan/controller/VersionHandlerInterceptor.java
--- /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);
+ }
+ }
+}
diff -r 711b7920fba1 -r c6aa9772269c server/src/main/webapp/WEB-INF/applicationContext.xml
--- 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"
>
-
-
-
+
+
+
+
WEB-INF/renkan.properties
@@ -82,6 +83,7 @@
+
@@ -92,6 +94,5 @@
-
diff -r 711b7920fba1 -r c6aa9772269c server/src/main/webapp/WEB-INF/spring-security.xml
--- 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"
>
diff -r 711b7920fba1 -r c6aa9772269c server/src/main/webapp/WEB-INF/spring-servlet.xml
--- 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 @@
+
+
+
+
@@ -54,12 +58,12 @@
-
-
-
+
+
+
-
+
diff -r 711b7920fba1 -r c6aa9772269c server/src/main/webapp/WEB-INF/templates/fragment/pageFragment.html
--- 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 @@