summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2012-10-12 14:02:09 (GMT)
committer mconway <michael.c.conway@gmail.com>2012-10-12 14:02:09 (GMT)
commit59edccf89474c201a4210852c53f19a0a5e00006 (patch)
treeced2d4428047f06fcf93630e10847d2dcf4571cf
parent0453af6173c5e47ba342d9d9273b48a0ab242f10 (diff)
downloadQCG-Data-59edccf89474c201a4210852c53f19a0a5e00006.zip
QCG-Data-59edccf89474c201a4210852c53f19a0a5e00006.tar.gz
QCG-Data-59edccf89474c201a4210852c53f19a0a5e00006.tar.bz2
[#1023] add Version class in jargon-core, upgrade to grails 2.1
-rw-r--r--idrop-lite/pom.xml3
-rw-r--r--idrop-lite/release_notes.txt2
-rw-r--r--idrop-swing/pom.xml29
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java5
-rw-r--r--idrop-web/application.properties11
-rw-r--r--idrop-web/grails-app/conf/BuildConfig.groovy10
-rw-r--r--idrop-web/grails-app/conf/Config.groovy2
-rw-r--r--idrop-web/grails-app/views/common/_footer.gsp2
-rw-r--r--idrop-web/grails-app/views/common/_topToolbar.gsp4
-rw-r--r--idrop-web/release_notes.txt13
10 files changed, 63 insertions, 18 deletions
diff --git a/idrop-lite/pom.xml b/idrop-lite/pom.xml
index 52e3705..1d65537 100644
--- a/idrop-lite/pom.xml
+++ b/idrop-lite/pom.xml
@@ -72,7 +72,8 @@
<echo file="${src.dir}/${package.dir}/Version.java" message="package ${package.name};${line.separator}" />
<echo file="${src.dir}/${package.dir}/Version.java" append="true" message="public final class Version {${line.separator}" />
- <echo file="${src.dir}/${package.dir}/Version.java" append="true" message=" public static String VERSION=&quot;${buildtime}&quot;;${line.separator}" />
+ <echo file="${src.dir}/${package.dir}/Version.java" append="true" message=" public static String VERSION=&quot;${pom.version}&quot;;${line.separator}" />
+ <echo file="${src.dir}/${package.dir}/Version.java" append="true" message=" public static String BUILD_TIME=&quot;${buildtime}&quot;;${line.separator}" />
<echo file="${src.dir}/${package.dir}/Version.java" append="true" message="}${line.separator}" />
<echo message="BUILD ${buildtime}" />
</tasks>
diff --git a/idrop-lite/release_notes.txt b/idrop-lite/release_notes.txt
index 8300d12..880a91d 100644
--- a/idrop-lite/release_notes.txt
+++ b/idrop-lite/release_notes.txt
@@ -28,6 +28,8 @@ Note that the following bug and feature requests are logged in GForge with relat
==Features==
+[#1023] Update Version class to include build time and POM version
+
==Outstanding Issues==
Please consult [[https://code.renci.org/gf/project/irodsidrop/tracker/]]
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index 175a27e..d203e92 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -203,6 +203,35 @@
<mainClass>org.irods.jargon.idrop.desktop.systraygui.StartupSequencer</mainClass>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <property name="src.dir" value="${project.build.sourceDirectory}" />
+ <property name="package.dir" value="org/irods/jargon/idrop/desktop/systraygui/utils" />
+ <property name="package.name" value="org.irods.jargon.idrop.desktop.systraygui.utils" />
+ <property name="buildtime" value="${maven.build.timestamp}" />
+
+ <echo file="${src.dir}/${package.dir}/Version.java" message="package ${package.name};${line.separator}" />
+ <echo file="${src.dir}/${package.dir}/Version.java" append="true" message="public final class Version {${line.separator}" />
+ <echo file="${src.dir}/${package.dir}/Version.java" append="true" message=" public static String VERSION=&quot;${pom.version}&quot;;${line.separator}" />
+ <echo file="${src.dir}/${package.dir}/Version.java" append="true" message=" public static String BUILD_TIME=&quot;${buildtime}&quot;;${line.separator}" />
+ <echo file="${src.dir}/${package.dir}/Version.java" append="true" message="}${line.separator}" />
+ <echo message="BUILD ${buildtime}" />
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
</project>
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
new file mode 100644
index 0000000..ef28736
--- /dev/null
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
@@ -0,0 +1,5 @@
+package org.irods.jargon.idrop.desktop.systraygui.utils;
+public final class Version {
+ public static String VERSION="1.0.2-SNAPSHOT";
+ public static String BUILD_TIME="20121012-0926";
+}
diff --git a/idrop-web/application.properties b/idrop-web/application.properties
index 32f474a..123c183 100644
--- a/idrop-web/application.properties
+++ b/idrop-web/application.properties
@@ -1,8 +1,9 @@
-app.grails.version=2.0.4
+#Grails Metadata file
+#Fri Oct 12 09:57:06 EDT 2012
+app.grails.version=2.1.0
app.name=idrop-web
app.servlet.version=2.5
-app.version=1.0.1
-plugins.hibernate=2.0.4
+app.version=1.0.2
+plugins.hibernate=2.1.0
plugins.logging=0.1
-plugins.tomcat=2.0.4
-
+plugins.tomcat=2.1.0
diff --git a/idrop-web/grails-app/conf/BuildConfig.groovy b/idrop-web/grails-app/conf/BuildConfig.groovy
index b77906c..d4dfed3 100644
--- a/idrop-web/grails-app/conf/BuildConfig.groovy
+++ b/idrop-web/grails-app/conf/BuildConfig.groovy
@@ -29,12 +29,12 @@ 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.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-core:3.2.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
//compile 'org.irods.jargon:jargon-security:3.2.0-SNAPSHOT'
- compile ('org.irods.jargon:jargon-data-utils:3.2.0.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-ticket:3.2.0.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-user-profile:3.2.0.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
- compile ('org.irods.jargon:jargon-user-tagging:3.2.0.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-data-utils:3.2.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-ticket:3.2.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-user-profile:3.2.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
+ compile ('org.irods.jargon:jargon-user-tagging:3.2.1-SNAPSHOT') { excludes ([group:'org.jglobus'])}
/*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 95b50a3..8683c5b 100644
--- 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.1-jar-with-dependencies.jar"
+idrop.config.idrop.lite.applet.jar="idrop-lite-1.0.2-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/grails-app/views/common/_footer.gsp b/idrop-web/grails-app/views/common/_footer.gsp
index 5018fdd..2d0ce51 100644
--- a/idrop-web/grails-app/views/common/_footer.gsp
+++ b/idrop-web/grails-app/views/common/_footer.gsp
@@ -1 +1 @@
-<h2>iDrop-web developed by the DICE Group, developers of the <a href="http://www.irods.org">iRODS Data Grid</a> -- iDrop Project Page available <a href="https://code.renci.org/jargon">here</a></h2> \ No newline at end of file
+<h3>iDrop-web developed by the DICE Group, developers of the <a href="http://www.irods.org">iRODS Data Grid</a> -- iDrop Project Page available <a href="https://code.renci.org/jargon">here</a> - version: ${grailsApplication.metadata.'app.version'} jargon:${org.irods.jargon.core.utils.JargonVersion.VERSION }</h3> \ No newline at end of file
diff --git a/idrop-web/grails-app/views/common/_topToolbar.gsp b/idrop-web/grails-app/views/common/_topToolbar.gsp
index f9a2d45..ab598a8 100644
--- a/idrop-web/grails-app/views/common/_topToolbar.gsp
+++ b/idrop-web/grails-app/views/common/_topToolbar.gsp
@@ -11,12 +11,12 @@
<li id="menuNewFolderDetails"><a href="#newFolderDetails"
onclick="newFolderViaBrowseDetailsToolbar()"><g:message
code="text.new.folder" /></a></li>
- <li id="menuRenameDetails"><a href="#renameDetails"
+ <!-- <li id="menuRenameDetails"><a href="#renameDetails"
onclick="renameViaBrowseDetailsToolbar()"><g:message
code="text.rename" /></a></li>
<li id="menuDeleteDetails"><a href="#deleteDetails"
onclick="deleteViaBrowseDetailsToolbar()"><g:message
- code="default.button.delete.label" /></a></li>
+ code="default.button.delete.label" /></a></li>-->
</ul></li>
<li id="menuFile" class="toolbarMenuItem"><a href="#file"><g:message
diff --git a/idrop-web/release_notes.txt b/idrop-web/release_notes.txt
index c92ce9e..af10436 100644
--- a/idrop-web/release_notes.txt
+++ b/idrop-web/release_notes.txt
@@ -1,11 +1,11 @@
*'''Project''': idrop-web
*'''Date''': 08/28/2012
-*'''Release Version''': 1.0.1
-*'''git tag''': 1.0.1
+*'''Release Version''': 1.0.2 work in progress
+*'''git tag''': xxx
==News==
-This is a release of iDrop web version 1.0.1
+This is a release of iDrop web version 1.0.2
==Requirements==
@@ -36,3 +36,10 @@ Note that the following bug and feature requests are logged in GForge with relat
* [#962] missing file icon in info view for data objects
Fixed data object info to include icon and be clearer about file versus collection
+
+*[#1023] add Version class in jargon-core
+**Added iDrop web and Jargon version numbers in footer
+
+*Updated Grails version to version 2.1.0
+
+*Removed delete and rename buttons from browse details view