You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/10/24 10:10:14 UTC
[1/7] incubator-taverna-workbench git commit: Fixed license comments
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master 97ce6d2dc -> 8e41379ff
Fixed license comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/e1480abc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/e1480abc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/e1480abc
Branch: refs/heads/master
Commit: e1480abc275a6ff2958b687eb0be28bb9da70469
Parents: 97ce6d2
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Oct 24 09:09:36 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Oct 24 09:09:36 2016 +0100
----------------------------------------------------------------------
.../raven/plugins/ui/AddPluginSiteFrame.java | 15 +--------------
.../plugins/ui/CheckForNoticeStartupHook.java | 7 ++-----
.../raven/plugins/ui/CheckForUpdatesDialog.java | 4 +---
.../plugins/ui/CheckForUpdatesStartupHook.java | 4 ++--
.../raven/plugins/ui/PluginListCellRenderer.java | 2 +-
.../taverna/raven/plugins/ui/PluginListModel.java | 15 +--------------
.../raven/plugins/ui/PluginManagerFrame.java | 2 +-
.../raven/plugins/ui/PluginRepositoryListener.java | 15 +--------------
.../taverna/raven/plugins/ui/PluginSiteFrame.java | 15 +--------------
.../raven/plugins/ui/UpdatesAvailableIcon.java | 17 +----------------
.../profile/ui/ProfileVersionCellRenderer.java | 15 +--------------
.../raven/profile/ui/ProfileVersionListFrame.java | 15 +--------------
.../raven/profile/ui/ProfileVersionListModel.java | 15 +--------------
13 files changed, 15 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/AddPluginSiteFrame.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/AddPluginSiteFrame.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/AddPluginSiteFrame.java
index 3cc9df6..8598553 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/AddPluginSiteFrame.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/AddPluginSiteFrame.java
@@ -1,18 +1,4 @@
/*
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Source code information
- * -----------------------
- * Filename $RCSfile: AddPluginSiteFrame.java,v $
- * Revision $Revision: 1.2 $
- * Release status $State: Exp $
- * Last modified on $Date: 2008/09/04 14:51:52 $
- * by $Author: sowen70 $
- * Created on 8 Dec 2006
-package org.apache.taverna.raven.plugins.ui;
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -28,6 +14,7 @@ package org.apache.taverna.raven.plugins.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.plugins.ui;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForNoticeStartupHook.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForNoticeStartupHook.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForNoticeStartupHook.java
index 33ae38b..48794ff 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForNoticeStartupHook.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForNoticeStartupHook.java
@@ -1,7 +1,3 @@
-/**
- *
- */
-package org.apache.taverna.raven.plugins.ui;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,6 +14,7 @@ package org.apache.taverna.raven.plugins.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.plugins.ui;
import java.awt.GraphicsEnvironment;
import java.io.File;
@@ -75,7 +72,7 @@ public class CheckForNoticeStartupHook implements StartupSPI {
private static Profile profile = ProfileFactory.getInstance().getProfile();
private static String version = profile.getVersion();
- private static String BASE_URL = "http://www.mygrid.org.uk/taverna/updates";
+ private static String BASE_URL = "https://taverna.apache.org/updates";
private static String SUFFIX = "notice";
private static int TIMEOUT = 5000;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesDialog.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesDialog.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesDialog.java
index afd4b69..36533a1 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesDialog.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesDialog.java
@@ -1,4 +1,3 @@
-package org.apache.taverna.raven.plugins.ui;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -15,6 +14,7 @@ package org.apache.taverna.raven.plugins.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.plugins.ui;
import java.awt.BorderLayout;
import java.awt.Dimension;
@@ -42,8 +42,6 @@ import org.apache.log4j.Logger;
/**
* Dialog that lets user know that there are updates available.
*
- * @author Alex Nenadic
- *
*/
@SuppressWarnings("serial")
public class CheckForUpdatesDialog extends HelpEnabledDialog {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
index 75d8424..830d018 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
@@ -1,4 +1,3 @@
-package org.apache.taverna.raven.plugins.ui;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -15,6 +14,7 @@ package org.apache.taverna.raven.plugins.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.plugins.ui;
import java.io.File;
import java.util.Date;
@@ -98,7 +98,7 @@ public class CheckForUpdatesStartupHook implements StartupSPI, EventHandler {
@Override
public void handleEvent(Event event) {
// TODO: Handle Plug
- if (event.getTopic().equals(PluginManager.UPDATES_AVAILABLE) {
+ if (event.getTopic().equals(PluginManager.UPDATES_AVAILABLE)) {
CheckForUpdatesDialog dialog = new CheckForUpdatesDialog();
dialog.setVisible(true);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListCellRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListCellRenderer.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListCellRenderer.java
index d31ea5e..efd13a5 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListCellRenderer.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListCellRenderer.java
@@ -1,4 +1,3 @@
-package org.apache.taverna.raven.plugins.ui;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -15,6 +14,7 @@ package org.apache.taverna.raven.plugins.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.plugins.ui;
import java.awt.Color;
import java.awt.Component;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListModel.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListModel.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListModel.java
index ef770b9..9d6c99d 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListModel.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListModel.java
@@ -1,18 +1,4 @@
/*
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Source code information
- * -----------------------
- * Filename $RCSfile: PluginListModel.java,v $
- * Revision $Revision: 1.2 $
- * Release status $State: Exp $
- * Last modified on $Date: 2008/09/04 14:51:52 $
- * by $Author: sowen70 $
- * Created on 28 Nov 2006
-package org.apache.taverna.raven.plugins.ui;
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -28,6 +14,7 @@ package org.apache.taverna.raven.plugins.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.plugins.ui;
import javax.swing.AbstractListModel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginManagerFrame.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginManagerFrame.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginManagerFrame.java
index b171d52..55ca4a5 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginManagerFrame.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginManagerFrame.java
@@ -1,4 +1,3 @@
-package org.apache.taverna.raven.plugins.ui;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -15,6 +14,7 @@ package org.apache.taverna.raven.plugins.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.plugins.ui;
import java.awt.Color;
import java.awt.Frame;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginRepositoryListener.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginRepositoryListener.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginRepositoryListener.java
index 3f6e910..178b1a2 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginRepositoryListener.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginRepositoryListener.java
@@ -1,18 +1,4 @@
/*
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Source code information
- * -----------------------
- * Filename $RCSfile: PluginRepositoryListener.java,v $
- * Revision $Revision: 1.2 $
- * Release status $State: Exp $
- * Last modified on $Date: 2008/09/04 14:51:52 $
- * by $Author: sowen70 $
- * Created on 7 Dec 2006
-package org.apache.taverna.raven.plugins.ui;
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -28,6 +14,7 @@ package org.apache.taverna.raven.plugins.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.plugins.ui;
import javax.swing.JProgressBar;
import javax.swing.SwingUtilities;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginSiteFrame.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginSiteFrame.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginSiteFrame.java
index 1c3c4a8..5c9aebf 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginSiteFrame.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginSiteFrame.java
@@ -1,18 +1,4 @@
/*
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Source code information
- * -----------------------
- * Filename $RCSfile: PluginSiteFrame.java,v $
- * Revision $Revision: 1.3 $
- * Release status $State: Exp $
- * Last modified on $Date: 2008/10/27 13:39:56 $
- * by $Author: stain $
- * Created on 29 Nov 2006
-package org.apache.taverna.raven.plugins.ui;
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -28,6 +14,7 @@ package org.apache.taverna.raven.plugins.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.plugins.ui;
import java.awt.Color;
import java.awt.Font;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/UpdatesAvailableIcon.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/UpdatesAvailableIcon.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/UpdatesAvailableIcon.java
index 537abbe..f083d84 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/UpdatesAvailableIcon.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/UpdatesAvailableIcon.java
@@ -1,18 +1,4 @@
/*
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Source code information
- * -----------------------
- * Filename $RCSfile: UpdatesAvailableIcon.java,v $
- * Revision $Revision: 1.5 $
- * Release status $State: Exp $
- * Last modified on $Date: 2008/12/01 12:32:40 $
- * by $Author: alaninmcr $
- * Created on 12 Dec 2006
-package org.apache.taverna.raven.plugins.ui;
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -28,6 +14,7 @@ package org.apache.taverna.raven.plugins.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.plugins.ui;
import java.awt.Component;
import java.awt.event.MouseAdapter;
@@ -51,8 +38,6 @@ import org.apache.log4j.Logger;
* Also acts as a pluginmanager listener to refresh itself whenever a new plugin
* is added.
*
- * @author Stuart Owen
- *
*/
@SuppressWarnings("serial")
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionCellRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionCellRenderer.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionCellRenderer.java
index 91d51cf..1272baf 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionCellRenderer.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionCellRenderer.java
@@ -1,18 +1,4 @@
/*
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Source code information
- * -----------------------
- * Filename $RCSfile: ProfileVersionCellRenderer.java,v $
- * Revision $Revision: 1.2 $
- * Release status $State: Exp $
- * Last modified on $Date: 2008/09/04 14:52:06 $
- * by $Author: sowen70 $
- * Created on 16 Jan 2007
-package org.apache.taverna.raven.profile.ui;
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -28,6 +14,7 @@ package org.apache.taverna.raven.profile.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.profile.ui;
import java.awt.BorderLayout;
import java.awt.Color;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionListFrame.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionListFrame.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionListFrame.java
index 622ddaa..4cf427a 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionListFrame.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionListFrame.java
@@ -1,18 +1,4 @@
/*
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Source code information
- * -----------------------
- * Filename $RCSfile: ProfileVersionListFrame.java,v $
- * Revision $Revision: 1.3 $
- * Release status $State: Exp $
- * Last modified on $Date: 2008/09/04 14:52:06 $
- * by $Author: sowen70 $
- * Created on 16 Jan 2007
-package org.apache.taverna.raven.profile.ui;
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -28,6 +14,7 @@ package org.apache.taverna.raven.profile.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.profile.ui;
import java.awt.Frame;
import java.awt.GridBagConstraints;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/e1480abc/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionListModel.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionListModel.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionListModel.java
index 23d2754..1af754e 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionListModel.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/profile/ui/ProfileVersionListModel.java
@@ -1,18 +1,4 @@
/*
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- *
- * Source code information
- * -----------------------
- * Filename $RCSfile: ProfileVersionListModel.java,v $
- * Revision $Revision: 1.3 $
- * Release status $State: Exp $
- * Last modified on $Date: 2008/09/04 14:52:06 $
- * by $Author: sowen70 $
- * Created on 16 Jan 2007
-package org.apache.taverna.raven.profile.ui;
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -28,6 +14,7 @@ package org.apache.taverna.raven.profile.ui;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.taverna.raven.profile.ui;
import java.net.MalformedURLException;
import java.net.URL;
[4/7] incubator-taverna-workbench git commit: javadoc tweaks
Posted by st...@apache.org.
javadoc tweaks
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/4c99d96f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/4c99d96f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/4c99d96f
Branch: refs/heads/master
Commit: 4c99d96f84094686b6ee89cfc912fc50038aa5cf
Parents: 4c5c6a8
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Oct 24 11:06:00 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Oct 24 11:06:00 2016 +0100
----------------------------------------------------------------------
.../taverna/workbench/plugin/impl/PluginManagerPanel.java | 5 -----
.../apache/taverna/workbench/plugin/impl/PluginManagerView.java | 3 ---
.../org/apache/taverna/workbench/plugin/impl/PluginPanel.java | 4 +---
3 files changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c99d96f/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginManagerPanel.java
----------------------------------------------------------------------
diff --git a/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginManagerPanel.java b/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginManagerPanel.java
index bd57379..25eb23f 100644
--- a/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginManagerPanel.java
+++ b/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginManagerPanel.java
@@ -43,11 +43,6 @@ import org.apache.taverna.plugin.PluginException;
import org.apache.taverna.plugin.PluginManager;
import org.apache.taverna.plugin.xml.jaxb.PluginVersions;
-//import uk.org.taverna.commons.plugin.Plugin;
-//import uk.org.taverna.commons.plugin.PluginException;
-//import uk.org.taverna.commons.plugin.PluginManager;
-//import uk.org.taverna.commons.plugin.xml.jaxb.PluginVersions;
-
/**
* @author David Withers
*/
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c99d96f/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginManagerView.java
----------------------------------------------------------------------
diff --git a/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginManagerView.java b/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginManagerView.java
index b618536..f114e49 100644
--- a/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginManagerView.java
+++ b/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginManagerView.java
@@ -24,9 +24,6 @@ import org.apache.taverna.plugin.PluginManager;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventHandler;
-/**
- * @author David Withers
- */
public class PluginManagerView implements EventHandler {
private JDialog dialog;
private PluginManagerPanel pluginManagerPanel;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c99d96f/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginPanel.java
----------------------------------------------------------------------
diff --git a/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginPanel.java b/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginPanel.java
index 22e877b..542fb2e 100644
--- a/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginPanel.java
+++ b/taverna-plugin-manager/src/main/java/org/apache/taverna/workbench/plugin/impl/PluginPanel.java
@@ -36,9 +36,7 @@ import javax.swing.JPanel;
import javax.swing.border.Border;
import javax.swing.plaf.basic.BasicButtonUI;
-/**
- * @author David Withers
- */
+
@SuppressWarnings("serial")
public abstract class PluginPanel extends JPanel {
@SuppressWarnings("unused")
[6/7] incubator-taverna-workbench git commit: Use Path, not File
Posted by st...@apache.org.
Use Path, not File
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/0bba476d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/0bba476d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/0bba476d
Branch: refs/heads/master
Commit: 0bba476d2868101e0a90014be41797a7c8b5cc96
Parents: 1aabbf1
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Oct 24 11:08:39 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Oct 24 11:08:39 2016 +0100
----------------------------------------------------------------------
.../run/cleanup/WorkflowRunStatusShutdownHook.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/0bba476d/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
index 2126b5f..b01fe15 100644
--- a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
+++ b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/cleanup/WorkflowRunStatusShutdownHook.java
@@ -16,17 +16,18 @@
*/
package org.apache.taverna.workbench.run.cleanup;
-import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
-import org.apache.taverna.configuration.app.ApplicationConfiguration;
-import org.apache.taverna.workbench.ShutdownSPI;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
import org.apache.taverna.platform.execution.api.InvalidExecutionIdException;
import org.apache.taverna.platform.run.api.InvalidRunIdException;
import org.apache.taverna.platform.run.api.RunService;
import org.apache.taverna.platform.run.api.RunStateException;
+import org.apache.taverna.workbench.ShutdownSPI;
/**
* Shutdown hook that detects running and paused workflows.
@@ -81,14 +82,14 @@ public class WorkflowRunStatusShutdownHook implements ShutdownSPI {
| InvalidExecutionIdException e) {
}
for (String workflowRun : workflowRuns) {
- File runStore = new File(
- applicationConfiguration.getApplicationHomeDir(),
+ Path runStore = applicationConfiguration.getApplicationHomeDir().resolve(
RUN_STORE_DIRECTORY);
try {
- File file = new File(runStore,
+ Path runFile = runStore.resolve(
runService.getRunName(workflowRun) + ".wfRun");
- if (!file.exists())
- runService.save(workflowRun, file);
+ if (Files.notExists(runFile)) {
+ runService.save(workflowRun, runFile);
+ }
} catch (InvalidRunIdException | IOException e) {
}
}
[3/7] incubator-taverna-workbench git commit: kind-of update of
taverna-plugins-gui
Posted by st...@apache.org.
kind-of update of taverna-plugins-gui
but this should not be used, as taverna-plugin-manager
is the replacement
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/4c5c6a82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/4c5c6a82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/4c5c6a82
Branch: refs/heads/master
Commit: 4c5c6a827bf5fbec6ee93e6f3b4fe2aae16c70ca
Parents: 9a62222
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Oct 24 11:05:29 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Oct 24 11:05:29 2016 +0100
----------------------------------------------------------------------
pom.xml | 8 ++-
.../raven/plugins/ui/CheckForUpdatesDialog.java | 34 +++++----
.../plugins/ui/CheckForUpdatesStartupHook.java | 76 ++++++++++++--------
.../plugins/ui/PluginListCellRenderer.java | 9 +--
.../raven/plugins/ui/PluginListModel.java | 5 +-
.../raven/plugins/ui/PluginManagerFrame.java | 5 +-
.../raven/plugins/ui/PluginSiteFrame.java | 8 +--
.../raven/plugins/ui/UpdatesAvailableIcon.java | 3 +-
8 files changed, 82 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c5c6a82/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 68521f3..98e8e5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,6 @@
<module>taverna-perspective-design</module>
<module>taverna-perspective-myexperiment</module>
<module>taverna-plugin-manager</module>
- <module>taverna-plugins-gui</module>
<module>taverna-reference-ui</module>
<module>taverna-renderers-api</module>
<module>taverna-renderers-exts</module>
@@ -108,6 +107,13 @@
<module>taverna-report-impl</module>
<module>taverna-report-view</module>
-->
+<!--
+ The below contains outdated code which should be updated
+to use Taverna OSGi - it is provided for reference as some
+of the functionality (e.g. update on startup chec) should be moved to its
+replacement, taverna-plugin-manager
+ <module>taverna-plugins-gui</module>
+-->
</modules>
<scm>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c5c6a82/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesDialog.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesDialog.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesDialog.java
index 36533a1..653436d 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesDialog.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesDialog.java
@@ -25,19 +25,20 @@ import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileTime;
+import java.time.Instant;
import javax.swing.JButton;
-import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.CompoundBorder;
import javax.swing.border.EmptyBorder;
import javax.swing.border.EtchedBorder;
-import org.apache.taverna.workbench.helper.HelpEnabledDialog;
-
-import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
+import org.apache.taverna.workbench.helper.HelpEnabledDialog;
/**
* Dialog that lets user know that there are updates available.
@@ -47,15 +48,17 @@ import org.apache.log4j.Logger;
public class CheckForUpdatesDialog extends HelpEnabledDialog {
private Logger logger = Logger.getLogger(CheckForUpdatesDialog.class);
+ private Path lastUpdateCheckFile;
- public CheckForUpdatesDialog(){
+ public CheckForUpdatesDialog(Path lastUpdateCheckFile){
super((Frame)null, "Updates available", true);
+ this.lastUpdateCheckFile = lastUpdateCheckFile;
initComponents();
}
// For testing
- public static void main (String[] args){
- CheckForUpdatesDialog dialog = new CheckForUpdatesDialog();
+ public static void main (String[] args) throws IOException{
+ CheckForUpdatesDialog dialog = new CheckForUpdatesDialog(Files.createTempFile("update", ".tmp"));
dialog.setVisible(true);
}
@@ -98,16 +101,17 @@ public class CheckForUpdatesDialog extends HelpEnabledDialog {
(dimension.height - abounds.height) / 2);
setSize(getPreferredSize());
}
-
+
protected void okPressed() {
- try {
- FileUtils.touch(CheckForUpdatesStartupHook.lastUpdateCheckFile);
- } catch (IOException ioex) {
- logger.error("Failed to touch the 'Last update check' file for Taverna updates.", ioex);
- }
- closeDialog();
+ try {
+ FileTime time = FileTime.from(Instant.now());
+ Files.setLastModifiedTime(lastUpdateCheckFile, time);
+ } catch (IOException ioex) {
+ logger.error("Failed to update file " + lastUpdateCheckFile, ioex);
+ }
+ closeDialog();
}
-
+
private void closeDialog() {
setVisible(false);
dispose();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c5c6a82/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
index 2cf2289..df7c20e 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
@@ -16,8 +16,14 @@
*/
package org.apache.taverna.raven.plugins.ui;
-import java.io.File;
-import java.util.Date;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileTime;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
import org.apache.log4j.Logger;
import org.apache.taverna.configuration.app.ApplicationConfiguration;
@@ -25,7 +31,6 @@ import org.apache.taverna.plugin.PluginException;
import org.apache.taverna.plugin.PluginManager;
import org.apache.taverna.workbench.StartupSPI;
import org.osgi.service.event.Event;
-import org.osgi.service.event.EventAdmin;
import org.osgi.service.event.EventHandler;
/**
@@ -42,10 +47,9 @@ public class CheckForUpdatesStartupHook implements StartupSPI, EventHandler {
this.applicationConfiguration = applicationConfiguration;
}
- public static final String CHECK_FOR_UPDATES_DIRECTORY_NAME = "updates";
- public static final String LAST_UPDATE_CHECK_FILE_NAME = "last_update_check";
+ public static final String UPDATES = "updates";
+ public static final String LAST_UPDATE_CHECK = "last_update_check";
- private EventAdmin eventAdmin;
private PluginManager pluginManager;
private ApplicationConfiguration applicationConfiguration;
private Logger logger = Logger.getLogger(CheckForUpdatesStartupHook.class);
@@ -55,48 +59,62 @@ public class CheckForUpdatesStartupHook implements StartupSPI, EventHandler {
}
public boolean startup() {
- File lastUpdateCheckFile = new File(getCheckForUpdatesDirectory(),
- LAST_UPDATE_CHECK_FILE_NAME);
- // Check if more than 2 weeks passed since we checked for updates.
- if (lastUpdateCheckFile.exists()) {
- long lastModified = lastUpdateCheckFile.lastModified();
- long now = new Date().getTime();
-
- if (now - lastModified < 14 * 24 * 3600 * 1000) { // 2 weeks have not passed since we
- // last asked
- // No need to check for updates yet
+ Path lastUpdateCheckFile = lastUpdateCheckFile();
+ if (Files.exists(lastUpdateCheckFile)) {
+ FileTime lastChecked;
+ try {
+ lastChecked = Files.getLastModifiedTime(lastUpdateCheckFile);
+ } catch (IOException e) {
+ // Should be able to check time of an existing file, some kind
+ // of disk error?
+ logger.error("Can't check file " + lastUpdateCheckFile, e);
+ return false;
+ }
+ Instant twoWeeksAgo = Instant.now().minus(2, ChronoUnit.WEEKS);
+ if (lastChecked.toInstant().isAfter(twoWeeksAgo)) {
+ // No need to check yet
return true;
}
}
+
+ // last-check-file didn't exist, or it's more than two weeks ago
+
try {
pluginManager.checkForUpdates();
+ // Content of file doesn't matter.. but we'll write
+ // today's date even if we don't check the content of the
+ // file later
+ String message = Instant.now().toString();
+ Files.write(lastUpdateCheckFile, Arrays.asList(message), StandardCharsets.UTF_8);
} catch (PluginException e) {
logger.error("Can't check for updates", e);
return false;
+ } catch (IOException e) {
+ logger.error("Can't write to file " + lastUpdateCheckFile, e);
+ return false;
}
return true;
}
-
- /**
- * Gets the registration directory where info about registration will be saved to.
- */
- public File getCheckForUpdatesDirectory() {
-
- File home = applicationConfiguration.getApplicationHomeDir().toFile();
-
- File registrationDirectory = new File(home, CHECK_FOR_UPDATES_DIRECTORY_NAME);
- if (!registrationDirectory.exists()) {
- registrationDirectory.mkdir();
+ private Path lastUpdateCheckFile() {
+ Path dir = applicationConfiguration.getApplicationHomeDir().resolve(UPDATES);
+ try {
+ Files.createDirectories(dir);
+ } catch (IOException e) {
+ logger.error("Can't create directories" + dir, e);
+ // We can't recover from this here, but this would cause another
+ // error in the calling methods. It's still OK to return
+ // the non-existing path below:
}
- return registrationDirectory;
+ return dir.resolve(LAST_UPDATE_CHECK);
}
+
@Override
public void handleEvent(Event event) {
// TODO: Handle Plug
if (event.getTopic().equals(PluginManager.UPDATES_AVAILABLE)) {
- CheckForUpdatesDialog dialog = new CheckForUpdatesDialog();
+ CheckForUpdatesDialog dialog = new CheckForUpdatesDialog(lastUpdateCheckFile());
dialog.setVisible(true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c5c6a82/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListCellRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListCellRenderer.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListCellRenderer.java
index efd13a5..3f7c7ba 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListCellRenderer.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListCellRenderer.java
@@ -30,12 +30,9 @@ import javax.swing.JPanel;
import javax.swing.ListCellRenderer;
import javax.swing.border.AbstractBorder;
-import uk.org.taverna.commons.plugin.PluginManager;
+import org.apache.taverna.plugin.Plugin;
+import org.apache.taverna.plugin.PluginManager;
-/**
- *
- * @author David Withers
- */
public class PluginListCellRenderer extends JPanel implements ListCellRenderer {
private static final long serialVersionUID = 1L;
@@ -157,7 +154,7 @@ public class PluginListCellRenderer extends JPanel implements ListCellRenderer {
if (value instanceof Plugin) {
Plugin plugin = (Plugin) value;
name.setText(plugin.getName());
- version.setText(plugin.getVersion());
+ version.setText(plugin.getVersion().toString());
description.setText("<html>"+plugin.getDescription());
status2.setText("");
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c5c6a82/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListModel.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListModel.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListModel.java
index 9d6c99d..725290e 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListModel.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginListModel.java
@@ -19,11 +19,8 @@ package org.apache.taverna.raven.plugins.ui;
import javax.swing.AbstractListModel;
import org.apache.log4j.Logger;
+import org.apache.taverna.plugin.PluginManager;
-/**
- *
- * @author David Withers
- */
@SuppressWarnings("serial")
public class PluginListModel extends AbstractListModel implements PluginManagerListener {
private PluginManager pluginManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c5c6a82/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginManagerFrame.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginManagerFrame.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginManagerFrame.java
index 55ca4a5..00261b8 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginManagerFrame.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginManagerFrame.java
@@ -37,8 +37,7 @@ import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import uk.org.taverna.commons.plugin.PluginManager;
-
+import org.apache.taverna.plugin.PluginManager;
import org.apache.taverna.workbench.helper.HelpEnabledDialog;
/**
@@ -70,8 +69,6 @@ public class PluginManagerFrame extends HelpEnabledDialog {
private JButton closeButton = null;
- private PluginManagerListener managerListener;
-
/**
* This is the default constructor
*/
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c5c6a82/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginSiteFrame.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginSiteFrame.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginSiteFrame.java
index 5c9aebf..c7a20cd 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginSiteFrame.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/PluginSiteFrame.java
@@ -46,15 +46,11 @@ import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
import javax.swing.border.EtchedBorder;
-import uk.org.taverna.commons.plugin.PluginManager;
-
+import org.apache.taverna.plugin.PluginManager;
+import org.apache.taverna.plugin.PluginSite;
import org.apache.taverna.workbench.helper.HelpEnabledDialog;
-/**
- *
- * @author David Withers
- */
public class PluginSiteFrame extends HelpEnabledDialog {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4c5c6a82/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/UpdatesAvailableIcon.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/UpdatesAvailableIcon.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/UpdatesAvailableIcon.java
index f083d84..59289d2 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/UpdatesAvailableIcon.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/UpdatesAvailableIcon.java
@@ -29,6 +29,7 @@ import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
+import org.osgi.service.event.EventHandler;
/**
* A JLabel that periodically checks for updates, running on a daemon thread. If
@@ -41,7 +42,7 @@ import org.apache.log4j.Logger;
*/
@SuppressWarnings("serial")
-public class UpdatesAvailableIcon extends JLabel implements PluginManagerListener {
+public class UpdatesAvailableIcon extends JLabel implements EventHandler {
private UpdatePluginsMouseAdaptor updatePluginMouseAdaptor = new UpdatePluginsMouseAdaptor();
private static Logger logger = Logger.getLogger(UpdatesAvailableIcon.class);
[7/7] incubator-taverna-workbench git commit: Use Path instead of File
Posted by st...@apache.org.
Use Path instead of File
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/8e41379f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/8e41379f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/8e41379f
Branch: refs/heads/master
Commit: 8e41379ff5d10bef70f770b10255d2fb605d2e0c
Parents: 0bba476
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Oct 24 11:09:55 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Oct 24 11:09:55 2016 +0100
----------------------------------------------------------------------
.../taverna/workbench/run/actions/OpenWorkflowRunAction.java | 7 ++++---
.../taverna/workbench/run/menu/FileOpenRunMenuAction.java | 8 +++-----
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/8e41379f/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java
index 583a463..89fd932 100644
--- a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java
+++ b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java
@@ -25,6 +25,7 @@ import java.awt.Component;
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import javax.swing.AbstractAction;
import javax.swing.JFileChooser;
@@ -48,9 +49,9 @@ public class OpenWorkflowRunAction extends AbstractAction {
private static final String OPEN_WORKFLOW_RUN = "Open workflow run...";
private final RunService runService;
- private final File runStore;
+ private final Path runStore;
- public OpenWorkflowRunAction(RunService runService, File runStore) {
+ public OpenWorkflowRunAction(RunService runService, Path runStore) {
super(OPEN_WORKFLOW_RUN, WorkbenchIcons.openIcon);
this.runService = runService;
this.runStore = runStore;
@@ -82,7 +83,7 @@ public class OpenWorkflowRunAction extends AbstractAction {
}
});
- fileChooser.setCurrentDirectory(runStore);
+ fileChooser.setCurrentDirectory(runStore.toFile());
fileChooser.setMultiSelectionEnabled(true);
if (fileChooser.showOpenDialog(parentComponent) == APPROVE_OPTION) {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/8e41379f/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/menu/FileOpenRunMenuAction.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/menu/FileOpenRunMenuAction.java b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/menu/FileOpenRunMenuAction.java
index 74ba35f..fde31bf 100644
--- a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/menu/FileOpenRunMenuAction.java
+++ b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/menu/FileOpenRunMenuAction.java
@@ -18,12 +18,12 @@ package org.apache.taverna.workbench.run.menu;
import static org.apache.taverna.workbench.run.menu.FileRunMenuSection.FILE_RUN_SECTION_URI;
-import java.io.File;
import java.net.URI;
+import java.nio.file.Path;
import javax.swing.Action;
-import org.apache.taverna.configuration.app.ApplicationConfiguration;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
import org.apache.taverna.platform.run.api.RunService;
import org.apache.taverna.ui.menu.AbstractMenuAction;
import org.apache.taverna.workbench.run.actions.OpenWorkflowRunAction;
@@ -42,9 +42,7 @@ public class FileOpenRunMenuAction extends AbstractMenuAction {
@Override
protected Action createAction() {
- File runStore = new File(
- applicationConfiguration.getApplicationHomeDir(),
- RUN_STORE_DIRECTORY);
+ Path runStore = applicationConfiguration.getApplicationHomeDir().resolve(RUN_STORE_DIRECTORY);
return new OpenWorkflowRunAction(runService, runStore);
}
[5/7] incubator-taverna-workbench git commit: Use Path with
RunService, not File
Posted by st...@apache.org.
Use Path with RunService, not File
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/1aabbf1f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/1aabbf1f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/1aabbf1f
Branch: refs/heads/master
Commit: 1aabbf1f39777f552e2d74eb41bcf1ab5a1489b1
Parents: 4c99d96
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Oct 24 11:06:54 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Oct 24 11:06:54 2016 +0100
----------------------------------------------------------------------
.../taverna/workbench/run/actions/OpenWorkflowRunAction.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/1aabbf1f/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java
----------------------------------------------------------------------
diff --git a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java
index e5038f9..583a463 100644
--- a/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java
+++ b/taverna-run-ui/src/main/java/org/apache/taverna/workbench/run/actions/OpenWorkflowRunAction.java
@@ -96,7 +96,7 @@ public class OpenWorkflowRunAction extends AbstractAction {
public Void doInBackground() {
for (File file : selectedFiles)
try {
- runService.open(file);
+ runService.open(file.toPath());
} catch (IOException e) {
showErrorMessage(parentComponent, file, e);
}
[2/7] incubator-taverna-workbench git commit: OSGI-based check for
updates/notice
Posted by st...@apache.org.
OSGI-based check for updates/notice
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/9a622225
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/9a622225
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/9a622225
Branch: refs/heads/master
Commit: 9a622225466e3b9981020852f36bd1057d29ed26
Parents: e1480ab
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Oct 24 10:34:50 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Oct 24 10:34:50 2016 +0100
----------------------------------------------------------------------
taverna-plugins-gui/pom.xml | 6 +
.../plugins/ui/CheckForNoticeStartupHook.java | 183 ++++++++++---------
.../plugins/ui/CheckForUpdatesStartupHook.java | 3 -
.../spring/plugins-gui-context-osgi.xml | 8 +-
.../META-INF/spring/plugins-gui-context.xml | 6 +-
5 files changed, 109 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9a622225/taverna-plugins-gui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/pom.xml b/taverna-plugins-gui/pom.xml
index 9617dfd..acbf62d 100644
--- a/taverna-plugins-gui/pom.xml
+++ b/taverna-plugins-gui/pom.xml
@@ -42,6 +42,12 @@
<artifactId>taverna-app-configuration-api</artifactId>
<version>${taverna.osgi.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.taverna.osgi</groupId>
+ <artifactId>taverna-download-api</artifactId>
+ <version>${taverna.osgi.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9a622225/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForNoticeStartupHook.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForNoticeStartupHook.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForNoticeStartupHook.java
index 48794ff..ab318a3 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForNoticeStartupHook.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForNoticeStartupHook.java
@@ -17,140 +17,141 @@
package org.apache.taverna.raven.plugins.ui;
import java.awt.GraphicsEnvironment;
-import java.io.File;
+import java.awt.HeadlessException;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.FileTime;
import javax.swing.JOptionPane;
import org.apache.log4j.Logger;
-
-import org.apache.commons.httpclient.Header;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.HttpStatus;
-import org.apache.commons.io.FileUtils;
-
-import net.sf.taverna.raven.appconfig.ApplicationConfig;
-import net.sf.taverna.raven.plugins.PluginManager;
-import net.sf.taverna.raven.spi.Profile;
-import net.sf.taverna.raven.spi.ProfileFactory;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
+import org.apache.taverna.download.DownloadException;
+import org.apache.taverna.download.DownloadManager;
import org.apache.taverna.workbench.StartupSPI;
import org.apache.taverna.workbench.icons.WorkbenchIcons;
/**
*
- * This class looks for a notice on the myGrid website that is later than the
+ * This class looks for a notice on the Taverna website that is later than the
* one (if any) in the application directory. It then displays the notice. This
* is intended to allow simple messages to be sent to all users.
*
- * @author alanrw
- *
*/
public class CheckForNoticeStartupHook implements StartupSPI {
+ private static final String UPDATES = "updates";
+ private static final String LAST_NOTICE = "last_notice";
+ private static final String NOTICE = "notice";
+
private static Logger logger = Logger
.getLogger(CheckForNoticeStartupHook.class);
- private static final String LAST_NOTICE_CHECK_FILE_NAME = "last_notice";
-
-
- private static File checkForUpdatesDirectory = CheckForUpdatesStartupHook
- .getCheckForUpdatesDirectory();
- private static File lastNoticeCheckFile = new File(checkForUpdatesDirectory,
- LAST_NOTICE_CHECK_FILE_NAME);
+ private DownloadManager downloadManager;
- private static String pattern = "EEE, dd MMM yyyy HH:mm:ss Z";
- private static SimpleDateFormat format = new SimpleDateFormat(pattern);
-
- private static Profile profile = ProfileFactory.getInstance().getProfile();
- private static String version = profile.getVersion();
-
- private static String BASE_URL = "https://taverna.apache.org/updates";
- private static String SUFFIX = "notice";
+ private ApplicationConfiguration applicationConfiguration;
- private static int TIMEOUT = 5000;
-
- /*
- * (non-Javadoc)
- *
- * @see net.sf.taverna.t2.workbench.StartupSPI#positionHint()
- */
public int positionHint() {
return 95;
}
- /*
- * (non-Javadoc)
- *
- * @see net.sf.taverna.t2.workbench.StartupSPI#startup()
- */
public boolean startup() {
-
if (GraphicsEnvironment.isHeadless()) {
- return true; // if we are running headlessly just return
+ return true; // if we are running without graphics we won't check for notices
}
- long noticeTime = -1;
- long lastCheckedTime = -1;
-
- HttpClient client = new HttpClient();
- client.setConnectionTimeout(TIMEOUT);
- client.setTimeout(TIMEOUT);
- PluginManager.setProxy(client);
- String message = null;
-
- try {
- URI noticeURI = new URI(BASE_URL + "/" + version + "/" + SUFFIX);
- HttpMethod method = new GetMethod(noticeURI.toString());
- int statusCode = client.executeMethod(method);
- if (statusCode != HttpStatus.SC_OK) {
- logger.warn("HTTP status " + statusCode + " while getting "
- + noticeURI);
- return true;
+ FileTime previousLastModified = FileTime.fromMillis(0);
+ Path lastNoticeCheckFile = applicationConfiguration.getApplicationHomeDir().resolve(UPDATES).resolve(LAST_NOTICE);
+
+ if (Files.exists(lastNoticeCheckFile)) {
+ try {
+ previousLastModified = Files.getLastModifiedTime(lastNoticeCheckFile);
+ } catch (IOException e) {
+ logger.error("Could not check " + lastNoticeCheckFile, e);
+ return false;
}
- String noticeTimeString = null;
- Header h = method.getResponseHeader("Last-Modified");
- message = method.getResponseBodyAsString();
- if (h != null) {
- noticeTimeString = h.getValue();
- noticeTime = format.parse(noticeTimeString).getTime();
- logger.info("NoticeTime is " + noticeTime);
+ } else {
+ // Prepare the folder so we can download to it later
+ Path parent = lastNoticeCheckFile.getParent();
+ try {
+ Files.createDirectories(parent);
+ } catch (IOException e) {
+ logger.error("Could not create folders " + parent, e);
+ return false;
}
+ }
+
+ URI noticeURI;
+ try {
+ // e.g. https://taverna.incubator.apache.org/updates/workbench/3.1.0.incubating/notice
+ noticeURI = new URI(updateSite()).resolve(version() + "/").resolve(NOTICE);
+
} catch (URISyntaxException e) {
- logger.error("URI problem", e);
+ logger.error("Invalid plugin site URL: " + updateSite(), e);
return true;
- } catch (IOException e) {
- logger.info("Could not read notice", e);
- } catch (ParseException e) {
- logger.error("Could not parse last-modified time", e);
}
- if (lastNoticeCheckFile.exists()) {
- lastCheckedTime = lastNoticeCheckFile.lastModified();
+ try {
+ downloadManager.download(noticeURI, lastNoticeCheckFile);
+ } catch (DownloadException e) {
+ logger.error("Could not download from " + noticeURI, e);
+ return true;
}
- if ((message != null) && (noticeTime != -1)) {
- if (noticeTime > lastCheckedTime) {
+ // After successful download the file should exist, so if we
+ // get an IOException below we bail out early (e.g. disk error)
+ try {
+ FileTime newLastModified = Files.getLastModifiedTime(lastNoticeCheckFile);
+ if (hasMessage(lastNoticeCheckFile) &&
+ isNewer(newLastModified, previousLastModified)) {
+ // Our "API" is that the file should always be in UTF8..
+ String message = new String(Files.readAllBytes(lastNoticeCheckFile), StandardCharsets.UTF_8);
// Show the notice dialog
- JOptionPane.showMessageDialog(null, message, "Taverna notice",
- JOptionPane.INFORMATION_MESSAGE,
- WorkbenchIcons.tavernaCogs64x64Icon);
- try {
- FileUtils.touch(lastNoticeCheckFile);
- } catch (IOException e) {
- logger.error("Unable to touch file", e);
- }
+ JOptionPane.showMessageDialog(null, message, product(),
+ JOptionPane.INFORMATION_MESSAGE,
+ WorkbenchIcons.tavernaCogs64x64Icon);
}
+ return true;
+ } catch (HeadlessException e) {
+ // but we already checked for GraphicsEnvironment.isHeadless above..!
+ logger.error("Can't initialize GUI", e);
+ return false;
+ } catch (IOException e) {
+ logger.error("Can't read " + lastNoticeCheckFile, e);
+ return false;
}
- return true;
+ }
+
+ private boolean isNewer(FileTime newLastModified, FileTime previousLastModified) {
+ return newLastModified.compareTo(previousLastModified) > 0;
+ }
+
+ private boolean hasMessage(Path lastNoticeCheckFile) throws IOException {
+ return Files.size(lastNoticeCheckFile) > 0;
+ }
+
+ private String updateSite() {
+ return applicationConfiguration.getApplicationProfile().getUpdates().getUpdateSite();
+ }
+
+ private String version() {
+ return applicationConfiguration.getApplicationProfile().getVersion();
+ }
+ private String product() {
+ return applicationConfiguration.getApplicationProfile().getName();
+ }
+
+ public void setDownloadManager(DownloadManager downloadManager) {
+ this.downloadManager = downloadManager;
+ }
+
+ public void setApplicationConfiguration(ApplicationConfiguration applicationConfiguration) {
+ this.applicationConfiguration = applicationConfiguration;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9a622225/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
index 830d018..2cf2289 100644
--- a/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
+++ b/taverna-plugins-gui/src/main/java/org/apache/taverna/raven/plugins/ui/CheckForUpdatesStartupHook.java
@@ -31,9 +31,6 @@ import org.osgi.service.event.EventHandler;
/**
* Startup hook for checking if there are available updates for Taverna plugins.
*
- * @author Alex Nenadic
- * @author Stian Soiland-Reyes
- *
*/
public class CheckForUpdatesStartupHook implements StartupSPI, EventHandler {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9a622225/taverna-plugins-gui/src/main/resources/META-INF/spring/plugins-gui-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/resources/META-INF/spring/plugins-gui-context-osgi.xml b/taverna-plugins-gui/src/main/resources/META-INF/spring/plugins-gui-context-osgi.xml
index 566a170..1a5f318 100644
--- a/taverna-plugins-gui/src/main/resources/META-INF/spring/plugins-gui-context-osgi.xml
+++ b/taverna-plugins-gui/src/main/resources/META-INF/spring/plugins-gui-context-osgi.xml
@@ -24,15 +24,19 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="CheckForUpdatesStartupHook" auto-export="interfaces">
+ <service ref="CheckForUpdatesStartupHook" auto-export="interfaces"> <!-- multiple interfaces -->
<service-properties value-type="java.lang.String[]">
+ <!-- subscribe to notifications from Plugin Manager -->
<beans:entry key="event.topics"
- value="org/apache/taverna/platform/run/api/RunService/*" />
+ value="org/apache/taverna/plugin/PluginManager/*" />
</service-properties>
</service>
+ <service ref="CheckForNoticeStartupHook" interface="org.apache.taverna.workbench.StartupSPI" />
+
<reference id="eventAdmin" interface="org.osgi.service.event.EventAdmin" />
<reference id="pluginManager" interface="org.apache.taverna.plugin.PluginManager" />
+ <reference id="downloadManager" interface="org.apache.taverna.download.DownloadManager" />
<reference id="applicationConfiguration" interface="org.apache.taverna.configuration.app.ApplicationConfiguration" />
</beans:beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/9a622225/taverna-plugins-gui/src/main/resources/META-INF/spring/plugins-gui-context.xml
----------------------------------------------------------------------
diff --git a/taverna-plugins-gui/src/main/resources/META-INF/spring/plugins-gui-context.xml b/taverna-plugins-gui/src/main/resources/META-INF/spring/plugins-gui-context.xml
index 7900c3f..f2bfad7 100644
--- a/taverna-plugins-gui/src/main/resources/META-INF/spring/plugins-gui-context.xml
+++ b/taverna-plugins-gui/src/main/resources/META-INF/spring/plugins-gui-context.xml
@@ -21,10 +21,14 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="CheckForUpdatesStartupHook" class="net.sf.taverna.raven.plugins.ui.CheckForUpdatesStartupHook">
+ <bean id="CheckForUpdatesStartupHook" class="org.apache.taverna.raven.plugins.ui.CheckForUpdatesStartupHook">
<property name="eventAdmin" ref="eventAdmin" />
<property name="pluginManager" ref="pluginManager" />
<property name="applicationConfiguration" ref="applicationConfiguration" />
</bean>
+ <bean id="CheckForNoticeStartupHook" class="org.apache.taverna.raven.plugins.ui.CheckForNoticeStartupHook">
+ <property name="applicationConfiguration" ref="applicationConfiguration" />
+ <property name="downloadManager" ref="downloadManager" />
+ </bean>
</beans>