Commit Graph

280 Commits

Author SHA1 Message Date
7bea134671 Upgraded Wicket to version 6.15.0 2014-04-25 14:51:37 +02:00
60fb46db5b Spring gone for good. No backsies. 2014-03-17 16:40:10 +01:00
7c1ce28ac5 Removed fitnesse. 2014-03-11 12:50:43 +01:00
c376e84213 Reverted back to Lombok 0.12.0 due to generated code being picked up by Sonar. 2014-02-28 10:25:52 +01:00
f18fc7799d Added warnings and deprecations to the compiler plugin so they are easier to fix. 2014-02-27 09:47:29 +01:00
5572c7dc86 Moved spring-web dependency to view. 2014-02-27 09:22:15 +01:00
d9273b55cc Added dependency on javax.inject and excluded transitive dependency on hk2s own implementation.
Shuffled hibernate dependencies to runtime and depend on the JSR API instead.
2014-02-26 17:18:52 +01:00
3f160abdcc Updated all dependency versions.
Still stuck with Spring 3.2.8 due to Spring-data-jpa.
Hibernate introduced a bug in 4.3.* so until that is resolved we use 4.2.8.
2014-02-26 16:47:14 +01:00
fred-fri
e3a23c40dc fixing fitnesse+selenium 2014-02-19 19:52:37 +09:00
fred-fri
2040479e73 fixing fitnesse+selenium 2014-02-19 18:42:43 +09:00
247fa06efd Jackrabbit is no more! 2014-02-18 10:04:41 +01:00
1cdd32badc Changed scope of MySQL driver to provided so it is not packaged with the web app to prevent memory leaks. 2014-01-31 14:37:32 +01:00
9602903eb9 Updated Cobertura plugin to a Java 7 compatible version. 2014-01-13 17:22:10 +01:00
9f8f65f49b Java 7. 2014-01-13 16:52:12 +01:00
4612bd5c1a Fixed current profile string for TEST profile. 2014-01-09 14:31:34 +01:00
818e392e62 Fixed TEST profile to be more PROD like. 2014-01-09 13:11:15 +01:00
301ea0c744 Went down in MySQL version to get rid of the memory leak caused by the abandoned connection cleanup thread. 2013-11-14 16:24:36 +01:00
85cb365956 Added worker to send grading reports as PDFs to daisy. 2013-11-13 16:52:29 +01:00
fred-fri
6f442ff84d removed ehcache 2013-11-08 13:49:01 +09:00
c9e45b0f38 Default settings for the project is now DEV.
Added back the TEST profile to re-enable logging on thesis3.
2013-10-28 17:08:11 +01:00
Emil Siverhall
93f36492c6 resolved merge conflicts 2013-10-15 11:42:42 +02:00
Emil Siverhall
714aa7a371 switched out the autocomplete component to use select2choice instead of our old broken component 2013-10-15 11:28:09 +02:00
71de5a26f4 Merge branch 'develop' into wicketupdate
Conflicts:
	view/pom.xml
	view/src/main/java/se/su/dsv/scipro/activityplan/panels/ActivityPlanPanel.html
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaDetailsCrudPanel.java
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaOverviewPanel.html
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaOverviewPanel.java
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaPopupPanel.html
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminNewIdeaPopupPanel.java
	view/src/main/java/se/su/dsv/scipro/admin/panels/AdminRolesPanel.html
	view/src/main/java/se/su/dsv/scipro/basepages/BasePage.html
	view/src/main/java/se/su/dsv/scipro/checklists/panels/AnswerDialogPanel.html
	view/src/main/java/se/su/dsv/scipro/components/StylableDateTimeField.html
	view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.html
	view/src/main/java/se/su/dsv/scipro/landingpages/NewIdeaLandingPage.java
	view/src/main/java/se/su/dsv/scipro/project/pages/ProjectOppositionPage.html
	view/src/main/java/se/su/dsv/scipro/project/panels/ProjectMyIdeasPanel.java
	view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewAllSupervisorIdeasPanel.java
	view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewIdeaSubmissionPanel.html
	view/src/main/java/se/su/dsv/scipro/project/panels/ProjectNewIdeaSubmissionPanel.java
	view/src/main/java/se/su/dsv/scipro/repository/pages/RepositoryDownloadPage.java
	view/src/main/java/se/su/dsv/scipro/reusable/AbstractRoleAutoCompleteComponent.java
	view/src/main/java/se/su/dsv/scipro/security/auth/ExternalAuthenticationRequestHelper.java
	view/src/main/java/se/su/dsv/scipro/seminar/panels/SeminarThesisPanel.java
	view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAllSupervisorIdeasPanel.java
	view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewAllStudentIdeasPanel.java
	view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorNewEditIdeaPanel.html
	view/src/test/java/se/su/dsv/scipro/panels/ChecklistAnswerCommentPanelTest.java
	view/src/test/java/se/su/dsv/scipro/panels/CommentThreadPanelTest.java
