summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java2
-rw-r--r--idrop-web/grails-app/conf/Config.groovy9
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy11
-rw-r--r--idrop-web/grails-app/views/browse/browseDetails.gsp2
-rw-r--r--idrop-web/release_notes.txt2
5 files changed, 11 insertions, 15 deletions
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
index 4d82ba5..ec7c1d6 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
@@ -1,4 +1,4 @@
package org.irods.jargon.idrop.lite;
public final class Version {
- public static String VERSION="20121009-1523";
+ public static String VERSION="20121009-1605";
}
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy
index a1ec5bc..95b50a3 100644
--- a/idrop-web/grails-app/conf/Config.groovy
+++ b/idrop-web/grails-app/conf/Config.groovy
@@ -33,7 +33,6 @@ environments {
idrop.config.preset.zone="lifelibZone"
idrop.config.preset.resource="lifelibResc1"
idrop.config.preset.authScheme="Standard"
-
*/
@@ -50,7 +49,7 @@ environments {
idrop.config.idrop.lite.use.applet.dir=false
*/
-idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.2-jar-with-dependencies.jar"
+idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.1-jar-with-dependencies.jar"
idrop.config.idrop.lite.codebase="http://iren-web.renci.org/idrop-release"
idrop.config.idrop.lite.use.applet.dir=false
@@ -155,10 +154,8 @@ grails.validateable.packages = ['org.irods']
// log4j configuration
log4j = {
-
- appenders {
- 'null' name:'stacktrace'
- }
+
+ appenders { 'null' name:'stacktrace' }
root {
warn()
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
index 20dd41c..7eff1f0 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
@@ -4,7 +4,6 @@ import org.irods.jargon.core.connection.IRODSAccount
import org.irods.jargon.core.connection.auth.AuthResponse
import org.irods.jargon.core.exception.JargonException
import org.irods.jargon.core.pub.IRODSAccessObjectFactory
-import org.irods.jargon.core.pub.UserAO
class LoginController {
@@ -62,7 +61,7 @@ class LoginController {
if (presetResource) {
loginCommand.defaultStorageResource = presetResource
}
-
+
if (presetAuthScheme) {
log.info("preset auth scheme is:${presetAuthScheme}")
loginCommand.authMethod = presetAuthScheme
@@ -132,9 +131,9 @@ class LoginController {
loginCommand.zone,
resource)
}
-
+
log.info("login mode: ${loginCommand.authMethod}")
-
+
if (loginCommand.authMethod == "Standard") {
irodsAccount.authenticationScheme = IRODSAccount.AuthScheme.STANDARD
} else if (loginCommand.authMethod == "PAM") {
@@ -148,9 +147,7 @@ class LoginController {
log.info("built irodsAccount:${irodsAccount}")
AuthResponse authResponse
try {
-
- authResponse = irodsAccessObjectFactory.
- // close?
+ authResponse = irodsAccessObjectFactory.authenticateIRODSAccount(irodsAccount)
} catch (JargonException e) {
log.error("unable to authenticate, JargonException", e)
diff --git a/idrop-web/grails-app/views/browse/browseDetails.gsp b/idrop-web/grails-app/views/browse/browseDetails.gsp
index 4d1794c..a869d99 100644
--- a/idrop-web/grails-app/views/browse/browseDetails.gsp
+++ b/idrop-web/grails-app/views/browse/browseDetails.gsp
@@ -46,7 +46,7 @@
</g:if> <g:else>
- <g:link url="${context + '/file/download' + entry.formattedAbsolutePath}">
+ <g:link url="${'file/download' + entry.formattedAbsolutePath}">
${entry.nodeLabelDisplayValue}
</g:link>
</g:else></td>
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index 6ae035a..c92ce9e 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -27,6 +27,8 @@ Note that the following bug and feature requests are logged in GForge with relat
* [#986] hit home in browse tree causes error message when timed out
** fixed lingo-common method that handles json call to check for continue
+*[#1013] null appended to url path in browse view download links
+
==Features==
* [#922] User Profile Management