summaryrefslogtreecommitdiffstats
path: root/idrop-web
diff options
context:
space:
mode:
authorMike Conway <mikeconway@dhcp152-54-6-70.wireless.europa.renci.org>2011-08-03 18:56:51 (GMT)
committer Mike Conway <mikeconway@dhcp152-54-6-70.wireless.europa.renci.org>2011-08-03 18:56:51 (GMT)
commit9193f88515c886c277757de726a064ca21fe696f (patch)
treef5f01691c1766b8f6c46673061b4461da7e06946 /idrop-web
parent2ce0b9f841e33686180679ab5fc021a14e2e41d2 (diff)
downloadQCG-Data-9193f88515c886c277757de726a064ca21fe696f.zip
QCG-Data-9193f88515c886c277757de726a064ca21fe696f.tar.gz
QCG-Data-9193f88515c886c277757de726a064ca21fe696f.tar.bz2
fixup grails to 1.3.7 and other small tweaks
Diffstat (limited to 'idrop-web')
-rw-r--r--idrop-web/application.properties2
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/SearchController.groovy3
-rw-r--r--idrop-web/pom.xml8
-rw-r--r--idrop-web/web-app/WEB-INF/applicationContext.xml2
4 files changed, 9 insertions, 6 deletions
diff --git a/idrop-web/application.properties b/idrop-web/application.properties
index e1ec6d8..e9a09d3 100644
--- a/idrop-web/application.properties
+++ b/idrop-web/application.properties
@@ -3,7 +3,7 @@
app.grails.version=1.3.7
app.name=idrop-web
app.servlet.version=2.4
-app.version=0.9.1-SNAPSHOT
+app.version=0.9.8-SNAPSHOT
plugins.acegi=0.5.3.2
plugins.hibernate=1.3.7
plugins.tomcat=1.3.7
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/SearchController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/SearchController.groovy
index ebeec7c..dfd1f3e 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/SearchController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/SearchController.groovy
@@ -7,7 +7,8 @@ import org.irods.jargon.usertagging.FreeTaggingService
import org.irods.jargon.usertagging.TaggingServiceFactory
import org.irods.jargon.usertagging.domain.TagQuerySearchResult
import org.springframework.security.core.context.SecurityContextHolder
-import org.irods.jargon.usertagging.TaggingServiceFactory
+import org.irods.jargon.core.pub.IRODSAccessObjectFactory
+
class SearchController {
diff --git a/idrop-web/pom.xml b/idrop-web/pom.xml
index aca3330..e6d8acd 100644
--- a/idrop-web/pom.xml
+++ b/idrop-web/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.irods</groupId>
<artifactId>idrop</artifactId>
- <version>0.9.1-SNAPSHOT</version>
+ <version>0.9.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.irods</groupId>
@@ -16,18 +16,18 @@
<dependency>
<groupId>org.grails</groupId>
<artifactId>grails-bootstrap</artifactId>
- <version>1.3.6</version>
+ <version>1.3.7</version>
</dependency>
<dependency>
<groupId>org.grails</groupId>
<artifactId>grails-crud</artifactId>
- <version>1.3.6</version>
+ <version>1.3.7</version>
</dependency>
<dependency>
<groupId>org.grails</groupId>
<artifactId>grails-gorm</artifactId>
- <version>1.3.6</version>
+ <version>1.3.7</version>
</dependency>
<!-- Needed in the case of AOP usage -->
diff --git a/idrop-web/web-app/WEB-INF/applicationContext.xml b/idrop-web/web-app/WEB-INF/applicationContext.xml
index 6f42796..1a415bf 100644
--- a/idrop-web/web-app/WEB-INF/applicationContext.xml
+++ b/idrop-web/web-app/WEB-INF/applicationContext.xml
@@ -4,6 +4,8 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+<import resource="classpath:**/resources.xml" />
+
<bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean">
<description>Grails application factory bean</description>
<property name="grailsDescriptor" value="/WEB-INF/grails.xml" />