summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@dhcp152-54-6-70.wireless.europa.renci.org>2011-07-01 19:53:08 (GMT)
committer Mike Conway <mikeconway@dhcp152-54-6-70.wireless.europa.renci.org>2011-07-01 19:53:08 (GMT)
commit4a280fc1b84cd5a56f75448c23cfd47f332d767c (patch)
treeb91836fd999d69315c283beb54c258d22b4b2617
parent4f60dcfc5ffe1438586bf9813777e3e0fa1923ea (diff)
downloadQCG-Data-4a280fc1b84cd5a56f75448c23cfd47f332d767c.zip
QCG-Data-4a280fc1b84cd5a56f75448c23cfd47f332d767c.tar.gz
QCG-Data-4a280fc1b84cd5a56f75448c23cfd47f332d767c.tar.bz2
tsting web with idrop lite applet
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy1
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/IdropLiteController.groovy7
-rw-r--r--idrop-web/grails-app/views/idropLite/appletLoader.gsp2
3 files changed, 9 insertions, 1 deletions
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index 27c7fa5..45a73ae 100644
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -31,6 +31,7 @@ grails.project.dependency.resolution = {
provided 'junit:junit:4.8.1'
compile 'org.irods.jargon:jargon-core:2.4.1-SNAPSHOT'
compile 'org.irods.jargon:jargon-security:2.4.1-SNAPSHOT'
+ compile 'org.irods.jargon:jargon-data-utils:2.4.1-SNAPSHOT'
compile ('org.irods.jargon:jargon-user-tagging:2.4.1-SNAPSHOT') {
exclude 'junit'
}
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/IdropLiteController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/IdropLiteController.groovy
index 48a8a36..daeba60 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/IdropLiteController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/IdropLiteController.groovy
@@ -8,6 +8,8 @@ import org.irods.jargon.core.exception.JargonRuntimeException
import org.irods.jargon.core.pub.IRODSAccessObjectFactory
import org.irods.jargon.core.pub.UserAO
import org.springframework.security.core.context.SecurityContextHolder
+import org.irods.jargon.datautils.datacache.DataCacheService
+import org.irods.jargon.datautils.datacache.DataCacheServiceImpl
@@ -43,6 +45,11 @@ class IdropLiteController {
UserAO userAO = irodsAccessObjectFactory.getUserAO(irodsAccount)
def password = userAO.getTemporaryPasswordForConnectedUser()
+ DataCacheService dataCacheService = new DataCacheServiceImpl();
+ dataCacheService.irodsAccessObjectFactory = irodsAccessObjectFactory
+ dataCacheService.irodsAccount = irodsAccount
+ dataCacheService.putStringValueIntoCache(irodsAccount.password, password)
+
log.info "temporary user password is: ${password}"
render(view:"appletLoader", model:[password:password, account:irodsAccount, absPath:absPath])
diff --git a/idrop-web/grails-app/views/idropLite/appletLoader.gsp b/idrop-web/grails-app/views/idropLite/appletLoader.gsp
index ee2be57..e38239b 100644
--- a/idrop-web/grails-app/views/idropLite/appletLoader.gsp
+++ b/idrop-web/grails-app/views/idropLite/appletLoader.gsp
@@ -1,5 +1,5 @@
<div>
-<applet archive="idrop-lite-1.0-SNAPSHOT-jar-with-dependencies.jar" code="iDropLiteApplet.class?" width="400" height="300">
+<applet archive="idrop-lite-1.0-SNAPSHOT.jar" code="org.irods.jargon.idrop.lite.iDropLiteApplet" width="400" height="300">
<param name="host" value="${account.host}" />
<param name="port" value="${account.port}" />
<param name="zone" value="${account.zone}" />