summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-lite/pom.xml3
-rw-r--r--idrop-lite/release_notes.txt33
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java2
-rw-r--r--idrop-swing/pom.xml2
-rw-r--r--idrop-swing/release_notes.txt6
-rw-r--r--idrop-swing/src/main/resources/idrop.properties4
-rw-r--r--idrop-web/application.properties8
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy10
-rw-r--r--idrop-web/grails-app/conf/Config.groovy12
-rw-r--r--idrop-web/release_notes.txt8
-rw-r--r--idrop-web/web-app/css/main.css4
-rw-r--r--idrop-web/web-app/images/grails_logo.jpgbin0 -> 8065 bytes
-rw-r--r--idrop-web/web-app/images/grails_logo.pngbin0 -> 10172 bytes
-rw-r--r--idrop-web/web-app/images/springsource.pngbin0 -> 9109 bytes
-rw-r--r--pom.xml4
15 files changed, 64 insertions, 32 deletions
diff --git a/idrop-lite/pom.xml b/idrop-lite/pom.xml
index a6a3986..e2855fd 100644
--- a/idrop-lite/pom.xml
+++ b/idrop-lite/pom.xml
@@ -4,13 +4,12 @@
<parent>
<artifactId>idrop</artifactId>
<groupId>org.irods</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
</parent>
<groupId>org.irods.idrop</groupId>
<artifactId>idrop-lite</artifactId>
<packaging>jar</packaging>
<name>idrop-lite</name>
- <version>1.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>junit</groupId>
diff --git a/idrop-lite/release_notes.txt b/idrop-lite/release_notes.txt
new file mode 100644
index 0000000..bbb140b
--- /dev/null
+++ b/idrop-lite/release_notes.txt
@@ -0,0 +1,33 @@
+
+*'''Project''': iDrop-lite transfer applet
+*'''Date''': 08/28/2012
+*'''Release Version''': 1.0.1
+*'''git tag''': 1.0.1
+*'''download jar with dependencies (run java -jar jarname)''': https://code.renci.org/gf/project/irodsidrop/frs/?action=FrsReleaseBrowse&frs_package_id=4
+
+NOTE: the release notes were not yet in place for this project, going forward bugs and features addressed will be reflected here
+
+==News==
+
+This is the iDrop lite applet plug in that allows transfers between client and server using a direct iRODS protocol connection
+
+GForge for iDrop-swing is at: [[https://code.renci.org/gf/project/irodsidrop/]]
+
+==Requirements==
+
+-iDrop depends on Java 1.6+
+-iDrop is built using Maven
+
+iDrop-swing uses Maven for dependency management. See the pom.xml file for references to various dependencies.
+
+Note that the following bug and feature requests are logged in GForge with related commit information [[https://code.renci.org/gf/project/irodsidrop/tracker/]]
+
+==Bug Fixes==
+
+==Features==
+
+==Outstanding Issues==
+
+Please consult [[https://code.renci.org/gf/project/irodsidrop/tracker/]]
+
+for the latest open bugs and Jargon feature requests
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 c4f4021..d47996e 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="20120820-1410";
+ public static String VERSION="20120828-1247";
}
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index 4d43328..866eb9a 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.irods</groupId>
<artifactId>idrop</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.irods.idrop</groupId>
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt
index 1a6fc41..ab5b1ea 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -1,8 +1,8 @@
*'''Project''': iDrop-swing- Desktop iRODS transfer manager
-*'''Date''': 03/28/2012
-*'''Release Version''': 1.0.1 SNAPSHOT
-*'''git tag''': 1.0.1 TBD
+*'''Date''': 08/28/2012
+*'''Release Version''': 1.0.1
+*'''git tag''': 1.0.1
*'''download jar with dependencies (run java -jar jarname)''': https://code.renci.org/gf/project/irodsidrop/frs/?action=FrsReleaseBrowse&frs_package_id=4
==News==
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index a4bca0f..4ab949d 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -1,7 +1,7 @@
idrop.version=1.0.1
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/application.properties b/idrop-web/application.properties
index a8476a5..7405b59 100644
--- a/idrop-web/application.properties
+++ b/idrop-web/application.properties
@@ -1,9 +1,9 @@
#Grails Metadata file
-#Wed Apr 25 08:44:16 EDT 2012
-app.grails.version=2.0.3
+#Thu Aug 23 07:32:11 EDT 2012
+app.grails.version=2.0.4
app.name=idrop-web
app.servlet.version=2.5
app.version=1.0.1
-plugins.hibernate=2.0.3
+plugins.hibernate=2.0.4
plugins.logging=0.1
-plugins.tomcat=2.0.3
+plugins.tomcat=2.0.4
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index 42e6558..259d4c5 100644
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -29,11 +29,11 @@ grails.project.dependency.resolution = {
test 'org.mockito:mockito-all:1.8.1'
compile 'commons-io:commons-io:2.1'
provided 'junit:junit:4.8.1'
- compile 'org.irods.jargon:jargon-core:3.2.0-SNAPSHOT'
- compile 'org.irods.jargon:jargon-security:3.2.0-SNAPSHOT'
- compile 'org.irods.jargon:jargon-data-utils:3.2.0-SNAPSHOT'
- compile 'org.irods.jargon:jargon-ticket:3.2.0-SNAPSHOT'
- compile ('org.irods.jargon:jargon-user-tagging:3.2.0-SNAPSHOT') { exclude 'junit' }
+ compile 'org.irods.jargon:jargon-core:3.1.4'
+ compile 'org.irods.jargon:jargon-security:3.1.3'
+ compile 'org.irods.jargon:jargon-data-utils:3.1.4'
+ compile 'org.irods.jargon:jargon-ticket:3.1.4'
+ compile ('org.irods.jargon:jargon-user-tagging:3.1.4') { exclude 'junit' }
compile 'org.springframework.security:spring-security-core:3.0.5.RELEASE'
compile 'org.springframework.security:spring-security-web:3.0.5.RELEASE'
compile 'org.springframework.security:spring-security-config:3.0.5.RELEASE'
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy
index 83ca910..b9bbefa 100644
--- a/idrop-web/grails-app/conf/Config.groovy
+++ b/idrop-web/grails-app/conf/Config.groovy
@@ -47,8 +47,8 @@ environments {
idrop.config.idrop.lite.use.applet.dir=false
*/
-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.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
/*
@@ -62,7 +62,7 @@ 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"
+idrop.config.idrop.jnlp="http://iren-web.renci.org/idrop-release/idrop.jnlp"
/*
* 5) Customization properties
*/
@@ -176,10 +176,10 @@ log4j = {
'net.sf.ehcache.hibernate'
warn 'org.irods.mydrop'
- debug 'org.irods.jargon'
- debug 'org.irods.jargon.spring.security'
+ warn 'org.irods.jargon'
+ warn 'org.irods.jargon.spring.security'
warn 'org.springframework'
- debug 'grails.app'
+ info 'grails.app'
warn 'org.mortbay.log',
'grails.app.controller',
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index 0b2473e..d895585 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -1,11 +1,11 @@
*'''Project''': idrop-web
-*'''Date''': 07/28/2012
-*'''Release Version''': 1.0.1-SNAPSHOT
-*'''git tag''': XXXX
+*'''Date''': 08/28/2012
+*'''Release Version''': 1.0.1
+*'''git tag''': 1.0.1
==News==
-This is a beta release of iDrop web version 1.0.1
+This is a release of iDrop web version 1.0.1
==Requirements==
diff --git a/idrop-web/web-app/css/main.css b/idrop-web/web-app/css/main.css
index 8e2a4ae..bc8f384 100644
--- a/idrop-web/web-app/css/main.css
+++ b/idrop-web/web-app/css/main.css
@@ -143,8 +143,8 @@ div#tabs { /*width: 100%;
padding: 0;
margin-left: auto;
margin-right: auto;
- /*background: #fff url(../images/iDropLogo.png) left center no-repeat;*/
- background: #fff url(../images/Lifetime-Library.png) left center no-repeat;
+ background: #fff url(../images/iDropLogo.png) left center no-repeat;
+ /*background: #fff url(../images/Lifetime-Library.png) left center no-repeat;*/
display: inline-block;
position: relative;
}
diff --git a/idrop-web/web-app/images/grails_logo.jpg b/idrop-web/web-app/images/grails_logo.jpg
new file mode 100644
index 0000000..8be657c
--- /dev/null
+++ b/idrop-web/web-app/images/grails_logo.jpg
Binary files differ
diff --git a/idrop-web/web-app/images/grails_logo.png b/idrop-web/web-app/images/grails_logo.png
new file mode 100644
index 0000000..9836b93
--- /dev/null
+++ b/idrop-web/web-app/images/grails_logo.png
Binary files differ
diff --git a/idrop-web/web-app/images/springsource.png b/idrop-web/web-app/images/springsource.png
new file mode 100644
index 0000000..e806d00
--- /dev/null
+++ b/idrop-web/web-app/images/springsource.png
Binary files differ
diff --git a/pom.xml b/pom.xml
index e19657c..b8ff688 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
<groupId>org.irods</groupId>
<artifactId>idrop</artifactId>
<packaging>pom</packaging>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
<name>iRODS iDrop</name>
<description>iRODS iDrop - personal web and desktop grid access clients</description>
<url>https://code.renci.org/gf/project/irodsidrop/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jargon.version>3.1.3</jargon.version>
+ <jargon.version>3.1.4</jargon.version>
<spring.core.version>3.0.5.RELEASE</spring.core.version>
<commons.io.version>2.0.1</commons.io.version>
<netbeans.version>RELEASE711</netbeans.version>