diff options
Diffstat (limited to 'idrop-web/grails-app/conf')
| -rwxr-xr-x | idrop-web/grails-app/conf/BuildConfig.groovy | 14 | ||||
| -rwxr-xr-x | idrop-web/grails-app/conf/Config.groovy | 2 | ||||
| -rwxr-xr-x | idrop-web/grails-app/conf/spring/resources.groovy | 6 |
3 files changed, 16 insertions, 6 deletions
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy index bfa180a..4faa39c 100755 --- a/idrop-web/grails-app/conf/BuildConfig.groovy +++ b/idrop-web/grails-app/conf/BuildConfig.groovy @@ -28,11 +28,15 @@ grails.project.dependency.resolution = { test 'org.mockito:mockito-all:1.8.1' compile 'commons-io:commons-io:2.1' provided 'junit:junit:4.8.1' - compile ('org.irods.jargon:jargon-core:3.3.1-SNAPSHOT') { excludes ([group:'org.jglobus'])} - compile ('org.irods.jargon:jargon-data-utils:3.3.1-SNAPSHOT') { excludes ([group:'org.jglobus'])} - compile ('org.irods.jargon:jargon-ticket:3.3.1-SNAPSHOT') { excludes ([group:'org.jglobus'])} - compile ('org.irods.jargon:jargon-user-profile:3.3.1-SNAPSHOT') { excludes ([group:'org.jglobus'])} - compile ('org.irods.jargon:jargon-user-tagging:3.3.1-SNAPSHOT') { excludes ([group:'org.jglobus'])} + compile ('org.irods.jargon:jargon-core:3.3.3-SNAPSHOT') { excludes ([group:'org.jglobus'])} + compile ('org.irods.jargon:jargon-data-utils:3.3.3-SNAPSHOT') { excludes ([group:'org.jglobus'])} + compile ('org.irods.jargon:jargon-ticket:3.3.3-SNAPSHOT') { excludes ([group:'org.jglobus'])} + compile ('org.irods.jargon:jargon-user-profile:3.3.3-SNAPSHOT') { excludes ([group:'org.jglobus'])} + compile ('org.irods.jargon:jargon-user-tagging:3.3.3-SNAPSHOT') { excludes ([group:'org.jglobus'])} + compile ('org.irods.jargon:jargon-workflow:3.3.3-SNAPSHOT') { excludes ([group:'org.jglobus'])} + compile ('org.irods.jargon:jargon-ruleservice:3.3.3-SNAPSHOT') { excludes ([group:'org.jglobus'])} + + provided 'javax.servlet:servlet-api:2.5' compile 'org.jsoup:jsoup:0.2.2' diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy index 9b743cc..50d0426 100755 --- a/idrop-web/grails-app/conf/Config.groovy +++ b/idrop-web/grails-app/conf/Config.groovy @@ -48,7 +48,7 @@ environments { idrop.config.idrop.lite.use.applet.dir=false */ -idrop.config.idrop.lite.applet.jar="idrop-lite-2.0.1-SNAPSHOT-jar-with-dependencies.jar" +idrop.config.idrop.lite.applet.jar="idrop-lite-b964-SNAPSHOT-jar-with-dependencies.jar" idrop.config.idrop.lite.codebase="http://iren-web.renci.org/idrop-snapshot" idrop.config.idrop.lite.use.applet.dir=false diff --git a/idrop-web/grails-app/conf/spring/resources.groovy b/idrop-web/grails-app/conf/spring/resources.groovy index 0e15cc8..d7f25e6 100755 --- a/idrop-web/grails-app/conf/spring/resources.groovy +++ b/idrop-web/grails-app/conf/spring/resources.groovy @@ -7,6 +7,8 @@ beans = { sharingService(org.irods.mydrop.service.SharingService) { irodsAccessObjectFactory = ref("irodsAccessObjectFactory") } + ruleProcessingService(org.irods.mydrop.service.RuleProcessingService) { irodsAccessObjectFactory = ref("irodsAccessObjectFactory") } + browseController(org.irods.mydrop.controller.BrowseController) { irodsAccessObjectFactory = ref("irodsAccessObjectFactory") @@ -48,6 +50,10 @@ beans = { homeController(org.irods.mydrop.controller.HomeController) { irodsAccessObjectFactory = ref("irodsAccessObjectFactory") } + + ruleController(org.irods.mydrop.controller.RuleController) { + irodsAccessObjectFactory = ref("irodsAccessObjectFactory") + } shoppingCartController(org.irods.mydrop.controller.ShoppingCartController) { |