summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-03-19 18:17:21 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-03-19 18:17:21 (GMT)
commit35b31362b2ef33a0d7edd41d6c2e06c6027abf16 (patch)
tree039e3374730029dca232682d0d670060969a81ce
parentc7bc1597018057178c397dae5e86ca61ad5d65aa (diff)
downloadQCG-Data-35b31362b2ef33a0d7edd41d6c2e06c6027abf16.zip
QCG-Data-35b31362b2ef33a0d7edd41d6c2e06c6027abf16.tar.gz
QCG-Data-35b31362b2ef33a0d7edd41d6c2e06c6027abf16.tar.bz2
[#651] LL - minor cleanups and 3.1 release activities
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java2
-rw-r--r--idrop-swing/release_notes.txt8
-rw-r--r--idrop-swing/src/main/resources/idrop.properties4
-rw-r--r--idrop-web/grails-app/conf/Config.groovy21
-rw-r--r--idrop-web/grails-app/views/common/_secondarymain.gsp2
5 files changed, 19 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 14a3fe6..6fe049f 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="20120314-1452";
+ public static String VERSION="20120319-0824";
}
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt
index 5fa1958..59e7e41 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -80,15 +80,7 @@ iRODS iDrop > cannot delete a synchronization 2011-09-28 20:36:33
iRODS iDrop > idrop startup error with numberformatexception 2011-10-31 12:19:47
iRODS iDrop > Upload errors from win 2012-01-02 14:51:26
iRODS iDrop > for strict acl mode show home dir as root in tree 2012-01-11 11:23:50
-iRODS iDrop > Applet hangs at start up upload in mode 2 2012-01-11 15:12:46
iRODS iDrop > sizing of browse table in various browsers - no scrolls 2012-01-17 15:24:38
-iRODS iDrop > error mode2 upload from idrop-web 2012-01-04 10:07:18
-iRODS iDrop > Progress bars flash 100% complete before doing actual transfer 2012-01-06 10:18:26
-iRODS iDrop > error retrieving shopping cart idrop lite 2012-01-10 12:59:42
-iRODS iDrop > stack traces initial load mode '2' 2012-01-11 14:49:39
-iRODS iDrop > error via stack trace post upload of file mode 2 2012-01-11 14:50:33
-iRODS iDrop > Applet hangs at start up upload in mode 2 2012-01-11 15:12:46
-iRODS iDrop > post add/refresh issues
==Features==
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 92dca13..5bec846 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -1,6 +1,6 @@
policy.aware=false
-login.preset=true
-force.mode=true
+login.preset=false
+force.mode=false
force.no.synch=false
advanced.view=true
show.startup=true
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy
index 08997f5..68a4e2c 100644
--- a/idrop-web/grails-app/conf/Config.groovy
+++ b/idrop-web/grails-app/conf/Config.groovy
@@ -10,7 +10,6 @@
}
*/
-// config properties that can be externalized
/*
*
* add the following group of properties to present a user id/password only login
@@ -19,16 +18,26 @@
idrop.config.preset.port="2247"
idrop.config.preset.zone="lifelibZone"
idrop.config.preset.resource="lifelibResc1"
+ * idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.0-SNAPSHOT-jar-with-dependencies.jar"
+ idrop.config.idrop.lite.codebase="http://iren-web.renci.org/idrop-web/applet"
+ idrop.config.idrop.jnlp="http://iren-web.renci.org:8080/idrop/idrop.jnlp"
+ *
*/
-
-// required properties for idrop lite
idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.0-SNAPSHOT-jar-with-dependencies.jar"
idrop.config.idrop.lite.codebase="http://iren-web.renci.org/idrop-web/applet"
+idrop.config.idrop.jnlp="http://iren-web.renci.org:8080/idrop/idrop.jnlp"
idrop.config.idrop.lite.use.applet.dir=false
-/*idrop.config.preset.host="diamond.ils.unc.edu"
+/*
+ * ll config
+ idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.0-SNAPSHOT-jar-with-dependencies.jar"
+ idrop.config.idrop.lite.codebase="https://lifetime-library.ils.unc.edu/llclient"
+ idrop.config.preset.host="diamond.ils.unc.edu"
idrop.config.preset.port="2247"
idrop.config.preset.zone="lifelibZone"
- idrop.config.preset.resource="lifelibResc1"*/
+ idrop.config.preset.resource="lifelibResc1"
+ idrop.config.idrop.lite.use.applet.dir=false
+ idrop.config.idrop.jnlp="https://lifetime-library.ils.unc.edu/llclient/idrop.jnlp"
+ */
grails.project.groupId = org.irods.mydrop // change this to alter the default package name and Maven publishing destination
grails.mime.file.extensions = true // enables the parsing of file extensions from URLs into the request format
@@ -80,7 +89,7 @@ grails.validateable.packages = ['org.irods']
// set per-environment serverURL stem for creating absolute links
environments {
- production { grails.serverURL = "http://emerald.ils.unc.edu:8080/${appName}" }
+ production { grails.serverURL = "http://lifetime-library.ils.unc.edu/${appName}" }
development { grails.serverURL = "http://localhost:8080/${appName}" }
test { grails.serverURL = "http://localhost:8080/${appName}" }
}
diff --git a/idrop-web/grails-app/views/common/_secondarymain.gsp b/idrop-web/grails-app/views/common/_secondarymain.gsp
index 365cbee..872c872 100644
--- a/idrop-web/grails-app/views/common/_secondarymain.gsp
+++ b/idrop-web/grails-app/views/common/_secondarymain.gsp
@@ -41,7 +41,7 @@ $(document).ready(function() {
// using JavaScript to get location of JNLP file relative to HTML page
//var url = "http://irendb.renci.org:8080/idrop/launchIDrop.html";
//deployJava.createWebStartLaunchButton(url, '1.6.0');
- </script><a onmouseover="window.status=''; return true;" href="javascript:if (!deployJava.isWebStartInstalled(&quot;1.6.0&quot;)) {if (deployJava.installLatestJRE()) {if (deployJava.launch(&quot;http://iren-web.renci.org:8080/idrop/idrop.jnlp&quot;)) {}}} else {if (deployJava.launch(&quot;http://iren-web.renci.org:8080/idrop/idrop.jnlp&quot;)) {}}"><img border="0" src="http://java.sun.com/products/jfc/tsc/articles/swing2d/webstart.png"></a>
+ </script><a onmouseover="window.status=''; return true;" href="javascript:if (!deployJava.isWebStartInstalled(&quot;1.6.0&quot;)) {if (deployJava.installLatestJRE()) {if (deployJava.launch(&quot;${grailsApplication.config.idrop.config.idrop.jnlp}&quot;)) {}}} else {if (deployJava.launch(&quot;${grailsApplication.config.idrop.config.idrop.jnlp}&quot;)) {}}"><img border="0" src="http://java.sun.com/products/jfc/tsc/articles/swing2d/webstart.png"></a>
</div>
<div id="tabs-4">
<div id="cartFileDetails"><!-- cart file details div --></div>