# HG changeset patch # User ymh # Date 1433152383 -7200 # Node ID b38cf3d4cf1f037816ab7055fb777500901e9c6b # Parent 19f0b7803aed33a22feeb3e7c7da7a9dc7de81ce add mongodb migration to java model diff -r 19f0b7803aed -r b38cf3d4cf1f client/js/models.js --- a/client/js/models.js Fri May 29 14:57:37 2015 +0200 +++ b/client/js/models.js Mon Jun 01 11:53:03 2015 +0200 @@ -296,6 +296,7 @@ }, toJSON : function() { var json = _.clone(this.attributes); + delete json.schemaVersion; json.schema_version = this.schemaVersion; for ( var attr in json) { if ((json[attr] instanceof Backbone.Model) || diff -r 19f0b7803aed -r b38cf3d4cf1f server/java/renkan-core/src/main/java/org/iri_research/renkan/Constants.java --- a/server/java/renkan-core/src/main/java/org/iri_research/renkan/Constants.java Fri May 29 14:57:37 2015 +0200 +++ b/server/java/renkan-core/src/main/java/org/iri_research/renkan/Constants.java Mon Jun 01 11:53:03 2015 +0200 @@ -18,7 +18,7 @@ public final static String ANONYMOUS_USER_BASE_NAME = "Anonymous"; public final static String UNKNOWN_SCHEMA_VERSION = "1"; - public final static String SCHEMA_VERSION = "2"; + public final static String SCHEMA_VERSION = "1"; private final static EthernetAddress ETHERNET_ADRESS = EthernetAddress .fromInterface(); diff -r 19f0b7803aed -r b38cf3d4cf1f server/java/renkan-web/build.gradle --- a/server/java/renkan-web/build.gradle Fri May 29 14:57:37 2015 +0200 +++ b/server/java/renkan-web/build.gradle Mon Jun 01 11:53:03 2015 +0200 @@ -42,6 +42,7 @@ hibernate_validator_version = '5.0.1.Final' jstl_version = '1.2' json_path_assert_version = '0.9.1' + mongeez_version = '0.9.4' } @@ -107,6 +108,7 @@ compile group: 'com.google.guava', name: 'guava', version:guava_version runtime group: 'javax.servlet', name: 'jstl', version:jstl_version runtime group: 'org.eclipse.jetty.aggregate', name: 'jetty-all', version:jetty_version + runtime group: 'org.mongeez', name: 'mongeez', version:mongeez_version testCompile group: 'org.glassfish.jersey.test-framework.providers', name: 'jersey-test-framework-provider-grizzly2', version:jersey_version testCompile group: 'org.springframework', name: 'spring-test', version:spring_version testCompile group: 'com.jayway.jsonpath', name: 'json-path-assert', version:json_path_assert_version @@ -160,4 +162,3 @@ into "static/data" } } - diff -r 19f0b7803aed -r b38cf3d4cf1f server/java/renkan-web/pom.xml --- a/server/java/renkan-web/pom.xml Fri May 29 14:57:37 2015 +0200 +++ b/server/java/renkan-web/pom.xml Mon Jun 01 11:53:03 2015 +0200 @@ -45,6 +45,7 @@ 17.0 0.9.1 2.4 + 0.9.4 UTF-8 @@ -631,6 +632,11 @@ ${guava-version} + org.mongeez + mongeez + ${mongeez-version} + + com.jayway.jsonpath json-path-assert ${json-path-version} diff -r 19f0b7803aed -r b38cf3d4cf1f server/java/renkan-web/src/main/resources/META-INF/renkan.properties --- a/server/java/renkan-web/src/main/resources/META-INF/renkan.properties Fri May 29 14:57:37 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -mongodb.host.name = localhost -mongodb.host.port = 27017 -mongodb.db.name = renkan - -user.admin.name = admin -#user.admin.password = admin -user.admin.password = 8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918 - -renkan.pagination.size = 2 -renkan.coweb.debug = false -renkan.coweb.websocket = true \ No newline at end of file diff -r 19f0b7803aed -r b38cf3d4cf1f server/java/renkan-web/src/main/resources/log4j.xml --- a/server/java/renkan-web/src/main/resources/log4j.xml Fri May 29 14:57:37 2015 +0200 +++ b/server/java/renkan-web/src/main/resources/log4j.xml Mon Jun 01 11:53:03 2015 +0200 @@ -2,11 +2,11 @@ - - - - - + + + + + @@ -17,16 +17,18 @@ + + + - - - + + + - + - diff -r 19f0b7803aed -r b38cf3d4cf1f server/java/renkan-web/src/main/resources/org/iri_research/renkan/migrations/001-set_schema_version-000-001.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/java/renkan-web/src/main/resources/org/iri_research/renkan/migrations/001-set_schema_version-000-001.js Mon Jun 01 11:53:03 2015 +0200 @@ -0,0 +1,12 @@ +//mongeez formatted javascript +//changeset ymh:001-set_schema_version-000-001 + +db.projects.update( + {}, + { $set: { + schema_version: "2" + } + }, + false, + true +); diff -r 19f0b7803aed -r b38cf3d4cf1f server/java/renkan-web/src/main/resources/org/iri_research/renkan/migrations/mongeez.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/java/renkan-web/src/main/resources/org/iri_research/renkan/migrations/mongeez.xml Mon Jun 01 11:53:03 2015 +0200 @@ -0,0 +1,4 @@ + + + + diff -r 19f0b7803aed -r b38cf3d4cf1f server/java/renkan-web/src/main/webapp/WEB-INF/mongo-config.xml --- a/server/java/renkan-web/src/main/webapp/WEB-INF/mongo-config.xml Fri May 29 14:57:37 2015 +0200 +++ b/server/java/renkan-web/src/main/webapp/WEB-INF/mongo-config.xml Mon Jun 01 11:53:03 2015 +0200 @@ -1,32 +1,39 @@ - - - - - - - - - - - - - - + xsi:schemaLocation=" + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.2.xsd + http://www.springframework.org/schema/data/mongo + http://www.springframework.org/schema/data/mongo/spring-mongo-1.2.xsd + http://www.springframework.org/schema/data/jpa + http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd"> + + + + + + + + + + + + + + + + + + + + + diff -r 19f0b7803aed -r b38cf3d4cf1f server/java/renkan-web/src/main/webapp/WEB-INF/renkan.properties --- a/server/java/renkan-web/src/main/webapp/WEB-INF/renkan.properties Fri May 29 14:57:37 2015 +0200 +++ b/server/java/renkan-web/src/main/webapp/WEB-INF/renkan.properties Mon Jun 01 11:53:03 2015 +0200 @@ -1,6 +1,6 @@ mongodb.host.name = localhost mongodb.host.port = 27017 -mongodb.db.name = renkan_05_20 +mongodb.db.name = renkan user.admin.name = admin #user.admin.password = admin