diff --git a/.idea/artifacts/wise_war_exploded.xml b/.idea/artifacts/wise_war_exploded.xml index 278bb8966b..f2279037e0 100644 --- a/.idea/artifacts/wise_war_exploded.xml +++ b/.idea/artifacts/wise_war_exploded.xml @@ -9,44 +9,43 @@ - - - - - - - - - + + + + + + + + + - - - + + + - - + + - - - - - - - - - + + + + - - + + + + + + - + diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_36.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml similarity index 57% rename from .idea/libraries/Maven__mysql_mysql_connector_java_5_1_36.xml rename to .idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml index a298445a1e..18e6ec9227 100644 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_36.xml +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml new file mode 100644 index 0000000000..a6f25dbed5 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jta_1_1_spec_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml similarity index 53% rename from .idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml rename to .idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml index 9ed6d2973a..ce34f4265d 100644 --- a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_c3p0_4_3_11_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_c3p0_5_0_10_Final.xml similarity index 55% rename from .idea/libraries/Maven__org_hibernate_hibernate_c3p0_4_3_11_Final.xml rename to .idea/libraries/Maven__org_hibernate_hibernate_c3p0_5_0_10_Final.xml index 912aa51c14..0706155cd3 100644 --- a/.idea/libraries/Maven__org_hibernate_hibernate_c3p0_4_3_11_Final.xml +++ b/.idea/libraries/Maven__org_hibernate_hibernate_c3p0_5_0_10_Final.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_11_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_0_10_Final.xml similarity index 55% rename from .idea/libraries/Maven__org_hibernate_hibernate_core_4_3_11_Final.xml rename to .idea/libraries/Maven__org_hibernate_hibernate_core_5_0_10_Final.xml index 33a8479024..e58333a9e0 100644 --- a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_11_Final.xml +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_0_10_Final.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_ehcache_4_3_11_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_ehcache_5_0_10_Final.xml similarity index 56% rename from .idea/libraries/Maven__org_hibernate_hibernate_ehcache_4_3_11_Final.xml rename to .idea/libraries/Maven__org_hibernate_hibernate_ehcache_5_0_10_Final.xml index c0a74650f1..3225e53323 100644 --- a/.idea/libraries/Maven__org_hibernate_hibernate_ehcache_4_3_11_Final.xml +++ b/.idea/libraries/Maven__org_hibernate_hibernate_ehcache_5_0_10_Final.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hsqldb_hsqldb_2_3_2.xml b/.idea/libraries/Maven__org_hsqldb_hsqldb_2_3_4.xml similarity index 67% rename from .idea/libraries/Maven__org_hsqldb_hsqldb_2_3_2.xml rename to .idea/libraries/Maven__org_hsqldb_hsqldb_2_3_4.xml index 110e2498ec..1ef92a089a 100644 --- a/.idea/libraries/Maven__org_hsqldb_hsqldb_2_3_2.xml +++ b/.idea/libraries/Maven__org_hsqldb_hsqldb_2_3_4.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml deleted file mode 100644 index d3cd08972e..0000000000 --- a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml new file mode 100644 index 0000000000..a74dcfd269 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_2_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml similarity index 54% rename from .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml rename to .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml index 815ab4d86f..186d87fd06 100644 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml deleted file mode 100644 index 715be298ce..0000000000 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml deleted file mode 100644 index 2ab9129833..0000000000 --- a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_3_3_RELEASE.xml similarity index 56% rename from .idea/libraries/Maven__org_springframework_spring_aop_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_aop_4_3_3_RELEASE.xml index 80294b1792..9e08177c38 100644 --- a/.idea/libraries/Maven__org_springframework_spring_aop_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_4_3_3_RELEASE.xml similarity index 57% rename from .idea/libraries/Maven__org_springframework_spring_aspects_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_aspects_4_3_3_RELEASE.xml index 76b0cbe90d..3a19761265 100644 --- a/.idea/libraries/Maven__org_springframework_spring_aspects_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_aspects_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_3_3_RELEASE.xml similarity index 56% rename from .idea/libraries/Maven__org_springframework_spring_beans_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_beans_4_3_3_RELEASE.xml index 09b7e0cada..1ddd8b9b85 100644 --- a/.idea/libraries/Maven__org_springframework_spring_beans_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_3_3_RELEASE.xml similarity index 57% rename from .idea/libraries/Maven__org_springframework_spring_context_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_context_4_3_3_RELEASE.xml index 3c9464466d..fbc79eb42f 100644 --- a/.idea/libraries/Maven__org_springframework_spring_context_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_3_RELEASE.xml similarity index 67% rename from .idea/libraries/Maven__org_springframework_spring_context_support_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_context_support_4_3_3_RELEASE.xml index ef485cc73f..15c1b8bda3 100644 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_3_3_RELEASE.xml similarity index 56% rename from .idea/libraries/Maven__org_springframework_spring_core_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_core_4_3_3_RELEASE.xml index 7300f9e7b2..cabb772e38 100644 --- a/.idea/libraries/Maven__org_springframework_spring_core_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_3_3_RELEASE.xml similarity index 66% rename from .idea/libraries/Maven__org_springframework_spring_expression_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_expression_4_3_3_RELEASE.xml index 099312afbd..200454c0a1 100644 --- a/.idea/libraries/Maven__org_springframework_spring_expression_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_3_RELEASE.xml similarity index 56% rename from .idea/libraries/Maven__org_springframework_spring_jdbc_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_jdbc_4_3_3_RELEASE.xml index 7d27aafe69..1ab87cae60 100644 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_3_RELEASE.xml similarity index 66% rename from .idea/libraries/Maven__org_springframework_spring_messaging_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_messaging_4_3_3_RELEASE.xml index d16ce55dcd..d784558ee0 100644 --- a/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_messaging_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_3_3_RELEASE.xml similarity index 56% rename from .idea/libraries/Maven__org_springframework_spring_orm_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_orm_4_3_3_RELEASE.xml index c400a2dd27..15b76e6933 100644 --- a/.idea/libraries/Maven__org_springframework_spring_orm_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_3_RELEASE.xml similarity index 55% rename from .idea/libraries/Maven__org_springframework_spring_tx_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_tx_4_3_3_RELEASE.xml index 89e6704aef..3f81933c84 100644 --- a/.idea/libraries/Maven__org_springframework_spring_tx_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_3_3_RELEASE.xml similarity index 56% rename from .idea/libraries/Maven__org_springframework_spring_web_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_web_4_3_3_RELEASE.xml index 61084b27d3..702f0cf3e1 100644 --- a/.idea/libraries/Maven__org_springframework_spring_web_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_3_RELEASE.xml similarity index 56% rename from .idea/libraries/Maven__org_springframework_spring_webmvc_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_webmvc_4_3_3_RELEASE.xml index 2a8cac0272..22a1b45ad7 100644 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_websocket_4_3_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_websocket_4_3_3_RELEASE.xml similarity index 66% rename from .idea/libraries/Maven__org_springframework_spring_websocket_4_3_0_RELEASE.xml rename to .idea/libraries/Maven__org_springframework_spring_websocket_4_3_3_RELEASE.xml index 289fe46a6c..0e89ecbb68 100644 --- a/.idea/libraries/Maven__org_springframework_spring_websocket_4_3_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_websocket_4_3_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 585845873d..bd6b7fcd50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_install: - nvm use 5.0 before_script: - ./wise.sh run & -- sleep 180 +- sleep 210 script: - npm test - npm run test-e2e diff --git a/pom.xml b/pom.xml index 8e89407906..c59e60f602 100644 --- a/pom.xml +++ b/pom.xml @@ -356,12 +356,12 @@ org.hsqldb hsqldb - 2.3.2 + 2.3.4 mysql mysql-connector-java - 5.1.36 + 5.1.39 org.hibernate @@ -468,9 +468,9 @@ - 4.3.0.RELEASE + 4.3.3.RELEASE 4.1.0.RELEASE - 4.3.11.Final + 5.0.10.Final diff --git a/src/main/java/org/wise/portal/dao/impl/AbstractHibernateDao.java b/src/main/java/org/wise/portal/dao/impl/AbstractHibernateDao.java index cec435e9e8..eb818bfccf 100644 --- a/src/main/java/org/wise/portal/dao/impl/AbstractHibernateDao.java +++ b/src/main/java/org/wise/portal/dao/impl/AbstractHibernateDao.java @@ -28,7 +28,7 @@ import org.hibernate.SessionFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.hibernate4.support.HibernateDaoSupport; +import org.springframework.orm.hibernate5.support.HibernateDaoSupport; import org.springframework.transaction.annotation.Transactional; import org.wise.portal.dao.ObjectNotFoundException; import org.wise.portal.dao.SimpleDao; diff --git a/src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java b/src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java index b08bb23ebe..e66ee28f07 100644 --- a/src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java +++ b/src/main/java/org/wise/portal/dao/user/impl/HibernateUserDao.java @@ -20,10 +20,14 @@ */ package org.wise.portal.dao.user.impl; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Vector; import org.apache.commons.lang3.StringUtils; +import org.hibernate.Query; +import org.hibernate.Session; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.support.DataAccessUtils; import org.springframework.security.core.userdetails.UserDetails; @@ -165,37 +169,42 @@ private String capitalizeFirst(String string){ */ @SuppressWarnings("unchecked") public List retrieveByFields(String[] fields, String[] values, String classVar) { - Vector objectValues = new Vector(); - - StringBuffer query = new StringBuffer(); - - //make the beginning of the query + HashMap params = new HashMap<>(); + Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession(); + StringBuffer query = new StringBuffer(); + + // make the beginning of the query query.append("select user from UserImpl user, " + capitalizeFirst(classVar) + " " + classVar + " where "); query.append("user.userDetails.id=" + classVar + ".id"); - - //loop through all the fields so we can add more constraints to the 'where' clause - for(int x=0; x) this.getHibernateTemplate().find(query.toString(), objectValues.toArray()); + + Query queryObject = session.createQuery(query.toString()); + for (Map.Entry entry : params.entrySet()) { + queryObject.setParameter(entry.getKey(), entry.getValue()); + } + + // run the query and return the results + List result = queryObject.list(); + return result; } /** diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/student/AddProjectController.java b/src/main/java/org/wise/portal/presentation/web/controllers/student/AddProjectController.java index 0f88e7750a..30f3f8f125 100644 --- a/src/main/java/org/wise/portal/presentation/web/controllers/student/AddProjectController.java +++ b/src/main/java/org/wise/portal/presentation/web/controllers/student/AddProjectController.java @@ -25,7 +25,7 @@ import org.hibernate.StaleObjectStateException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.hibernate4.HibernateOptimisticLockingFailureException; +import org.springframework.orm.hibernate5.HibernateOptimisticLockingFailureException; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/student/StartProjectController.java b/src/main/java/org/wise/portal/presentation/web/controllers/student/StartProjectController.java index ee44617f9e..9e50aad823 100644 --- a/src/main/java/org/wise/portal/presentation/web/controllers/student/StartProjectController.java +++ b/src/main/java/org/wise/portal/presentation/web/controllers/student/StartProjectController.java @@ -37,7 +37,7 @@ import org.hibernate.StaleObjectStateException; import org.json.JSONArray; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.hibernate4.HibernateOptimisticLockingFailureException; +import org.springframework.orm.hibernate5.HibernateOptimisticLockingFailureException; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/student/StudentAccountController.java b/src/main/java/org/wise/portal/presentation/web/controllers/student/StudentAccountController.java index 8bc14a1e8f..ecbd76fde2 100644 --- a/src/main/java/org/wise/portal/presentation/web/controllers/student/StudentAccountController.java +++ b/src/main/java/org/wise/portal/presentation/web/controllers/student/StudentAccountController.java @@ -36,7 +36,7 @@ import org.hibernate.StaleObjectStateException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.propertyeditors.CustomDateEditor; -import org.springframework.orm.hibernate4.HibernateOptimisticLockingFailureException; +import org.springframework.orm.hibernate5.HibernateOptimisticLockingFailureException; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.ui.ModelMap; diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/student/TeamSignInController.java b/src/main/java/org/wise/portal/presentation/web/controllers/student/TeamSignInController.java index 167140df29..4afc5af539 100644 --- a/src/main/java/org/wise/portal/presentation/web/controllers/student/TeamSignInController.java +++ b/src/main/java/org/wise/portal/presentation/web/controllers/student/TeamSignInController.java @@ -37,7 +37,7 @@ import org.hibernate.StaleObjectStateException; import org.json.JSONArray; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.hibernate4.HibernateOptimisticLockingFailureException; +import org.springframework.orm.hibernate5.HibernateOptimisticLockingFailureException; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; diff --git a/src/main/java/org/wise/portal/service/websocket/WISETextWebSocketHandler.java b/src/main/java/org/wise/portal/service/websocket/WISETextWebSocketHandler.java index 3bb9f078fd..6acdc7acf7 100644 --- a/src/main/java/org/wise/portal/service/websocket/WISETextWebSocketHandler.java +++ b/src/main/java/org/wise/portal/service/websocket/WISETextWebSocketHandler.java @@ -29,12 +29,11 @@ import java.util.*; import java.util.concurrent.CopyOnWriteArraySet; -import javax.transaction.Transactional; - import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; diff --git a/src/main/java/org/wise/util/DBInitExporter.java b/src/main/java/org/wise/util/DBInitExporter.java index 03ed25cafa..0315eb9b51 100644 --- a/src/main/java/org/wise/util/DBInitExporter.java +++ b/src/main/java/org/wise/util/DBInitExporter.java @@ -33,7 +33,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.orm.hibernate4.LocalSessionFactoryBean; +import org.springframework.orm.hibernate5.LocalSessionFactoryBean; import org.wise.portal.spring.SpringConfiguration; /** diff --git a/src/main/resources/configurations/applicationContexts.xml b/src/main/resources/configurations/applicationContexts.xml index a96fc5ca00..157721e787 100644 --- a/src/main/resources/configurations/applicationContexts.xml +++ b/src/main/resources/configurations/applicationContexts.xml @@ -1,6 +1,6 @@ - + @@ -893,7 +893,7 @@ - + @@ -901,6 +901,7 @@ auto ${hibernate.dialect} ${hibernate.hbm2ddl.auto} + false true diff --git a/wise.iml b/wise.iml index f140010f9e..59356e0186 100644 --- a/wise.iml +++ b/wise.iml @@ -53,44 +53,43 @@ - - - - - - - - - + + + + + + + + + - - - + + + - - + + - - - - - - - - - + + + + - - + + + + + + - +