Merge branch 'master' of ssh://code.renci.org/gitroot/irodsidrop

7 files changed, 13 insertions, 18 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 6a0e49c..ad7048b 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="20120630-0852";
+ public static String VERSION="20120703-0823";
 }
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 213d6a5..4ab949d 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -1,4 +1,4 @@
-idrop.version=3.1.0.0
+idrop.version=1.0.1
 policy.aware=false
 login.preset=false
 force.mode=false
@@ -12,12 +12,12 @@ idrop.lookandfeel=System
 transfer.database=transferDatabase
 device.name=
 
-transferengine.record.successful.files=true
+transferengine.record.successful.files=false
 
-#login.preset.host=localhost
-#login.preset.zone=test1
-#login.preset.resource=test1-resc
-#login.preset.port=1247
+login.preset.host=diamond.ils.unc.edu
+login.preset.zone=lifelibZone
+login.preset.resource=lifelibResc1
+login.preset.port=2247
 # comment the following property to turn off rolling log file in users .idrop directory, or set to a valid log level
 rolling.log.level=INFO
 
diff --git a/idrop-swing/src/main/resources/log4j.properties b/idrop-swing/src/main/resources/log4j.properties
index 51e0fb1..59e1db6 100644
--- a/idrop-swing/src/main/resources/log4j.properties
+++ b/idrop-swing/src/main/resources/log4j.properties
@@ -1,7 +1,7 @@
 # Set root logger level to DEBUG and its only appender to A1.
 #log4j.rootCategory=WARN, A1
 log4j.category.org.irods.jargon.idrop=INFO, A1
-log4j.category.org.irods.jargon.core= DEBUG, A1
+log4j.category.org.irods.jargon.core= INFO, A1
 log4j.categor.org.irods.jargon.usertagging=ERROR,A1
 log4j.category.org.irods.jargon.transfer=WARN, A1
 log4j.category.org.irods.jargon.datautils=WARN
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy
index 7dc4ed5..3b78807 100644
--- a/idrop-web/grails-app/conf/Config.groovy
+++ b/idrop-web/grails-app/conf/Config.groovy
@@ -16,7 +16,7 @@ environments {
 	 production {  grails.serverURL = "http://www.irods.org" } */
 	production {  grails.serverURL = "http://iren-web.renci.org:8080/${appName}" }
 	development { grails.serverURL = "http://localhost:8080/${appName}" }
-	test {  grails.serverURL = "http://localhost:8080/${appName}"  }
+	test { grails.serverURL = "http://localhost:8080/${appName}" }
 }
 
 /*
@@ -42,7 +42,7 @@ environments {
  idrop.config.idrop.lite.use.applet.dir=false
  */
 
-idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.0-SNAPSHOT-jar-with-dependencies.jar"
+idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.1-SNAPSHOT-jar-with-dependencies.jar"
 idrop.config.idrop.lite.codebase="http://iren-web.renci.org/idrop-web/applet"
 idrop.config.idrop.lite.use.applet.dir=false
 
@@ -56,8 +56,8 @@ idrop.config.idrop.lite.use.applet.dir=false
  */
 
 //idrop.config.idrop.jnlp="http://iren-web.renci.org:8080/idrop/idrop.jnlp"
+//drop.config.idrop.jnlp="http://iren-web.renci.org/idrop-snapshot/idrop.jnlp"
 idrop.config.idrop.jnlp="http://iren-web.renci.org/idrop-snapshot/idrop.jnlp"
-
 /*
  * 5) Customization properties
  */
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
index 1c73263..fcc6a16 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/BrowseController.groovy
@@ -138,11 +138,6 @@ class BrowseController {
 				parent = "/"
 			}
 
-			// display a root node
-
-			// display a root node
-			parent = "/"
-
 			icon = "folder"
 			state = "closed"
 			type = "folder"
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 44af4b9..b4a79ff 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
@@ -47,7 +47,7 @@ class LoginController {
 		}
 
 		if (presetPort) {
-			loginCommand.port = presetPort
+			loginCommand.port = Integer.parseInt(presetPort)
 		} else {
 			loginCommand.port = 1247
 		}
diff --git a/idrop-web/grails-app/views/login/login.gsp b/idrop-web/grails-app/views/login/login.gsp
index 12ecc8f..94e53e3 100644
--- a/idrop-web/grails-app/views/login/login.gsp
+++ b/idrop-web/grails-app/views/login/login.gsp
@@ -46,7 +46,7 @@
 							<g:hiddenField

 							name="zone" id="zone" value="${loginCommand.zone}"/>

 					   <g:hiddenField

-							name="resource" id="resource" value="${loginCommand.defautStorageResoruce}"/>

+							name="resource" id="resource" value="${loginCommand.defaultStorageResource}"/>

 				</g:if>

 				<g:else>

 						<div>