2013-10-15 10:09:28 +02:00
316a291262 Removed -verbose from javac 2013-10-14 10:48:49 +02:00
fred-fri
a721778af8 removed profiles 2013-10-14 14:01:28 +09:00
6806cfc6b0 Knasbollar 2013-10-11 09:39:39 +02:00
fred-fri
d9a24ec9d6 removed plugin, turned off generateddl in dev profile and added new dev generate ddl profile specifically for generating ddl 2013-10-10 18:33:03 +09:00
fred-fri
17261a54f7 added flyway 2013-10-10 16:56:39 +09:00
Emil Siverhall
460d999fa7 finishing touches of wicket update 2013-10-09 16:38:24 +02:00
Leo
0bcd5a7047 updatestuffs 2013-10-08 15:13:00 +02:00
Dan Lagnöhed
e18da87dfb . 2013-10-08 09:18:35 +02:00
Emil Siverhall
566b3b37c9 started upgrade from wicket 1.4 to 6.10.0 2013-10-07 16:53:21 +02:00
Dan Lagnöhed
953140214b Fitnesse test that actually tests something... 2013-10-07 11:45:58 +02:00
Dan Lagnöhed
b27cda4d90 Trying to find bug... 2013-10-07 09:43:15 +02:00
Dan Lagnöhed
6aeea1cd9e Trying to find bug... 2013-10-04 13:04:58 +02:00
Dan Lagnöhed
110a8e1f20 Fitnesse infrastructure finished 2013-10-01 13:20:49 +02:00
22fcf5753d Added separate log files for every worker. 2013-09-30 15:00:33 +02:00
b2f7808866 Provided is correct since it is only required for compilation and should not be included as a dependency in the packaged version. 2013-09-30 11:36:54 +02:00
e2745d5530 Updated logging to LOG4J version 2 and split up the logging so there is one each for Spring, Wicket and Hibernate at warning level and one for everything else at info that also includes the aforementioned frameworks so following the flow is easy. 2013-09-30 11:36:14 +02:00
Leo
fae4115b4b updated spring framework 2013-09-26 11:19:37 +02:00
Leo
02dd25c3ab updated QueryDSL and spring data 2013-09-26 11:00:53 +02:00
Leo
e23c82e39a updated hibernate 2013-09-26 10:36:59 +02:00
Dan Lagnöhed
3c9f7b0740 Fitnesse infrastructure continued 2013-09-24 15:05:14 +02:00
Dan Lagnöhed
a2829f8496 Fitnesse infrastructure in place 2013-09-24 11:05:29 +02:00
fred-fri
9fc705790c made it possible to run jetty locally 2013-09-24 15:23:36 +09:00
Dan Lagnöhed
be6f4f8c9b Clean up of pom-files. Ignored some non unit-tests 2013-09-23 08:22:44 +02:00
Dan Lagnöhed
00eb651585 Introduced dependency management in pom-files 2013-09-22 19:36:54 +02:00
99f45b0f0e Moved finalName parameter to where it matters. 2013-09-20 15:42:39 +02:00
47ce3f6753 Whole import rewritten.
Still not importing project participants/authors.
2013-09-20 08:50:31 +02:00
5ec3c88c79 Split SciPro into modules separating view from logic. 2013-09-18 16:13:08 +02:00
3300063294 Updated API code to use the standard jax-rs API instead of the no longer maintained com.sun.jersey.* 2013-09-17 16:50:25 +02:00
55c2782f86 Minor pom cleaning. 2013-09-17 09:41:51 +02:00
Emil Siverhall
648b706777 removed visural dependency from pom.xml 2013-09-17 08:06:40 +02:00
fred-fri
505629fe58 changed pom name 2013-08-21 14:16:11 +09:00
fred-fri
5f96a9541b reset visural in pom to how it was before updates etc 2013-06-28 15:50:44 +09:00
fred-fri
0a06bbbc62 added back visural common to pom, fixes the bug with notifications 2013-06-27 12:10:40 +09:00
fred-fri
72e8a07afb removed unused rome 2013-06-19 15:26:35 +09:00
fred-fri
637d342038 updated jersey 2013-06-19 14:54:58 +09:00
fred-fri
eb7537795b updated visural wicket, removed unused visural common 2013-06-19 13:18:17 +09:00
fred-fri
8a88918948 commented out unused jsoup 2013-06-19 13:02:31 +09:00
fred-fri
3d6154f2f9 updated google guava 2013-06-19 12:49:22 +09:00
fred-fri
620c20112d updated biz base64coder 2013-06-19 12:44:58 +09:00
fred-fri
e05b0491d4 commented out unused javax validation 2013-06-19 12:42:22 +09:00
fred-fri
ef224adeaa updated javamail 2013-06-19 12:40:30 +09:00
fred-fri
75523b5a5b updated gson 2013-06-19 12:23:54 +09:00
fred-fri
923dec350d updated joda time 2013-06-19 12:20:30 +09:00
fred-fri
a78894ae96 updated apache commons lang 2013-06-19 12:09:20 +09:00
fred-fri
31614ff89f updated mockito 2013-06-19 12:02:16 +09:00
fred-fri
3fd525b907 updated junit 2013-06-19 11:54:49 +09:00
fred-fri
b295220bd5 commented out unused jetty 2013-06-19 11:53:54 +09:00
fred-fri
d8cc27e0e5 commented out unused apache commons dbcp 2013-06-19 11:23:46 +09:00
fred-fri
f57b221e1c updated spring data 2013-06-19 11:09:32 +09:00
fred-fri
152e80a65a updated spring 2013-06-19 11:03:07 +09:00
fred-fri
ce73b43442 updated mysqlconnector 2013-06-19 10:58:18 +09:00
fred-fri
b7650a025f updated log4j 2013-06-19 10:57:37 +09:00
fred-fri
343578b401 updated slf4j 2013-06-19 10:53:12 +09:00
fred-fri
d2f7a02b54 commented out unused apache commons codec 2013-06-19 10:36:50 +09:00
635fbc10fa Attempt to fix transitive dependencies involving jackrabbit/rome/jdom (Attempt #2) 2013-03-27 15:48:10 +01:00
16793fdf75 Attempt to fix transitive dependencies involving jackrabbit/rome/jdom 2013-03-27 15:36:00 +01:00
622521f5c6 Hibernate and HSQLDB updated to latest versions.
TestQuerySet ignored due to problems with lazy execution (only tests should be deprecated DAO classes anyway)
Some other DAO tests changed since they relied on an implicit ordering and failed since new version returned in different order.
Stupid backport package gone and imports removed and now uses java.util instead of edu.emory.mathcs.backpart.java.util.
2013-02-28 14:19:20 +01:00
cbd034004d Extracted some interfaces to help cobertura 2013-01-29 15:47:34 +01:00
32a24126a9 Cobertura plugin for code coverage 2013-01-29 14:45:11 +01:00
Jona Ekenberg
2fcd079183 hej 2013-01-18 19:55:18 +01:00
fred-fri
fc2ec00b7d changed wiquery to v 1.2.5 2012-12-11 15:43:12 +01:00
fred-fri
4bad8c665a added classes and methods for checking what profile is active and disabled mail if prod is not on 2012-10-31 14:34:22 +09:00
fred-fri
603162fd1e added an exclusion for wiquerys slf4j 2012-10-19 16:38:15 +09:00
fred-fri
c34b3c0e01 entered the new prod integration id into the pom 2012-09-11 13:18:44 +09:00
fred-fri
d867c948cf added correct prod id 2012-08-10 11:53:34 +09:00
fred-fri
d34f9bc918 trying to set some attributes via pom and ac but it doesnt work 2012-07-30 13:51:08 +09:00
fred-fri
f7df5918d0 fixed some stuff for testing 2012-07-26 15:12:08 +09:00
Emil Siverhall
93472a8075 added google guava dependency to pom.xml. 2012-06-18 12:57:41 +02:00
fred-fri
cc8f92d1da set encoding in maven pom to utf-8, maybe it helps with autocomplete issue 2012-05-25 14:26:26 +09:00
FredrikNorberg
77d51bc678 exports now supports most of the functionality in the api 2012-05-14 16:54:50 +02:00
Niklas Herder
0c20a6961f Add jersey-json dependency, eliminate duplicate deps for jackson. 2012-04-23 14:28:15 +02:00
Niklas Herder
5620dd7221 Merge branch 'develop' of git.dsv.su.se:/git/scipro/scipro into develop 2012-04-02 12:31:32 +02:00
Niklas Herder
f162037a5e Refactoring and simplification of communication with rest API. 2012-04-02 12:29:56 +02:00
Tom Vahlman
5d95b54be6 Added a first test for the statistics panel. 2012-04-02 11:33:44 +02:00
Tom Vahlman
fc90e8d0ef Added spring-roo-repository which makes sorting easier with Spring Data. 2012-03-31 19:28:35 +02:00
Fredrik Friis
07a4506195 think all necessary querydsl stuff has been added to pom now 2012-03-23 16:56:15 +09:00
Fredrik Friis
ab18a33e63 set up project for springdata with a springdata package for repos 2012-03-23 16:21:05 +09:00
Niklas Herder
90c86d81eb Set the application to check for a JNDI datasource first, and use that if it exists (to be able to configure a datasource on the servers instead of in code)
Added Maven profiles:
- DEV for regular development (wicket in 'development' mode, SQL statements logged)
- TEST for deploying to test server (Wicket in 'deployment', SQL statements logged)
- PROD for production (Wicket in deployment, no SQL logging)
2012-03-15 13:09:30 +01:00
Tom Vahlman
49c8782157 Removed a dependency which was commented out. 2012-03-10 13:08:28 +01:00
Tom Vahlman
3410ece02f Removed dependencys to resolve Jenkins build 2012-03-10 13:00:50 +01:00
Tom Vahlman
86148973f9 Added visural framework containing many wicket componentes + added framework for using query expressions, eg. BooleanExpresseion 2012-03-10 11:45:46 +01:00
Tom Vahlman
d16cea6ab9 Adding NotNull annotations for ApplicationPeriods. 2012-02-20 17:31:43 +01:00
Tom Vahlman
c6dfb893ca Forgot to test => rollback 2012-02-20 14:22:08 +01:00
Tom Vahlman
2c8592541b Added the validation-api which makes it possible to use annotations like @NotNull. 2012-02-20 14:14:33 +01:00
Niklas Herder
e12d70060d Commenting out the cargo plugin. Deployment is handled by Jenkins. 2012-02-09 16:25:04 +01:00
Tom Vahlman
7e4ee702fb Added version number to cargo plugin 2012-01-13 13:47:34 +01:00
Robin Eklund
5db567e7b4 Added dependency on external b64 api 2011-12-05 15:34:12 +01:00
Daniel Hasselrot
84130a0454 Increased memory for maven test runner 2011-11-22 11:32:16 +01:00
Daniel Hasselrot
f2b1eac46e Change test to use jsoup 2011-11-14 16:31:19 +01:00
Robin Eklund
707df5e2ff Changes to build dependencies and config files to support automated builds 2011-07-20 17:33:01 +02:00
Robin Eklund
8ecc1dd2c3 Initial adaptations to get a workable build outside of eclipse 2011-07-14 11:05:21 +02:00
mpeters
6146b58826 Autodeploy-plugin konfat samt tillägg av dependency och ny version på
några tidigare dependencies

Change-Id: I65d3389efdca67d9e4020b40d3f884a530f30567
2011-07-05 17:34:48 +02:00
mpeters
a01f33142a Lagt till ett war-plugin som helt plötsligt krävs för att projektet skall byggas utan varningar.
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@1169 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-05-26 16:23:47 +00:00
mpeters
545292bade En trave saker för att hantera mail-events för peer-reviews
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@1119 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-05-12 17:33:20 +00:00
joha-asc
1be2c4cdd7 base64coder
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@1111 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-05-12 13:50:26 +00:00
patr-str
90baeea44e premature 1.4.17
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@1009 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-05-09 08:49:46 +00:00
patr-str
abc3bb0131 wicket.version resp wiquery.version
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@1003 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-05-06 09:44:14 +00:00
mpeters
a76c7c55bf Lagt till finalName
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@978 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-05-05 14:11:57 +00:00
mpeters
408da5b266 Fix av IE9 rendering av wiquery-prylar
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@862 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-05-02 08:22:46 +00:00
frej-app
585913e23c Exjob och personimport vid inlogg.
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@550 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-04-04 08:34:43 +00:00
dan-kjel
895f076d4d Ändrade version på wicket-datetime till 1.4.12
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@443 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-03-24 08:43:44 +00:00
dan-kjel
09e8c51662 Lade till objectautocomplete
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@441 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-03-24 08:37:19 +00:00
mpeters
2b460ed073 Bytt ut några gamla hibernate-komponenter mot nyare versioner och valt en stabil hibernate-core release
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@410 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-03-21 18:23:18 +00:00
mpeters
c086317e1a Början till peer-kod
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@278 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-03-02 16:17:02 +00:00
mpeters
7a9d00f669 Del av jackrabbit-commit
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@197 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-02-21 08:42:56 +00:00
dan-kjel
157420c89d lade till ett wiquery-repository och några wicket-extensions
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@104 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-02-11 08:13:04 +00:00
mpeters
21e164db28 Initial import.
git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@7 73ecded7-942e-4092-bab0-0e58ef0ee984
2011-01-05 14:30:16 +00:00