summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-04-16 18:31:33 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-04-16 18:31:33 (GMT)
commit8b60430926e1468680316b24aec0e34505e66107 (patch)
tree8d2b78114690fca4e02ba85a2d774b22441c0d4c
parent2cd43c42a88194cd8b08fe685be4f1b8fbbffd20 (diff)
downloadQCG-Data-8b60430926e1468680316b24aec0e34505e66107.zip
QCG-Data-8b60430926e1468680316b24aec0e34505e66107.tar.gz
QCG-Data-8b60430926e1468680316b24aec0e34505e66107.tar.bz2
[#1268] XML Parse Exception in idrop.jnlp
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java2
-rw-r--r--idrop-swing/pom.xml226
-rw-r--r--idrop-swing/release_notes.txt5
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
-rw-r--r--idrop-swing/src/main/jnlp/template.vm25
-rw-r--r--idrop-swing/src/main/resources/idrop.properties4
-rw-r--r--pom.xml3
7 files changed, 148 insertions, 119 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 a593371..347d75b 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";
- public static String BUILD_TIME="20130305-0946";
+ public static String BUILD_TIME="20130411-1603";
}
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index f5ad421..2bbf7c2 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -10,17 +10,17 @@
<packaging>jar</packaging>
<name>idrop-swing</name>
<dependencies>
- <!--
- Sun's JnlpDownladServlet takes the template JNLP file and inserts
- relevant values for $$codebase and other parameters
- -->
- <!-- <dependency>
- <groupId>com.sun.java.jnlp</groupId>
- <artifactId>jnlp-servlet</artifactId>
- <version>5.0</version>
- <scope>runtime</scope>
- </dependency>
- -->
+ <!--
+ Sun's JnlpDownladServlet takes the template JNLP file and inserts
+ relevant values for $$codebase and other parameters
+ -->
+ <!-- <dependency>
+ <groupId>com.sun.java.jnlp</groupId>
+ <artifactId>jnlp-servlet</artifactId>
+ <version>5.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ -->
<dependency>
<groupId>org.irods.jargon</groupId>
<artifactId>jargon-data-utils</artifactId>
@@ -36,11 +36,11 @@
<artifactId>jargon-user-tagging</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.irods.jargon</groupId>
- <artifactId>jargon-core</artifactId>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.irods.jargon</groupId>
+ <artifactId>jargon-core</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.irods.jargon.transfer</groupId>
<artifactId>jargon-transfer-dao-spring</artifactId>
@@ -65,12 +65,12 @@
<groupId>org.swinglabs</groupId>
<artifactId>swing-layout</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.2.GA</version>
- <scope>runtime</scope>
-</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.2.GA</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -81,47 +81,47 @@
<execution>
<goals>
<goal>jnlp-inline</goal>
- <!-- use jnlp, jnlp-inline or jnlp-single as appropriate -->
+ <!-- use jnlp, jnlp-inline or jnlp-single as appropriate -->
</goals>
</execution>
</executions>
<configuration>
- <!--
- Set to true to exclude all transitive dependencies. Default is false.
- -->
+ <!--
+ Set to true to exclude all transitive dependencies. Default is false.
+ -->
<excludeTransitive>false</excludeTransitive>
- <!-- The path where the libraries are stored within the jnlp structure. not required. by default the libraries are within the working directory -->
+ <!-- The path where the libraries are stored within the jnlp structure. not required. by default the libraries are within the working directory -->
<libPath>lib</libPath>
- <!-- JNLP generation -->
+ <!-- JNLP generation -->
<jnlp>
- <!-- default values -->
- <!--inputTemplateResourcePath>${project.basedir}</inputTemplateResourcePath-->
- <!--inputTemplate>src/main/jnlp/template.vm</inputTemplate-->
- <!-- relative to inputTemplateResourcePath -->
+ <!-- default values -->
+ <inputTemplateResourcePath>${project.basedir}</inputTemplateResourcePath>
+ <inputTemplate>src/main/jnlp/template.vm</inputTemplate>
+ <!-- relative to inputTemplateResourcePath -->
<outputFile>idrop.jnlp</outputFile>
- <!-- defaults to launch.jnlp -->
+ <!-- defaults to launch.jnlp -->
- <!-- used to automatically identify the jar containing the main class. -->
- <!-- this is perhaps going to change -->
+ <!-- used to automatically identify the jar containing the main class. -->
+ <!-- this is perhaps going to change -->
<mainClass>org.irods.jargon.idrop.desktop.systraygui.IDROPDesktop</mainClass>
</jnlp>
- <!-- SIGNING -->
- <!-- defining this will automatically sign the jar and its dependencies, if necessary -->
+ <!-- SIGNING -->
+ <!-- defining this will automatically sign the jar and its dependencies, if necessary -->
<sign>
<keystore>idrop</keystore>
<keypass>123xxx</keypass>
- <!-- we need to override passwords easily from the command line. ${keypass} -->
+ <!-- we need to override passwords easily from the command line. ${keypass} -->
<storepass>123xxx</storepass>
- <!-- ${storepass} -->
- <!--storetype>fillme</storetype-->
+ <!-- ${storepass} -->
+ <!--storetype>fillme</storetype-->
<alias>idrop</alias>
- <!--validity>fillme</validity-->
+ <!--validity>fillme</validity-->
- <!-- only required for generating the keystore -->
+ <!-- only required for generating the keystore -->
<dnameCn>irods</dnameCn>
<dnameOu>dice</dnameOu>
<dnameO>uncch</dnameO>
@@ -130,29 +130,29 @@
<dnameC>US</dnameC>
<verify>true</verify>
- <!-- verify that the signing operation succeeded -->
+ <!-- verify that the signing operation succeeded -->
- <!-- KEYSTORE MANAGEMENT -->
+ <!-- KEYSTORE MANAGEMENT -->
<keystoreConfig>
<delete>false</delete>
- <!-- delete the keystore -->
+ <!-- delete the keystore -->
<gen>true</gen>
- <!-- optional shortcut to generate the store. -->
+ <!-- optional shortcut to generate the store. -->
</keystoreConfig>
</sign>
- <!-- BUILDING PROCESS -->
+ <!-- BUILDING PROCESS -->
<pack200>true</pack200>
<gzip>true</gzip>
- <!-- default force when pack200 false, true when pack200 selected ?? -->
+ <!-- default force when pack200 false, true when pack200 selected ?? -->
- <!-- causes a version attribute to be output in each jar resource element, optional, default is false -->
- <!-- <outputJarVersions>false</outputJarVersions>-->
+ <!-- causes a version attribute to be output in each jar resource element, optional, default is false -->
+ <!-- <outputJarVersions>false</outputJarVersions>-->
- <!--install>false</install-->
- <!-- not yet supported -->
- <verbose>true</verbose>
+ <!--install>false</install-->
+ <!-- not yet supported -->
+ <verbose>false</verbose>
</configuration>
</plugin>
<plugin>
@@ -202,70 +202,70 @@
<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}" />
+ <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>
+ <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>
<pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-antrun-plugin
- </artifactId>
- <versionRange>
- [1.3,)
- </versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>
+ [1.3,)
+ </versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>
</project>
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt
index c501d1b..4388ad2 100644
--- a/idrop-swing/release_notes.txt
+++ b/idrop-swing/release_notes.txt
@@ -34,6 +34,11 @@ Note that the following bug and feature requests are logged in GForge with relat
* [#1093] Broken pipe error did not propogate in parallel transfer
**Minor fixes to better propogate errors to queue manager
+*[#1340] allow switching of resource by default
+
+*[#1268] XML Parse Exception in idrop.jnlp
+**added jnlp template and improved jnlp file consistency and structure
+
==Outstanding Issues==
Please consult [[https://code.renci.org/gf/project/irodsidrop/tracker/]]
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 479021a..b52608a 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";
- public static String BUILD_TIME="20130305-0946";
+ public static String BUILD_TIME="20130416-1418";
}
diff --git a/idrop-swing/src/main/jnlp/template.vm b/idrop-swing/src/main/jnlp/template.vm
new file mode 100644
index 0000000..ca4cedd
--- /dev/null
+++ b/idrop-swing/src/main/jnlp/template.vm
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp
+ spec="1.0+"
+ codebase="http://iren-web.renci.org/idrop-release"
+ href="$outputFile">
+ <information>
+ <title>$project.Name</title>
+ <vendor>$project.Organization.Name<vendor/>
+ <homepage>$project.Organization.Url<homepage/>
+ <description kind="one-line">$project.Description</description>
+ <offline-allowed/>
+ </information>
+ <security>
+ <all-permissions/>
+ </security>
+ <resources>
+ <j2se version="1.6+"
+ initial-heap-size="64m"
+ max-heap-size="256m"
+ />
+ $dependencies
+ </resources>
+ <application-desc main-class="org.irods.jargon.idrop.desktop.systraygui.IDROPDesktop">
+ </application-desc>
+</jnlp>
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 5719802..2184841 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -18,8 +18,8 @@ login.preset.host=diamond.ils.unc.edu
login.preset.zone=lifelibZone
login.preset.resource=lifelibResc1
login.preset.port=2247
-# enable/disable user's ability to change the iRODS defualt resource setting
-idrop.settings.enable_default_resc_edit=false
+# enable/disable user's ability to change the iRODS default resource setting
+idrop.settings.enable_default_resc_edit=true
# 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/pom.xml b/pom.xml
index 58500c0..2b16f51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<url>https://code.renci.org/gf/project/irodsidrop/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jargon.version>3.3.0</jargon.version>
+ <jargon.version>3.3.1-SNAPSHOT</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>
@@ -410,7 +410,6 @@
</profile>
</profiles>
<modules>
- <module>idrop-swing</module>
<module>idrop-lite</module>
</modules>
</project>