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 2015/10/18 17:37:37 UTC
[02/17] incubator-taverna-osgi git commit:
uk.org.taverna.configuration.app -> org.apache.taverna.configuration.app
uk.org.taverna.configuration.app -> org.apache.taverna.configuration.app
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/commit/98e26a2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/tree/98e26a2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/diff/98e26a2c
Branch: refs/heads/master
Commit: 98e26a2c51f6dc5e610763e88aeb2580934f51e3
Parents: a1422f8
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Oct 18 13:27:47 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Oct 18 13:27:47 2015 +0100
----------------------------------------------------------------------
.../app/ApplicationConfiguration.java | 62 ++++++++++++++++++++
.../app/ApplicationConfiguration.java | 62 --------------------
taverna-app-configuration-impl/pom.xml | 2 +-
.../app/impl/ApplicationConfigurationImpl.java | 2 +-
.../app/impl/Log4JConfiguration.java | 3 +-
.../spring/configuration-context-osgi.xml | 2 +-
.../META-INF/spring/configuration-context.xml | 4 +-
.../impl/ConfigurationManagerImpl.java | 2 +-
.../spring/configuration-context-osgi.xml | 2 +-
.../impl/ConfigurationManagerImplTest.java | 2 +-
.../commons/plugin/impl/PluginManagerImpl.java | 2 +-
.../plugin/impl/PluginSiteManagerImpl.java | 2 +-
.../META-INF/spring/plugin-context-osgi.xml | 2 +-
.../plugin/impl/PluginSiteManagerImplTest.java | 4 +-
.../commons/update/impl/UpdateManagerImpl.java | 2 +-
.../META-INF/spring/update-context-osgi.xml | 2 +-
16 files changed, 78 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-app-configuration-api/src/main/java/org/apache/taverna/configuration/app/ApplicationConfiguration.java
----------------------------------------------------------------------
diff --git a/taverna-app-configuration-api/src/main/java/org/apache/taverna/configuration/app/ApplicationConfiguration.java b/taverna-app-configuration-api/src/main/java/org/apache/taverna/configuration/app/ApplicationConfiguration.java
new file mode 100644
index 0000000..b71726b
--- /dev/null
+++ b/taverna-app-configuration-api/src/main/java/org/apache/taverna/configuration/app/ApplicationConfiguration.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (C) 2012 The University of Manchester
+ *
+ * Modifications to the initial code base are copyright of their
+ * respective authors, or their employers as appropriate.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ ******************************************************************************/
+package org.apache.taverna.configuration.app;
+
+import java.io.File;
+
+import uk.org.taverna.commons.profile.xml.jaxb.ApplicationProfile;
+
+/**
+ * Represent the application config as it has been specified in
+ * {@value #PROPERTIES}. This configuration specifies the application's name
+ * and title, etc.
+ * <p>
+ * An application would typically provide the {@value #PROPERTIES} file on the classpath under
+ * a <code>conf</code> directory, or in a <code>conf</code> directory in the
+ * application's distribution directory.
+ *
+ * @author Stian Soiland-Reyes
+ * @author David Withers
+ */
+public interface ApplicationConfiguration {
+
+ public static final String CONF_DIR = "conf/";
+ public static final String PLUGINS_DIR = "plugins";
+
+ public String getName();
+
+ public String getTitle();
+
+ public File getStartupDir();
+
+ public File getApplicationHomeDir();
+
+ public File getUserPluginDir();
+
+ public File getSystemPluginDir();
+
+ public File getLogFile();
+
+ public File getLogDir();
+
+ public ApplicationProfile getApplicationProfile();
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-app-configuration-api/src/main/java/uk/org/taverna/configuration/app/ApplicationConfiguration.java
----------------------------------------------------------------------
diff --git a/taverna-app-configuration-api/src/main/java/uk/org/taverna/configuration/app/ApplicationConfiguration.java b/taverna-app-configuration-api/src/main/java/uk/org/taverna/configuration/app/ApplicationConfiguration.java
deleted file mode 100644
index b372598..0000000
--- a/taverna-app-configuration-api/src/main/java/uk/org/taverna/configuration/app/ApplicationConfiguration.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2012 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package uk.org.taverna.configuration.app;
-
-import java.io.File;
-
-import uk.org.taverna.commons.profile.xml.jaxb.ApplicationProfile;
-
-/**
- * Represent the application config as it has been specified in
- * {@value #PROPERTIES}. This configuration specifies the application's name
- * and title, etc.
- * <p>
- * An application would typically provide the {@value #PROPERTIES} file on the classpath under
- * a <code>conf</code> directory, or in a <code>conf</code> directory in the
- * application's distribution directory.
- *
- * @author Stian Soiland-Reyes
- * @author David Withers
- */
-public interface ApplicationConfiguration {
-
- public static final String CONF_DIR = "conf/";
- public static final String PLUGINS_DIR = "plugins";
-
- public String getName();
-
- public String getTitle();
-
- public File getStartupDir();
-
- public File getApplicationHomeDir();
-
- public File getUserPluginDir();
-
- public File getSystemPluginDir();
-
- public File getLogFile();
-
- public File getLogDir();
-
- public ApplicationProfile getApplicationProfile();
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-app-configuration-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-app-configuration-impl/pom.xml b/taverna-app-configuration-impl/pom.xml
index 55bab09..7f87c78 100644
--- a/taverna-app-configuration-impl/pom.xml
+++ b/taverna-app-configuration-impl/pom.xml
@@ -16,7 +16,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>uk.org.taverna.configuration.app;provide:=true,*</Import-Package>
+ <Import-Package>org.apache.taverna.configuration.app;provide:=true,*</Import-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-app-configuration-impl/src/main/java/uk/org/taverna/configuration/app/impl/ApplicationConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/taverna-app-configuration-impl/src/main/java/uk/org/taverna/configuration/app/impl/ApplicationConfigurationImpl.java b/taverna-app-configuration-impl/src/main/java/uk/org/taverna/configuration/app/impl/ApplicationConfigurationImpl.java
index b45f36f..8230e85 100644
--- a/taverna-app-configuration-impl/src/main/java/uk/org/taverna/configuration/app/impl/ApplicationConfigurationImpl.java
+++ b/taverna-app-configuration-impl/src/main/java/uk/org/taverna/configuration/app/impl/ApplicationConfigurationImpl.java
@@ -38,9 +38,9 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import org.apache.log4j.Logger;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
import uk.org.taverna.commons.profile.xml.jaxb.ApplicationProfile;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
/**
* Represent the application config as it has been specified in {@value #PROPERTIES}. This
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-app-configuration-impl/src/main/java/uk/org/taverna/configuration/app/impl/Log4JConfiguration.java
----------------------------------------------------------------------
diff --git a/taverna-app-configuration-impl/src/main/java/uk/org/taverna/configuration/app/impl/Log4JConfiguration.java b/taverna-app-configuration-impl/src/main/java/uk/org/taverna/configuration/app/impl/Log4JConfiguration.java
index f0e88c2..3585815 100644
--- a/taverna-app-configuration-impl/src/main/java/uk/org/taverna/configuration/app/impl/Log4JConfiguration.java
+++ b/taverna-app-configuration-impl/src/main/java/uk/org/taverna/configuration/app/impl/Log4JConfiguration.java
@@ -32,8 +32,7 @@ import org.apache.log4j.LogManager;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.RollingFileAppender;
-
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
public class Log4JConfiguration {
public final static String LOG4J_PROPERTIES = "log4j.properties";
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-app-configuration-impl/src/main/resources/META-INF/spring/configuration-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-app-configuration-impl/src/main/resources/META-INF/spring/configuration-context-osgi.xml b/taverna-app-configuration-impl/src/main/resources/META-INF/spring/configuration-context-osgi.xml
index 86cb988..e389ba1 100644
--- a/taverna-app-configuration-impl/src/main/resources/META-INF/spring/configuration-context-osgi.xml
+++ b/taverna-app-configuration-impl/src/main/resources/META-INF/spring/configuration-context-osgi.xml
@@ -6,6 +6,6 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd">
- <service ref="applicationConfiguration" interface="uk.org.taverna.configuration.app.ApplicationConfiguration" />
+ <service ref="applicationConfiguration" interface="org.apache.taverna.configuration.app.ApplicationConfiguration" />
</beans:beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-app-configuration-impl/src/main/resources/META-INF/spring/configuration-context.xml
----------------------------------------------------------------------
diff --git a/taverna-app-configuration-impl/src/main/resources/META-INF/spring/configuration-context.xml b/taverna-app-configuration-impl/src/main/resources/META-INF/spring/configuration-context.xml
index db9645e..b5190e2 100644
--- a/taverna-app-configuration-impl/src/main/resources/META-INF/spring/configuration-context.xml
+++ b/taverna-app-configuration-impl/src/main/resources/META-INF/spring/configuration-context.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="applicationConfiguration" class="uk.org.taverna.configuration.app.impl.ApplicationConfigurationImpl" />
- <bean id="log4JConfiguration" class="uk.org.taverna.configuration.app.impl.Log4JConfiguration" init-method="prepareLog4J">
+ <bean id="applicationConfiguration" class="org.apache.taverna.configuration.app.impl.ApplicationConfigurationImpl" />
+ <bean id="log4JConfiguration" class="org.apache.taverna.configuration.app.impl.Log4JConfiguration" init-method="prepareLog4J">
<property name="applicationConfiguration">
<ref local="applicationConfiguration" />
</property>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-configuration-impl/src/main/java/uk/org/taverna/configuration/impl/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/taverna-configuration-impl/src/main/java/uk/org/taverna/configuration/impl/ConfigurationManagerImpl.java b/taverna-configuration-impl/src/main/java/uk/org/taverna/configuration/impl/ConfigurationManagerImpl.java
index 823155c..b538a7d 100644
--- a/taverna-configuration-impl/src/main/java/uk/org/taverna/configuration/impl/ConfigurationManagerImpl.java
+++ b/taverna-configuration-impl/src/main/java/uk/org/taverna/configuration/impl/ConfigurationManagerImpl.java
@@ -27,10 +27,10 @@ import java.util.Map;
import java.util.Properties;
import org.apache.log4j.Logger;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
import uk.org.taverna.configuration.Configurable;
import uk.org.taverna.configuration.ConfigurationManager;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
/**
* Handles the configuration for a {@link Configurable} object
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-configuration-impl/src/main/resources/META-INF/spring/configuration-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-configuration-impl/src/main/resources/META-INF/spring/configuration-context-osgi.xml b/taverna-configuration-impl/src/main/resources/META-INF/spring/configuration-context-osgi.xml
index 0236d73..f99894c 100644
--- a/taverna-configuration-impl/src/main/resources/META-INF/spring/configuration-context-osgi.xml
+++ b/taverna-configuration-impl/src/main/resources/META-INF/spring/configuration-context-osgi.xml
@@ -9,6 +9,6 @@
<service ref="configurationManager" interface="uk.org.taverna.configuration.ConfigurationManager" />
<service ref="httpProxyConfiguration" interface="uk.org.taverna.configuration.proxy.HttpProxyConfiguration" />
- <reference id="applicationConfiguration" interface="uk.org.taverna.configuration.app.ApplicationConfiguration" />
+ <reference id="applicationConfiguration" interface="org.apache.taverna.configuration.app.ApplicationConfiguration" />
</beans:beans>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-configuration-impl/src/test/java/uk/org/taverna/configuration/impl/ConfigurationManagerImplTest.java
----------------------------------------------------------------------
diff --git a/taverna-configuration-impl/src/test/java/uk/org/taverna/configuration/impl/ConfigurationManagerImplTest.java b/taverna-configuration-impl/src/test/java/uk/org/taverna/configuration/impl/ConfigurationManagerImplTest.java
index e09ffb6..4bdaf08 100644
--- a/taverna-configuration-impl/src/test/java/uk/org/taverna/configuration/impl/ConfigurationManagerImplTest.java
+++ b/taverna-configuration-impl/src/test/java/uk/org/taverna/configuration/impl/ConfigurationManagerImplTest.java
@@ -30,6 +30,7 @@ import java.io.FileInputStream;
import java.util.Properties;
import java.util.UUID;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
import org.junit.Before;
import org.junit.Test;
@@ -37,7 +38,6 @@ import uk.org.taverna.commons.profile.xml.jaxb.ApplicationProfile;
import uk.org.taverna.configuration.AbstractConfigurable;
import uk.org.taverna.configuration.Configurable;
import uk.org.taverna.configuration.DummyConfigurable;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
public class ConfigurationManagerImplTest {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-plugin-impl/src/main/java/uk/org/taverna/commons/plugin/impl/PluginManagerImpl.java
----------------------------------------------------------------------
diff --git a/taverna-plugin-impl/src/main/java/uk/org/taverna/commons/plugin/impl/PluginManagerImpl.java b/taverna-plugin-impl/src/main/java/uk/org/taverna/commons/plugin/impl/PluginManagerImpl.java
index 364551c..738ed60 100644
--- a/taverna-plugin-impl/src/main/java/uk/org/taverna/commons/plugin/impl/PluginManagerImpl.java
+++ b/taverna-plugin-impl/src/main/java/uk/org/taverna/commons/plugin/impl/PluginManagerImpl.java
@@ -40,6 +40,7 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import org.apache.log4j.Logger;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
@@ -58,7 +59,6 @@ import uk.org.taverna.commons.plugin.PluginSiteManager;
import uk.org.taverna.commons.plugin.xml.jaxb.PluginInfo;
import uk.org.taverna.commons.plugin.xml.jaxb.PluginVersions;
import uk.org.taverna.commons.profile.xml.jaxb.BundleInfo;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
/**
* PluginManager implementation.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-plugin-impl/src/main/java/uk/org/taverna/commons/plugin/impl/PluginSiteManagerImpl.java
----------------------------------------------------------------------
diff --git a/taverna-plugin-impl/src/main/java/uk/org/taverna/commons/plugin/impl/PluginSiteManagerImpl.java b/taverna-plugin-impl/src/main/java/uk/org/taverna/commons/plugin/impl/PluginSiteManagerImpl.java
index 1634d98..df8bfa8 100644
--- a/taverna-plugin-impl/src/main/java/uk/org/taverna/commons/plugin/impl/PluginSiteManagerImpl.java
+++ b/taverna-plugin-impl/src/main/java/uk/org/taverna/commons/plugin/impl/PluginSiteManagerImpl.java
@@ -33,6 +33,7 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import org.apache.log4j.Logger;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
import uk.org.taverna.commons.download.DownloadException;
import uk.org.taverna.commons.download.DownloadManager;
@@ -43,7 +44,6 @@ import uk.org.taverna.commons.plugin.PluginSiteManager;
import uk.org.taverna.commons.plugin.xml.jaxb.PluginVersions;
import uk.org.taverna.commons.plugin.xml.jaxb.Plugins;
import uk.org.taverna.commons.profile.xml.jaxb.Updates;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
/**
* PluginSiteManager implementation.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-plugin-impl/src/main/resources/META-INF/spring/plugin-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-plugin-impl/src/main/resources/META-INF/spring/plugin-context-osgi.xml b/taverna-plugin-impl/src/main/resources/META-INF/spring/plugin-context-osgi.xml
index cd235f5..c3b751d 100644
--- a/taverna-plugin-impl/src/main/resources/META-INF/spring/plugin-context-osgi.xml
+++ b/taverna-plugin-impl/src/main/resources/META-INF/spring/plugin-context-osgi.xml
@@ -9,7 +9,7 @@
<service ref="pluginManager" interface="uk.org.taverna.commons.plugin.PluginManager" />
<service ref="pluginSiteManager" interface="uk.org.taverna.commons.plugin.PluginSiteManager" />
- <reference id="applicationConfiguration" interface="uk.org.taverna.configuration.app.ApplicationConfiguration" />
+ <reference id="applicationConfiguration" interface="org.apache.taverna.configuration.app.ApplicationConfiguration" />
<reference id="downloadManager" interface="uk.org.taverna.commons.download.DownloadManager" />
<reference id="eventAdmin" interface="org.osgi.service.event.EventAdmin" />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-plugin-impl/src/test/java/uk/org/taverna/commons/plugin/impl/PluginSiteManagerImplTest.java
----------------------------------------------------------------------
diff --git a/taverna-plugin-impl/src/test/java/uk/org/taverna/commons/plugin/impl/PluginSiteManagerImplTest.java b/taverna-plugin-impl/src/test/java/uk/org/taverna/commons/plugin/impl/PluginSiteManagerImplTest.java
index 0ca9485..fc8b442 100644
--- a/taverna-plugin-impl/src/test/java/uk/org/taverna/commons/plugin/impl/PluginSiteManagerImplTest.java
+++ b/taverna-plugin-impl/src/test/java/uk/org/taverna/commons/plugin/impl/PluginSiteManagerImplTest.java
@@ -27,6 +27,7 @@ import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -34,7 +35,6 @@ import org.junit.Test;
import uk.org.taverna.commons.download.DownloadException;
import uk.org.taverna.commons.download.DownloadManager;
import uk.org.taverna.commons.plugin.PluginException;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
/**
*
@@ -124,7 +124,7 @@ public class PluginSiteManagerImplTest {
}
/**
- * Test method for {@link uk.org.taverna.commons.plugin.impl.PluginSiteManagerImpl#setApplicationConfiguration(uk.org.taverna.configuration.app.ApplicationConfiguration)}.
+ * Test method for {@link uk.org.taverna.commons.plugin.impl.PluginSiteManagerImpl#setApplicationConfiguration(org.apache.taverna.configuration.app.ApplicationConfiguration)}.
*/
@Test
public void testSetApplicationConfiguration() {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-update-impl/src/main/java/uk/org/taverna/commons/update/impl/UpdateManagerImpl.java
----------------------------------------------------------------------
diff --git a/taverna-update-impl/src/main/java/uk/org/taverna/commons/update/impl/UpdateManagerImpl.java b/taverna-update-impl/src/main/java/uk/org/taverna/commons/update/impl/UpdateManagerImpl.java
index 98d3257..d635036 100644
--- a/taverna-update-impl/src/main/java/uk/org/taverna/commons/update/impl/UpdateManagerImpl.java
+++ b/taverna-update-impl/src/main/java/uk/org/taverna/commons/update/impl/UpdateManagerImpl.java
@@ -36,6 +36,7 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import org.apache.commons.io.FileUtils;
+import org.apache.taverna.configuration.app.ApplicationConfiguration;
import org.osgi.service.event.EventAdmin;
import uk.org.taverna.commons.download.DownloadException;
@@ -48,7 +49,6 @@ import uk.org.taverna.commons.update.UpdateException;
import uk.org.taverna.commons.update.UpdateManager;
import uk.org.taverna.commons.versions.xml.jaxb.Version;
import uk.org.taverna.commons.versions.xml.jaxb.Versions;
-import uk.org.taverna.configuration.app.ApplicationConfiguration;
/**
* Implementation of the Taverna Update Manager.
http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/98e26a2c/taverna-update-impl/src/main/resources/META-INF/spring/update-context-osgi.xml
----------------------------------------------------------------------
diff --git a/taverna-update-impl/src/main/resources/META-INF/spring/update-context-osgi.xml b/taverna-update-impl/src/main/resources/META-INF/spring/update-context-osgi.xml
index 53f3c33..6234a5d 100644
--- a/taverna-update-impl/src/main/resources/META-INF/spring/update-context-osgi.xml
+++ b/taverna-update-impl/src/main/resources/META-INF/spring/update-context-osgi.xml
@@ -8,7 +8,7 @@
<service ref="updateManager" interface="uk.org.taverna.commons.update.UpdateManager" />
- <reference id="applicationConfiguration" interface="uk.org.taverna.configuration.app.ApplicationConfiguration" />
+ <reference id="applicationConfiguration" interface="org.apache.taverna.configuration.app.ApplicationConfiguration" />
<reference id="downloadManager" interface="uk.org.taverna.commons.download.DownloadManager" />
<!-- <reference id="eventAdmin" interface="org.osgi.service.event.EventAdmin" /> -->