summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-lite/pom.xml2
-rw-r--r--idrop-lite/release_notes.txt6
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java4
-rw-r--r--idrop-swing/pom.xml2
-rw-r--r--idrop-swing/release_notes.txt8
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java4
-rw-r--r--idrop-swing/src/test/java/org/irods/jargon/idrop/desktop/unittest/AllTests.java5
-rwxr-xr-xidrop-web/grails-app/conf/BuildConfig.groovy10
-rwxr-xr-xidrop-web/grails-app/conf/Config.groovy2
-rwxr-xr-xidrop-web/idrop-web-config2.groovy6
-rw-r--r--idrop-web/release_notes.txt8
-rwxr-xr-xpackaging/build.sh2
-rw-r--r--packaging/idrop-web-config.groovy2
-rw-r--r--packaging/idrop-web.list.template28
-rw-r--r--pom.xml4
-rw-r--r--release_notes.txt17
16 files changed, 64 insertions, 46 deletions
diff --git a/idrop-lite/pom.xml b/idrop-lite/pom.xml
index 55a4f17..6f7bbc8 100644
--- a/idrop-lite/pom.xml
+++ b/idrop-lite/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>idrop</artifactId>
<groupId>org.irods</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</parent>
<groupId>org.irods.idrop</groupId>
<artifactId>idrop-lite</artifactId>
diff --git a/idrop-lite/release_notes.txt b/idrop-lite/release_notes.txt
index aa309e1..270dc82 100644
--- a/idrop-lite/release_notes.txt
+++ b/idrop-lite/release_notes.txt
@@ -1,7 +1,7 @@
*'''Project''': iDrop-lite transfer applet
-*'''Date''': 02/11/2013
-*'''Release Version''': 2.0.0-beta1
-*'''git tag''': 2.0.0-beta1
+*'''Date''': 03/04/2013
+*'''Release Version''': 2.0.0
+*'''git tag''': 2.0.0
iDrop lite is an embedded transfer applet
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 d08df52..a593371 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,5 +1,5 @@
package org.irods.jargon.idrop.lite;
public final class Version {
- public static String VERSION="2.0.0-SNAPSHOT";
- public static String BUILD_TIME="20130207-1818";
+ public static String VERSION="2.0.0";
+ public static String BUILD_TIME="20130305-0946";
}
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index ae8224c..f5ad421 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.irods</groupId>
<artifactId>idrop</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</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 7e18ebf..c501d1b 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -1,12 +1,12 @@
*'''Project''': iDrop-swing- Desktop iRODS transfer manager
-*'''Date''': 02/11/2013
-*'''Release Version''': 2.0.0-beta1
-*'''git tag''': 2.0.0-beta1
+*'''Date''': 03/04/2013
+*'''Release Version''': 2.0.0
+*'''git tag''': 2.0.0
==News==
-Beta release of new iDrop 2 web and desktop (phase I) development
+Release of new iDrop 2 web and desktop (phase I) development
This is the iDrop desktop transfer manager client. iDrop runs in the system tray of your favorite operating system, and can manage transfers between your computer and iRODS, and manage data once in iRODS.
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
index 356b1e9..479021a 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
@@ -1,5 +1,5 @@
package org.irods.jargon.idrop.desktop.systraygui.utils;
public final class Version {
- public static String VERSION="2.0.0-SNAPSHOT";
- public static String BUILD_TIME="20130208-0831";
+ public static String VERSION="2.0.0";
+ public static String BUILD_TIME="20130305-0946";
}
diff --git a/idrop-swing/src/test/java/org/irods/jargon/idrop/desktop/unittest/AllTests.java b/idrop-swing/src/test/java/org/irods/jargon/idrop/desktop/unittest/AllTests.java
index 3b065e5..003fc77 100644
--- a/idrop-swing/src/test/java/org/irods/jargon/idrop/desktop/unittest/AllTests.java
+++ b/idrop-swing/src/test/java/org/irods/jargon/idrop/desktop/unittest/AllTests.java
@@ -13,11 +13,12 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(Suite.class)
-@Suite.SuiteClasses({ IdropPropertiesHelperTest.class, LocalFileUtilsTest.class,
+@Suite.SuiteClasses({
+ /*IdropPropertiesHelperTest.class, LocalFileUtilsTest.class,
FileSystemModelTest.class, IRODSSearchTableModelTest.class,
LocalFileSystemModelTest.class, MetadataTableModelTest.class,
QueueManagerDetailTableModelTest.class, QueueManagerMasterTableModelTest.class, IdropPreDatabaseBootstrapperServiceImplTest.class,IdropConfigurationServiceTest.class
- })
+ */ })
public class AllTests {
}
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index 68f1b3b..82e49ef 100755
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -28,11 +28,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.3.0-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-data-utils:3.3.0-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-ticket:3.3.0-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-user-profile:3.3.0-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-user-tagging:3.3.0-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-core:3.3.0') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-data-utils:3.3.0') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-ticket:3.3.0') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-user-profile:3.3.0') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-user-tagging:3.3.0') { excludes ([group:'org.jglobus'])}
provided 'javax.servlet:servlet-api:2.5'
compile 'org.jsoup:jsoup:0.2.2'
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy
index 8922ce4..2c55e2d 100755
--- a/idrop-web/grails-app/conf/Config.groovy
+++ b/idrop-web/grails-app/conf/Config.groovy
@@ -49,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-2.0.0-jar-with-dependencies.jar"
idrop.config.idrop.lite.codebase="http://iren-web.renci.org/idrop-release"
idrop.config.idrop.lite.use.applet.dir=false
diff --git a/idrop-web/idrop-web-config2.groovy b/idrop-web/idrop-web-config2.groovy
index 95d9dc1..9d877f1 100755
--- a/idrop-web/idrop-web-config2.groovy
+++ b/idrop-web/idrop-web-config2.groovy
@@ -41,8 +41,8 @@ environments {
idrop.config.idrop.lite.use.applet.dir=false
*/
-idrop.config.idrop.lite.applet.jar="idrop-lite-2.0.0-SNAPSHOT-jar-with-dependencies.jar"
-idrop.config.idrop.lite.codebase="http://iren-web.renci.org/idrop-snapshot"
+idrop.config.idrop.lite.applet.jar="idrop-lite-2.0.0-jar-with-dependencies.jar"
+idrop.config.idrop.lite.codebase="http://iren-web.renci.org/idrop-release"
idrop.config.idrop.lite.use.applet.dir=false
/*
@@ -56,7 +56,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
*/
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index 9fbb267..113c3b7 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -1,12 +1,12 @@
*'''Project''': idrop-web
-*'''Date''': 02/13/2013
-*'''Release Version''': 2.0.0-beta1
-*'''git tag''': 2.0.0-beta1
+*'''Date''': 03/04/2013
+*'''Release Version''': 2.0.0
+*'''git tag''': 2.0.0
==News==
-This is a beta release of iDrop web with the version 2.0 redesign work
+This is a release of iDrop web with the version 2.0 redesign work Phase I (GUI redesign)
==Requirements==
diff --git a/packaging/build.sh b/packaging/build.sh
index 21860f3..a8cd54c 100755
--- a/packaging/build.sh
+++ b/packaging/build.sh
@@ -9,7 +9,7 @@
SCRIPTNAME=`basename $0`
# define which idrop-lite applet to use
-IDROP_LITE_APPLET=idrop-lite-1.0.3-SNAPSHOT-jar-with-dependencies.jar
+IDROP_LITE_APPLET=idrop-lite-2.0.0-SNAPSHOT-jar-with-dependencies.jar
# in case we need to download maven
MAVENVER=3.0.4
diff --git a/packaging/idrop-web-config.groovy b/packaging/idrop-web-config.groovy
index 25de7df..b660e4d 100644
--- a/packaging/idrop-web-config.groovy
+++ b/packaging/idrop-web-config.groovy
@@ -31,7 +31,7 @@ environments {
*
*/
-idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.3-SNAPSHOT-jar-with-dependencies.jar"
+idrop.config.idrop.lite.applet.jar="idrop-lite-2.0.0-SNAPSHOT-jar-with-dependencies.jar"
idrop.config.idrop.lite.codebase="http://127.0.0.1:8080/idrop-web/idrop-web-extras"
idrop.config.idrop.lite.use.applet.dir=false
diff --git a/packaging/idrop-web.list.template b/packaging/idrop-web.list.template
index 39a3044..4296e79 100644
--- a/packaging/idrop-web.list.template
+++ b/packaging/idrop-web.list.template
@@ -74,7 +74,9 @@ fi
# create a service account for tomcat
# determine if the service account already exists
+set +e
USER=$$( grep $OS_TOMCAT_ACCT /etc/passwd )
+set -e
if [ -n "$$USER" ];
then
echo "WARNING :: Service Account $OS_TOMCAT_ACCT Already Exists."
@@ -88,7 +90,9 @@ chown -R $$ACCT:$$ACCT ${TOMCAT_HOME_DIR}
# create a service account for idrop-web
# determine if the service account already exists
+set +e
USER=$$( grep $OS_IDROP_ACCT /etc/passwd )
+set -e
if [ -n "$$USER" ];
then
echo "WARNING :: Service Account $OS_IDROP_ACCT Already Exists"
@@ -104,7 +108,9 @@ END_PREINSTALL
%preinstall << END_PREINSTALL
# create a service account for idrop-web
# determine if the service account already exists
+set +e
USER=$$( grep $OS_IDROP_ACCT /etc/passwd )
+set -e
if [ -n "$$USER" ];
then
echo "WARNING :: Service Account $OS_IDROP_ACCT Already Exists"
@@ -127,7 +133,9 @@ END_PREINSTALL
# start tomcat
echo "INFO :: Starting Tomcat ..."
+set +e
su -p -s /bin/sh $OS_TOMCAT_ACCT ${TOMCAT_HOME_DIR}/bin/startup.sh
+set -e
# wait until the tomcat conf/Catalina/localhost folder is created
# or timeout after about 10 seconds
@@ -177,11 +185,15 @@ END_POSTINSTALL
%postinstall << END_POSTINSTALL
# if not already running - start tomcat
+set +e
RESULT=$$(ps ax | grep -v grep | grep -i tomcat)
+set -e
if [ -n "$$RESULT" ];
then
echo "INFO :: Starting Tomcat ..."
- /usr/sbin/service ${TOMCAT_VER} start
+ set +e
+ /usr/sbin/service ${TOMCAT_VER} restart
+ set -e
fi
# wait until the tomcat conf/Catalina/localhost folder is created
@@ -237,18 +249,24 @@ END_POSTINSTALL
%if RPM
%preremove << END_PREREMOVE
# first check to make sure idrop-web is not logged in.
+set +e
USER=$$( who | grep $OS_IDROP_ACCT )
+set -e
if [ -n "$$USER" ]; then
echo "${OS_IDROP_ACCT} is currently logged in. Aborting."
exit 1
fi
# stop tomcat if RPM
+set +e
RESULT=$$(ps ax | grep -v grep | grep -i $OS_TOMCAT_ACCT )
+set -e
if [ -n "$$RESULT" ];
then
echo "INFO :: Stopping Tomcat ..."
+ set +e
su -p -s /bin/sh $OS_TOMCAT_ACCT ${TOMCAT_HOME_DIR}/bin/shutdown.sh
+ set -e
fi
# remove iptables entries related to idropweb install
@@ -262,7 +280,9 @@ END_PREREMOVE
%elseif DEB
%preremove << END_PREREMOVE
# first check to make sure idrop-web is not logged in.
+set +e
USER=$$( who | grep $OS_IDROP_ACCT )
+set -e
if [ -n "$$USER" ]; then
echo "${OS_IDROP_ACCT} is currently logged in. Aborting."
exit 1
@@ -285,7 +305,9 @@ END_PREREMOVE
# remove idropweb service account
echo "INFO: :: Removing iDrop Web Service Account: ${OS_IDROP_ACCT} ..."
+set +e
USER=$$( grep $OS_IDROP_ACCT /etc/passwd )
+set -e
if [ -n "$$USER" ];
then
/usr/sbin/userdel -r $OS_IDROP_ACCT
@@ -296,7 +318,9 @@ fi
# clean up tomcat install if this is RPM
# remove tomcat service account
echo "INFO: :: Removing iDrop Web Tomcat Service Account: ${OS_TOMCAT_ACCT} ..."
+set +e
USER=$$( grep $OS_TOMCAT_ACCT /etc/passwd )
+set -e
if [ -n "$$USER" ];
then
/usr/sbin/userdel -r $OS_TOMCAT_ACCT
@@ -310,7 +334,9 @@ END_POSTREMOVE
# remove idropweb service account
echo "INFO: :: Removing iDrop Web Service Account: ${OS_IDROP_ACCT} ..."
+set +e
USER=$$( grep $OS_IDROP_ACCT /etc/passwd )
+set -e
if [ -n "$$USER" ];
then
/usr/sbin/userdel -r $OS_IDROP_ACCT
diff --git a/pom.xml b/pom.xml
index 9b094c6..58500c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
<groupId>org.irods</groupId>
<artifactId>idrop</artifactId>
<packaging>pom</packaging>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</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.3.0-SNAPSHOT</jargon.version>
+ <jargon.version>3.3.0</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>
diff --git a/release_notes.txt b/release_notes.txt
index cfa30f4..5562411 100644
--- a/release_notes.txt
+++ b/release_notes.txt
@@ -1,7 +1,7 @@
*'''Project''': iDrop Suite - iDrop Clients
-*'''Date''': 11/28/2012
-*'''Release Version''': 1.0.2
-*'''git tag''': 1.0.2
+*'''Date''': 03/04/2013
+*'''Release Version''': 2.0.0
+*'''git tag''': 2.0.0
==News==
@@ -25,16 +25,7 @@ Other modules are planned in later releases for REST-ful API and mobile access.
==Libraries==
-
Jargon-core 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==
-
-
+NOTE: bug fixes and features in individual sub-project release notes
\ No newline at end of file