summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-02-09 15:18:46 (GMT)
committer Mike Conway <mikeconway@Mike-Conways-MacBook-Pro.local>2011-02-09 15:18:46 (GMT)
commit62964deb2de64ffdf80ec108e278e3e5f7a2ad41 (patch)
tree686fcaaddc30a9cf14348b1dd23354673aeceb69
parent52a56f8acd4041b3f04c2fb2cb668bb98802eeaf (diff)
downloadQCG-Data-62964deb2de64ffdf80ec108e278e3e5f7a2ad41.zip
QCG-Data-62964deb2de64ffdf80ec108e278e3e5f7a2ad41.tar.gz
QCG-Data-62964deb2de64ffdf80ec108e278e3e5f7a2ad41.tar.bz2
update for changes to mvn artifacts
-rw-r--r--idrop-swing/pom.xml6
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.java22
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java5
-rw-r--r--idrop-swing/src/main/resources/idrop.properties2
-rw-r--r--pom.xml25
5 files changed, 30 insertions, 30 deletions
diff --git a/idrop-swing/pom.xml b/idrop-swing/pom.xml
index fb767a7..31dc719 100644
--- a/idrop-swing/pom.xml
+++ b/idrop-swing/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.irods</groupId>
<artifactId>irods-idrop</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.irods</groupId>
@@ -86,7 +86,7 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
<dependencies>
<dependency>
@@ -95,7 +95,7 @@
<version>1.0.3</version>
</dependency>
<dependency>
- <groupId>org.irods</groupId>
+ <groupId>org.irods.jargon</groupId>
<artifactId>jargon-security</artifactId>
</dependency>
</dependencies>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.java
index 239bd15..946edbe 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/QueueManagerDialog.java
@@ -785,7 +785,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
iDropParent.getTransferManager().purgeAllTransfers();
refreshTableView(viewType);
resetDisplayFieldsAndStatus();
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
}
@@ -797,7 +797,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
refreshTableView(viewType);
resetDisplayFieldsAndStatus();
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
}
@@ -839,7 +839,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
if (dialogReturn == JOptionPane.YES_OPTION) {
try {
transferManager.restartTransfer(selectedTransfer);
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
}
@@ -865,7 +865,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
if (dialogReturn == JOptionPane.YES_OPTION) {
try {
transferManager.resubmitTransfer(selectedTransfer);
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
}
@@ -894,7 +894,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
try {
transferManager.cancelTransfer(selectedTransfer);
refreshTableView(this.getViewType());
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
}
@@ -980,7 +980,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
transferQueue = transferManager.getCurrentQueue();
queueManagerDialog.getLblHeader().setText("Current transfer queue");
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
throw new IdropRuntimeException(ex);
}
@@ -989,7 +989,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
transferQueue = transferManager.getRecentQueue();
queueManagerDialog.getLblHeader().setText("Recent transfer activity");
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
throw new IdropRuntimeException(ex);
}
@@ -998,7 +998,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
transferQueue = transferManager.getErrorQueue();
queueManagerDialog.getLblHeader().setText("Transfer activities with errors");
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
throw new IdropRuntimeException(ex);
}
@@ -1007,7 +1007,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
transferQueue = transferManager.getWarningQueue();
queueManagerDialog.getLblHeader().setText("Transfer activities with warnings");
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
throw new IdropRuntimeException(ex);
}
@@ -1203,7 +1203,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
jTableDetails.setModel(new QueueManagerDetailTableModel(transferManager.getErrorTransferItemsForTransfer(localIRODSTransfer.getId())));
}
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
iDropParent.showIdropException(ex);
return;
@@ -1276,7 +1276,7 @@ public class QueueManagerDialog extends javax.swing.JDialog implements ListSelec
private void resetDisplayFieldsAndStatus() {
try {
iDropParent.getTransferManager().resetStatus();
- } catch (JargonException ex) {
+ } catch (Exception ex) {
Logger.getLogger(QueueManagerDialog.class.getName()).log(Level.SEVERE, null, ex);
// log and continue...not useful to user
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
index d7879b1..acb5a21 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
@@ -799,7 +799,6 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, ItemLis
}
- //if (irodsTree == null) {
log.info("building new iRODS tree");
try {
irodsTree = new IRODSTree(gui);
@@ -1915,7 +1914,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, ItemLis
throw new UnsupportedOperationException("not yet implemented");
}
}
-
+
/**
* Process a selection in the tag cloud list
* @param evt
@@ -1934,8 +1933,6 @@ public class iDrop extends javax.swing.JFrame implements ActionListener, ItemLis
TagCloudListModel tagCloudListModel = (TagCloudListModel) listTagCloudList.getModel();
-
-
TagCloudEntry entry = tagCloudListModel.getTagCloudEntry(listTagCloudList.getMinSelectionIndex());
log.info("search for tag cloud entry based on list selection:{}", entry);
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 5ec85f5..23be921 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -7,7 +7,7 @@ login.preset.zone=lifelibZone
login.preset.resource=lifelibResc1
login.preset.port=2247
-transferengine.record.successful.files=true
+transferengine.record.successful.files=false
#login.preset.host=localhost
#login.preset.zone=test1
diff --git a/pom.xml b/pom.xml
index d179668..5359147 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
<groupId>org.irods</groupId>
<artifactId>irods-idrop</artifactId>
<packaging>pom</packaging>
- <version>0.9.0-SNAPSHOT</version>
- <name>Jargon</name>
+ <version>0.9.1-SNAPSHOT</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>
@@ -163,15 +163,13 @@
</reporting>
<dependencyManagement>
<dependencies>
-
-
<dependency>
- <groupId>org.irods</groupId>
+ <groupId>org.irods.jargon</groupId>
<artifactId>jargon-core</artifactId>
<version>${jargon.version}</version>
</dependency>
<dependency>
- <groupId>org.irods</groupId>
+ <groupId>org.irods.jargon</groupId>
<artifactId>jargon-test</artifactId>
<version>${jargon.version}</version>
</dependency>
@@ -180,13 +178,18 @@
<artifactId>jargon-transfer-engine</artifactId>
<version>${jargon.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.irods.jargon</groupId>
+ <artifactId>jargon-data-utils</artifactId>
+ <version>${jargon.version}</version>
+ </dependency>
<dependency>
- <groupId>org.irods</groupId>
+ <groupId>org.irods.jargon</groupId>
<artifactId>jargon-user-tagging</artifactId>
<version>${jargon.version}</version>
</dependency>
<dependency>
- <groupId>org.irods</groupId>
+ <groupId>org.irods.jargon</groupId>
<artifactId>jargon-security</artifactId>
<version>${jargon.version}</version>
</dependency>
@@ -314,17 +317,17 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.irods</groupId>
+ <groupId>org.irods.jargon</groupId>
<artifactId>jargon-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.irods</groupId>
+ <groupId>org.irods.jargon</groupId>
<artifactId>jargon-test</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.irods</groupId>
+ <groupId>org.irods.jargon</groupId>
<artifactId>jargon-user-tagging</artifactId>
<scope>compile</scope>
</dependency>