Remove taverna3-commons bits not for taverna-osgi
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/fea36501 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/tree/fea36501 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/diff/fea36501 Branch: refs/heads/master Commit: fea3650183db6196249769c8ad058bacce4f7f76 Parents: 79be543 Author: Stian Soiland-Reyes <soiland-re...@cs.manchester.ac.uk> Authored: Thu Dec 18 22:30:09 2014 -0600 Committer: Stian Soiland-Reyes <soiland-re...@cs.manchester.ac.uk> Committed: Thu Dec 18 22:30:09 2014 -0600 ---------------------------------------------------------------------- .pom.xml.un~ | Bin 14153 -> 0 bytes .travis.yml | 1 - README.md | 3 - pom.xml | 52 ---- taverna-database-configuration-api/.project | 24 -- taverna-database-configuration-api/pom.xml | 42 ---- .../database/DatabaseConfiguration.java | 124 --------- .../configuration/database/DatabaseManager.java | 45 ---- taverna-database-configuration-impl/.project | 24 -- taverna-database-configuration-impl/pom.xml | 102 -------- .../impl/DatabaseConfigurationImpl.java | 252 ------------------- .../database/impl/DatabaseManagerImpl.java | 155 ------------ .../META-INF/spring/database-context-osgi.xml | 18 -- .../META-INF/spring/database-context.xml | 20 -- taverna-services-api/.project | 24 -- taverna-services-api/pom.xml | 41 --- .../services/ActivityTypeNotFoundException.java | 47 ---- .../services/InvalidConfigurationException.java | 47 ---- .../commons/services/ServiceRegistry.java | 89 ------- taverna-services-impl/.project | 24 -- taverna-services-impl/pom.xml | 64 ----- .../services/impl/ServiceRegistryImpl.java | 92 ------- .../spring/taverna-services-context-osgi.xml | 13 - .../spring/taverna-services-context.xml | 10 - 24 files changed, 1313 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/.pom.xml.un~ ---------------------------------------------------------------------- diff --git a/.pom.xml.un~ b/.pom.xml.un~ deleted file mode 100644 index 9419ffa..0000000 Binary files a/.pom.xml.un~ and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index dff5f3a..0000000 --- a/.travis.yml +++ /dev/null @@ -1 +0,0 @@ -language: java http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md deleted file mode 100644 index e573a56..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Taverna 3 common libraries - -This code was previously hosted at http://taverna.googlecode.com/svn/unsorted/taverna-commons/ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 0528e7b..0000000 --- a/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>taverna-parent</artifactId> - <groupId>net.sf.taverna</groupId> - <version>3.0.1-SNAPSHOT</version> - </parent> - <groupId>uk.org.taverna.commons</groupId> - <artifactId>taverna-commons</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Taverna 3 Commons</name> - <description>Taverna modules that are common to multiple products</description> - <modules> - <module>taverna-configuration-api</module> - <module>taverna-configuration-impl</module> - <module>taverna-app-configuration-api</module> - <module>taverna-app-configuration-impl</module> - <module>taverna-database-configuration-api</module> - <module>taverna-database-configuration-impl</module> - <module>taverna-download-api</module> - <module>taverna-download-impl</module> - <module>taverna-plugin-api</module> - <module>taverna-plugin-impl</module> - <module>taverna-update-api</module> - <module>taverna-update-impl</module> - <module>taverna-xml-schemas</module> - <module>taverna-services-api</module> - <module>taverna-services-impl</module> - </modules> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>mygrid-repository</id> - <name>myGrid Repository</name> - <url>http://www.mygrid.org.uk/maven/repository</url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots /> - <id>mygrid-snapshot-repository</id> - <name>myGrid Snapshot Repository</name> - <url>http://www.mygrid.org.uk/maven/snapshot-repository</url> - </repository> - </repositories> -</project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-database-configuration-api/.project ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-api/.project b/taverna-database-configuration-api/.project deleted file mode 100644 index dfcb96a..0000000 --- a/taverna-database-configuration-api/.project +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>taverna-database-configuration-api</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - </natures> -</projectDescription> http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-database-configuration-api/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-api/pom.xml b/taverna-database-configuration-api/pom.xml deleted file mode 100644 index 6604c94..0000000 --- a/taverna-database-configuration-api/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>taverna-commons</artifactId> - <groupId>uk.org.taverna.commons</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <groupId>uk.org.taverna.configuration</groupId> - <version>0.1.1-SNAPSHOT</version> - <artifactId>taverna-database-configuration-api</artifactId> - <packaging>bundle</packaging> - <dependencies> - <dependency> - <groupId>uk.org.taverna.configuration</groupId> - <artifactId>taverna-configuration-api</artifactId> - <version>${taverna.configuration.version}</version> - </dependency> - </dependencies> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>mygrid-repository</id> - <name>myGrid Repository</name> - <url>http://www.mygrid.org.uk/maven/repository - </url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots /> - <id>mygrid-snapshot-repository</id> - <name>myGrid Snapshot Repository</name> - <url>http://www.mygrid.org.uk/maven/snapshot-repository</url> - </repository> - </repositories> - <name>Taverna Database Configuration API</name> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-database-configuration-api/src/main/java/uk/org/taverna/configuration/database/DatabaseConfiguration.java ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-api/src/main/java/uk/org/taverna/configuration/database/DatabaseConfiguration.java b/taverna-database-configuration-api/src/main/java/uk/org/taverna/configuration/database/DatabaseConfiguration.java deleted file mode 100644 index ba3ebd2..0000000 --- a/taverna-database-configuration-api/src/main/java/uk/org/taverna/configuration/database/DatabaseConfiguration.java +++ /dev/null @@ -1,124 +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.database; - -import java.util.Map; - -import uk.org.taverna.configuration.Configurable; - -/** - * - * - * @author David Withers - */ -public interface DatabaseConfiguration extends Configurable { - - public static final String IN_MEMORY = "in_memory"; - public static final String ENABLE_PROVENANCE = "provenance"; - public static final String CONNECTOR_TYPE = "connector"; - public static final String PORT = "port"; - public static final String CURRENT_PORT = "current_port"; - public static final String REFERENCE_SERVICE_CONTEXT = "referenceService.context"; - public static final String IN_MEMORY_CONTEXT = "inMemoryReferenceServiceContext.xml"; - public static final String HIBERNATE_CONTEXT = "hibernateReferenceServiceContext.xml"; - public static final String HIBERNATE_DIALECT = "dialect"; - public static final String START_INTERNAL_DERBY = "start_derby"; - public static final String POOL_MAX_ACTIVE = "pool_max_active"; - public static final String POOL_MIN_IDLE = "pool_min_idle"; - public static final String POOL_MAX_IDLE = "pool_max_idle"; - public static final String DRIVER_CLASS_NAME = "driver"; - public static final String JDBC_URI = "jdbcuri"; - public static final String USERNAME = "username"; - public static final String PASSWORD = "password"; - public static final String EXPOSE_DATANATURE = "taverna.exposedatanature"; - // FIXME: these should me just mysql & derby - but build & dependency issues - // is causing the provenance to expect these values: - public static final String CONNECTOR_MYSQL = "mysql"; - public static final String CONNECTOR_DERBY = "derby"; - public static final String JNDI_NAME = "jdbc/taverna"; - - public boolean isAutoSave(); - - public void enableAutoSave(); - - public void disableAutoSave(); - - public boolean isInMemory(); - - public void setInMemory(boolean value); - - public boolean isExposeDatanature(); - - public void setExposeDatanature(boolean exposeDatanature); - - public String getDatabaseContext(); - - public void setPort(int port); - - public void setPort(String port); - - public void setDriverClassName(String driverClassName); - - public String getDriverClassName(); - - public boolean isProvenanceEnabled(); - - public void setProvenanceEnabled(boolean value); - - public void setStartInternalDerbyServer(boolean value); - - public boolean getStartInternalDerbyServer(); - - public int getPort(); - - public void setCurrentPort(int port); - - public int getCurrentPort(); - - public int getPoolMaxActive(); - - public int getPoolMinIdle(); - - public int getPoolMaxIdle(); - - public String getCategory(); - - public Map<String, String> getDefaultPropertyMap(); - - public String getHibernateDialect(); - - public String getDisplayName(); - - public String getFilePrefix(); - - public String getUUID(); - - public String getConnectorType(); - - public String getJDBCUri(); - - public void setJDBCUri(String uri); - - public String getUsername(); - - public String getPassword(); - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-database-configuration-api/src/main/java/uk/org/taverna/configuration/database/DatabaseManager.java ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-api/src/main/java/uk/org/taverna/configuration/database/DatabaseManager.java b/taverna-database-configuration-api/src/main/java/uk/org/taverna/configuration/database/DatabaseManager.java deleted file mode 100644 index c7e6641..0000000 --- a/taverna-database-configuration-api/src/main/java/uk/org/taverna/configuration/database/DatabaseManager.java +++ /dev/null @@ -1,45 +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.database; - -import java.sql.Connection; -import java.sql.SQLException; - -import javax.sql.DataSource; - -/** - * - * - * @author David Withers - */ -public interface DatabaseManager { - - public Connection getConnection() throws SQLException; - - public DataSource getDataSource(); - - public void startDerbyNetworkServer(); - - public void stopDerbyNetworkServer(); - - public boolean isRunning(); - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-database-configuration-impl/.project ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/.project b/taverna-database-configuration-impl/.project deleted file mode 100644 index bac6198..0000000 --- a/taverna-database-configuration-impl/.project +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>taverna-database-configuration-impl</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - </natures> -</projectDescription> http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-database-configuration-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/pom.xml b/taverna-database-configuration-impl/pom.xml deleted file mode 100644 index 3ecceae..0000000 --- a/taverna-database-configuration-impl/pom.xml +++ /dev/null @@ -1,102 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>taverna-commons</artifactId> - <groupId>uk.org.taverna.commons</groupId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <groupId>uk.org.taverna.configuration</groupId> - <version>0.1.1-SNAPSHOT</version> - <artifactId>taverna-database-configuration-impl</artifactId> - <packaging>bundle</packaging> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Import-Package> - uk.org.taverna.configuration.database;provide:=true, - org.apache.derby.jdbc, * - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>uk.org.taverna.configuration</groupId> - <artifactId>taverna-database-configuration-api</artifactId> - <version>${taverna.configuration.version}</version> - </dependency> - <dependency> - <groupId>uk.org.taverna.configuration</groupId> - <artifactId>taverna-app-configuration-api</artifactId> - <version>${taverna.configuration.version}</version> - </dependency> - <dependency> - <groupId>uk.org.taverna.configuration</groupId> - <artifactId>taverna-configuration-api</artifactId> - <version>${taverna.configuration.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>com.springsource.org.apache.derby</artifactId> - <version>${derby.version}</version> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>com.springsource.org.apache.derby.client</artifactId> - <version>${derbyclient.version}</version> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>com.springsource.org.apache.derby.drda</artifactId> - <version>${derbynet.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>com.springsource.org.apache.commons.dbcp</artifactId> - <version>${commons.dbcp.version}</version> - </dependency> - <dependency> - <groupId>org.apache.log4j</groupId> - <artifactId>com.springsource.org.apache.log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>mygrid-repository</id> - <name>myGrid Repository</name> - <url>http://www.mygrid.org.uk/maven/repository - </url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots /> - <id>mygrid-snapshot-repository</id> - <name>myGrid Snapshot Repository</name> - <url>http://www.mygrid.org.uk/maven/snapshot-repository</url> - </repository> - </repositories> - <name>Taverna Database Configuration implementation</name> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-database-configuration-impl/src/main/java/uk/org/taverna/configuration/database/impl/DatabaseConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/src/main/java/uk/org/taverna/configuration/database/impl/DatabaseConfigurationImpl.java b/taverna-database-configuration-impl/src/main/java/uk/org/taverna/configuration/database/impl/DatabaseConfigurationImpl.java deleted file mode 100644 index de73269..0000000 --- a/taverna-database-configuration-impl/src/main/java/uk/org/taverna/configuration/database/impl/DatabaseConfigurationImpl.java +++ /dev/null @@ -1,252 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2007 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.database.impl; - -import java.util.HashMap; -import java.util.Map; - -import uk.org.taverna.configuration.database.DatabaseConfiguration; -import uk.org.taverna.configuration.AbstractConfigurable; -import uk.org.taverna.configuration.ConfigurationManager; - -/** - * Configuration for the reference service and provenance. - * - * @author David Withers - * @author Stuart Owen - */ - -public class DatabaseConfigurationImpl extends AbstractConfigurable implements DatabaseConfiguration { - - private Map<String, String> defaultPropertyMap; - - private boolean autoSave = true; - - public DatabaseConfigurationImpl(ConfigurationManager configurationManager) { - super(configurationManager); - } - - @Override - public boolean isAutoSave() { - return autoSave; - } - - @Override - public void enableAutoSave() { - autoSave = true; - } - - @Override - public void disableAutoSave() { - autoSave = false; - } - - @Override - protected void store() { - if (autoSave) { - super.store(); - } - } - - @Override - public boolean isInMemory() { - return getProperty(IN_MEMORY).equalsIgnoreCase("true"); - } - - @Override - public void setInMemory(boolean value) { - setProperty(IN_MEMORY, String.valueOf(value)); - } - - @Override - public boolean isExposeDatanature() { - return getProperty(EXPOSE_DATANATURE).equalsIgnoreCase("true"); - } - - @Override - public void setExposeDatanature(boolean exposeDatanature) { - setProperty(EXPOSE_DATANATURE, String.valueOf(exposeDatanature)); - } - - @Override - public String getDatabaseContext() { - if (getProperty(IN_MEMORY).equalsIgnoreCase("true")) { - return IN_MEMORY_CONTEXT; - } else { - return HIBERNATE_CONTEXT; - } - } - - @Override - public void setPort(int port) { - setPort(String.valueOf(port)); - } - - @Override - public void setPort(String port) { - setProperty(PORT, port); - } - - @Override - public void setDriverClassName(String driverClassName) { - setProperty(DRIVER_CLASS_NAME, driverClassName); - } - - @Override - public String getDriverClassName() { - return getProperty(DRIVER_CLASS_NAME); - } - - @Override - public boolean isProvenanceEnabled() { - return getProperty(ENABLE_PROVENANCE).equalsIgnoreCase("true"); - } - - @Override - public void setProvenanceEnabled(boolean value) { - setProperty(ENABLE_PROVENANCE, String.valueOf(value)); - } - - @Override - public void setStartInternalDerbyServer(boolean value) { - setProperty(START_INTERNAL_DERBY, String.valueOf(value)); - } - - @Override - public boolean getStartInternalDerbyServer() { - return getProperty(START_INTERNAL_DERBY).equalsIgnoreCase("true"); - } - - @Override - public int getPort() { - return Integer.valueOf(getProperty(PORT)); - } - - @Override - public void setCurrentPort(int port) { - setProperty(CURRENT_PORT, String.valueOf(port)); - } - - @Override - public int getCurrentPort() { - return Integer.valueOf(getProperty(CURRENT_PORT)); - } - - @Override - public int getPoolMaxActive() { - return Integer.valueOf(getProperty(POOL_MAX_ACTIVE)); - } - - @Override - public int getPoolMinIdle() { - return Integer.valueOf(getProperty(POOL_MIN_IDLE)); - } - - @Override - public int getPoolMaxIdle() { - return Integer.valueOf(getProperty(POOL_MAX_IDLE)); - } - - @Override - public String getCategory() { - return "general"; - } - - @Override - public Map<String, String> getDefaultPropertyMap() { - - if (defaultPropertyMap == null) { - defaultPropertyMap = new HashMap<String, String>(); - defaultPropertyMap.put(IN_MEMORY, "true"); - defaultPropertyMap.put(ENABLE_PROVENANCE, "true"); - defaultPropertyMap.put(PORT, "1527"); - // defaultPropertyMap.put(DRIVER_CLASS_NAME, - // "org.apache.derby.jdbc.ClientDriver"); - defaultPropertyMap.put(DRIVER_CLASS_NAME, - "org.apache.derby.jdbc.EmbeddedDriver"); - defaultPropertyMap.put(HIBERNATE_DIALECT, - "org.hibernate.dialect.DerbyDialect"); - defaultPropertyMap.put(POOL_MAX_ACTIVE, "50"); - defaultPropertyMap.put(POOL_MAX_IDLE, "50"); - defaultPropertyMap.put(POOL_MIN_IDLE, "10"); - defaultPropertyMap.put(USERNAME, ""); - defaultPropertyMap.put(PASSWORD, ""); - defaultPropertyMap.put(JDBC_URI, - "jdbc:derby:t2-database;create=true;upgrade=true"); - defaultPropertyMap.put(START_INTERNAL_DERBY, "false"); - - defaultPropertyMap.put(CONNECTOR_TYPE, CONNECTOR_DERBY); - defaultPropertyMap.put(EXPOSE_DATANATURE, "false"); - } - return defaultPropertyMap; - } - - @Override - public String getHibernateDialect() { - return getProperty(HIBERNATE_DIALECT); - } - - @Override - public String getDisplayName() { - return "Data and provenance"; - } - - @Override - public String getFilePrefix() { - return "DataAndProvenance"; - } - - @Override - public String getUUID() { - return "6BD3F5C1-C68D-4893-8D9B-2F46FA1DDB19"; - } - - @Override - public String getConnectorType() { - return getProperty(CONNECTOR_TYPE); - } - - @Override - public String getJDBCUri() { - if (CONNECTOR_DERBY.equals(getConnectorType()) - && getStartInternalDerbyServer()) { - return "jdbc:derby://localhost:" + getCurrentPort() - + "/t2-database;create=true;upgrade=true"; - } else { - return getProperty(JDBC_URI); - } - } - - @Override - public void setJDBCUri(String uri) { - setProperty(JDBC_URI, uri); - } - - @Override - public String getUsername() { - return getProperty(USERNAME); - } - - @Override - public String getPassword() { - return getProperty(PASSWORD); - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-database-configuration-impl/src/main/java/uk/org/taverna/configuration/database/impl/DatabaseManagerImpl.java ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/src/main/java/uk/org/taverna/configuration/database/impl/DatabaseManagerImpl.java b/taverna-database-configuration-impl/src/main/java/uk/org/taverna/configuration/database/impl/DatabaseManagerImpl.java deleted file mode 100644 index 8a10d24..0000000 --- a/taverna-database-configuration-impl/src/main/java/uk/org/taverna/configuration/database/impl/DatabaseManagerImpl.java +++ /dev/null @@ -1,155 +0,0 @@ -package uk.org.taverna.configuration.database.impl; - -import java.io.File; -import java.sql.Connection; -import java.sql.SQLException; - -import javax.sql.DataSource; - -import org.apache.commons.dbcp.BasicDataSource; -import org.apache.derby.drda.NetworkServerControl; -import org.apache.log4j.Logger; - -import uk.org.taverna.configuration.database.DatabaseConfiguration; -import uk.org.taverna.configuration.database.DatabaseManager; -import uk.org.taverna.configuration.app.ApplicationConfiguration; - -/** - * A set of utility methods related to basic data management. - * - * @author Stuart Owen - * @author Stian Soiland-Reyes - * - */ -public class DatabaseManagerImpl implements DatabaseManager { - - private final static Logger logger = Logger.getLogger(DatabaseManagerImpl.class); - - private NetworkServerControl server; - - private BasicDataSource dataSource; - - private DatabaseConfiguration databaseConfiguration; - - private ApplicationConfiguration applicationConfiguration; - - public DatabaseManagerImpl(ApplicationConfiguration applicationConfiguration, DatabaseConfiguration databaseConfiguration) throws SQLException { - this.applicationConfiguration = applicationConfiguration; - this.databaseConfiguration = databaseConfiguration; - getConnection(); - } - - @Override - public Connection getConnection() throws SQLException { - return getDataSource().getConnection(); - } - - @Override - public DataSource getDataSource() { - if (dataSource == null) { - setupDataSource(); - } - return dataSource; - } - - @Override - public synchronized void startDerbyNetworkServer() { - setDerbyPaths(); - - System.setProperty("derby.drda.host","localhost"); - System.setProperty("derby.drda.minThreads","5"); - System.setProperty("derby.drda.maxThreads",String.valueOf(databaseConfiguration.getPoolMaxActive())); - int port = databaseConfiguration.getPort(); - int maxPort = port+50; - - try { - System.setProperty("derby.drda.portNumber",String.valueOf(port)); - if (server==null) server = new NetworkServerControl(); - while(port<maxPort) { //loop to find another available port on which Derby isn't already running - if (!isRunning()) break; - logger.info("Derby connection port: "+port+" is currently not available for Taverna, trying next value"); - port++; - System.setProperty("derby.drda.portNumber",String.valueOf(port)); - server = new NetworkServerControl(); - } - server.start(null); - databaseConfiguration.setCurrentPort(port); - } catch (Exception ex) { - logger.error("Error starting up Derby network server",ex); - } - } - - @Override - public void stopDerbyNetworkServer() { - try { - server.shutdown(); - } catch (Exception e) { - logger.error("Error shutting down Derby network server",e); - } - } - - @Override - public boolean isRunning() { - if (server==null) { - return false; - } - else { - try { - server.ping(); - return true; - } catch (Exception e) { - return false; - } - } - } - - private void setupDataSource() { - setDerbyPaths(); - - dataSource = new BasicDataSource(); - dataSource.setDriverClassName(databaseConfiguration.getDriverClassName()); - - System.setProperty("hibernate.dialect", databaseConfiguration.getHibernateDialect()); - - dataSource.setDefaultTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED); - dataSource.setMaxActive(databaseConfiguration.getPoolMaxActive()); - dataSource.setMinIdle(databaseConfiguration.getPoolMinIdle()); - dataSource.setMaxIdle(databaseConfiguration.getPoolMaxIdle()); - dataSource.setDefaultAutoCommit(true); - dataSource.setInitialSize(databaseConfiguration.getPoolMinIdle()); - //Derby blows up if the username of password is empty (even an empty string thats not null). - if (databaseConfiguration.getUsername()!=null && databaseConfiguration.getUsername().length()>=1) dataSource.setUsername(databaseConfiguration.getUsername()); - if (databaseConfiguration.getPassword()!=null && databaseConfiguration.getPassword().length()>=1) dataSource.setPassword(databaseConfiguration.getPassword()); - - dataSource.setUrl(databaseConfiguration.getJDBCUri()); - } - - private void setDerbyPaths() { - if (databaseConfiguration.getConnectorType() == DatabaseConfiguration.CONNECTOR_DERBY) { - String homeDir = applicationConfiguration.getApplicationHomeDir().getAbsolutePath(); - System.setProperty("derby.system.home",homeDir); - File logFile = new File(applicationConfiguration.getLogDir(), "derby.log"); - System.setProperty("derby.stream.error.file", logFile.getAbsolutePath()); - } - - } - - /** - * Sets the databaseConfiguration. - * - * @param databaseConfiguration the new value of databaseConfiguration - */ - public void setDatabaseConfiguration(DatabaseConfiguration databaseConfiguration) { - this.databaseConfiguration = databaseConfiguration; - } - - /** - * Sets the applicationConfiguration. - * - * @param applicationConfiguration the new value of applicationConfiguration - */ - public void setApplicationConfiguration(ApplicationConfiguration applicationConfiguration) { - this.applicationConfiguration = applicationConfiguration; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml b/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml deleted file mode 100644 index 2eae538..0000000 --- a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans:beans xmlns="http://www.springframework.org/schema/osgi"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:beans="http://www.springframework.org/schema/beans"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi.xsd";> - - <service ref="databaseConfiguration" interface="uk.org.taverna.configuration.database.DatabaseConfiguration" /> - <service ref="databaseManager" interface="uk.org.taverna.configuration.database.DatabaseManager" /> - - <reference id="configurationManager" interface="uk.org.taverna.configuration.ConfigurationManager" /> - <reference id="applicationConfiguration" interface="uk.org.taverna.configuration.app.ApplicationConfiguration" /> - - <!-- <reference id="dataSourceFactory" interface="org.osgi.service.jdbc.DataSourceFactory" - filter="(osgi.jdbc.driver.class=org.apache.derby.jdbc.EmbeddedDriver)" /> --> - -</beans:beans> http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml b/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml deleted file mode 100644 index f397933..0000000 --- a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <bean id="databaseConfiguration" - class="uk.org.taverna.configuration.database.impl.DatabaseConfigurationImpl"> - <constructor-arg name="configurationManager" ref="configurationManager" /> - </bean> - - <bean id="databaseManager" - class="uk.org.taverna.configuration.database.impl.DatabaseManagerImpl"> - <constructor-arg name="applicationConfiguration" ref="applicationConfiguration" /> - <constructor-arg name="databaseConfiguration"> - <ref local="databaseConfiguration" /> - </constructor-arg> - </bean> - -</beans> http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-services-api/.project ---------------------------------------------------------------------- diff --git a/taverna-services-api/.project b/taverna-services-api/.project deleted file mode 100644 index a3fb83e..0000000 --- a/taverna-services-api/.project +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>taverna-services-api</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - </natures> -</projectDescription> http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-services-api/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-services-api/pom.xml b/taverna-services-api/pom.xml deleted file mode 100644 index e676e29..0000000 --- a/taverna-services-api/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>uk.org.taverna.commons</groupId> - <artifactId>taverna-commons</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <artifactId>taverna-services-api</artifactId> - <version>0.1.0-SNAPSHOT</version> - <packaging>bundle</packaging> - <name>Taverna Services API</name> - <dependencies> - <dependency> - <groupId>uk.org.taverna.scufl2</groupId> - <artifactId>scufl2-api</artifactId> - <version>${scufl2.version}</version> - </dependency> - </dependencies> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>mygrid-repository</id> - <name>myGrid Repository</name> - <url>http://www.mygrid.org.uk/maven/repository - </url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots /> - <id>mygrid-snapshot-repository</id> - <name>myGrid Snapshot Repository</name> - <url>http://www.mygrid.org.uk/maven/snapshot-repository</url> - </repository> - </repositories> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ActivityTypeNotFoundException.java ---------------------------------------------------------------------- diff --git a/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ActivityTypeNotFoundException.java b/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ActivityTypeNotFoundException.java deleted file mode 100644 index dafccd7..0000000 --- a/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ActivityTypeNotFoundException.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2013 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.commons.services; - -/** - * Thrown when an activity type is not found. - * - * @author David Withers - */ -@SuppressWarnings("serial") -public class ActivityTypeNotFoundException extends Exception { - - public ActivityTypeNotFoundException() { - super(); - } - - public ActivityTypeNotFoundException(String message) { - super(message); - } - - public ActivityTypeNotFoundException(String message, Throwable cause) { - super(message, cause); - } - - public ActivityTypeNotFoundException(Throwable cause) { - super(cause); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-services-api/src/main/java/uk/org/taverna/commons/services/InvalidConfigurationException.java ---------------------------------------------------------------------- diff --git a/taverna-services-api/src/main/java/uk/org/taverna/commons/services/InvalidConfigurationException.java b/taverna-services-api/src/main/java/uk/org/taverna/commons/services/InvalidConfigurationException.java deleted file mode 100644 index 0f118d6..0000000 --- a/taverna-services-api/src/main/java/uk/org/taverna/commons/services/InvalidConfigurationException.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2013 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.commons.services; - -/** - * Thrown when a Configuration is not valid for a Configurable. - * - * @author David Withers - */ -@SuppressWarnings("serial") -public class InvalidConfigurationException extends Exception { - - public InvalidConfigurationException() { - super(); - } - - public InvalidConfigurationException(String message) { - super(message); - } - - public InvalidConfigurationException(String message, Throwable cause) { - super(message, cause); - } - - public InvalidConfigurationException(Throwable cause) { - super(cause); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ServiceRegistry.java ---------------------------------------------------------------------- diff --git a/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ServiceRegistry.java b/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ServiceRegistry.java deleted file mode 100644 index a40a1d7..0000000 --- a/taverna-services-api/src/main/java/uk/org/taverna/commons/services/ServiceRegistry.java +++ /dev/null @@ -1,89 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2013 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.commons.services; - -import java.net.URI; -import java.util.Set; - -import uk.org.taverna.scufl2.api.port.InputActivityPort; -import uk.org.taverna.scufl2.api.port.OutputActivityPort; - -import com.fasterxml.jackson.databind.JsonNode; - -/** - * Register of Taverna services. - * - * @author David Withers - */ -public interface ServiceRegistry { - - /** - * Returns the activity types in the registry. - * - * @return the activity types in the registry - */ - public Set<URI> getActivityTypes(); - - /** - * Returns the JSON Schema for the configuration required by an activity. - * - * @param activityType - * the activity type - * @return the JSON Schema for the configuration required by an activity - * @throws ActivityTypeNotFoundException - * if the activity type is not in the registry - */ - public JsonNode getActivityConfigurationSchema(URI activityType) - throws InvalidConfigurationException, ActivityTypeNotFoundException; - - /** - * Returns the input ports that the activity type requires to be present in order to execute - * with the specified configuration. - * <p> - * If the activity does not require any input port for the configuration then an empty set is - * returned. - * - * @param configuration - * the activity configuration - * @throws ActivityTypeNotFoundException - * if the activity type is not in the registry - * @return the input ports that the activity requires to be present in order to execute - */ - public Set<InputActivityPort> getActivityInputPorts(URI activityType, - JsonNode configuration) throws InvalidConfigurationException, ActivityTypeNotFoundException; - - /** - * Returns the output ports that the activity type requires to be present in order to execute - * with the specified configuration. - * <p> - * If the activity type does not require any output ports for the configuration then an empty - * set is returned. - * - * @param configuration - * the activity configuration - * @throws ActivityTypeNotFoundException - * if the activity type is not in the registry - * @return the output ports that the activity requires to be present in order to execute - */ - public Set<OutputActivityPort> getActivityOutputPorts(URI activityType, - JsonNode configuration) throws InvalidConfigurationException, ActivityTypeNotFoundException; - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-services-impl/.project ---------------------------------------------------------------------- diff --git a/taverna-services-impl/.project b/taverna-services-impl/.project deleted file mode 100644 index e2b1c3f..0000000 --- a/taverna-services-impl/.project +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>taverna-services-impl</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.m2e.core.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.m2e.core.maven2Nature</nature> - </natures> -</projectDescription> http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-services-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-services-impl/pom.xml b/taverna-services-impl/pom.xml deleted file mode 100644 index 09b78cc..0000000 --- a/taverna-services-impl/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>uk.org.taverna.commons</groupId> - <artifactId>taverna-commons</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - <artifactId>taverna-services-impl</artifactId> - <version>0.1.0-SNAPSHOT</version> - <packaging>bundle</packaging> - <name>Taverna Services Implementation</name> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Import-Package>uk.org.taverna.commons.services;provide:=true,*</Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>uk.org.taverna.commons</groupId> - <artifactId>taverna-services-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>uk.org.taverna.platform</groupId> - <artifactId>taverna-capability-api</artifactId> - <version>${platform.version}</version> - </dependency> - <dependency> - <groupId>uk.org.taverna.scufl2</groupId> - <artifactId>scufl2-api</artifactId> - <version>${scufl2.version}</version> - </dependency> - </dependencies> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>mygrid-repository</id> - <name>myGrid Repository</name> - <url>http://www.mygrid.org.uk/maven/repository - </url> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots /> - <id>mygrid-snapshot-repository</id> - <name>myGrid Snapshot Repository</name> - <url>http://www.mygrid.org.uk/maven/snapshot-repository</url> - </repository> - </repositories> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-services-impl/src/main/java/uk/org/taverna/commons/services/impl/ServiceRegistryImpl.java ---------------------------------------------------------------------- diff --git a/taverna-services-impl/src/main/java/uk/org/taverna/commons/services/impl/ServiceRegistryImpl.java b/taverna-services-impl/src/main/java/uk/org/taverna/commons/services/impl/ServiceRegistryImpl.java deleted file mode 100644 index 6847f75..0000000 --- a/taverna-services-impl/src/main/java/uk/org/taverna/commons/services/impl/ServiceRegistryImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2013 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.commons.services.impl; - -import java.net.URI; -import java.util.Set; - -import uk.org.taverna.commons.services.ActivityTypeNotFoundException; -import uk.org.taverna.commons.services.InvalidConfigurationException; -import uk.org.taverna.commons.services.ServiceRegistry; -import uk.org.taverna.platform.capability.api.ActivityConfigurationException; -import uk.org.taverna.platform.capability.api.ActivityNotFoundException; -import uk.org.taverna.platform.capability.api.ActivityService; -import uk.org.taverna.scufl2.api.port.InputActivityPort; -import uk.org.taverna.scufl2.api.port.OutputActivityPort; - -import com.fasterxml.jackson.databind.JsonNode; - -/** - * Simple implementation of a ServiceRegistry that discovers available services from the - * ActivityService. - * - * @author David Withers - */ -public class ServiceRegistryImpl implements ServiceRegistry { - - private ActivityService activityService; - - @Override - public Set<URI> getActivityTypes() { - return activityService.getActivityTypes(); - } - - @Override - public JsonNode getActivityConfigurationSchema(URI activityType) - throws InvalidConfigurationException, ActivityTypeNotFoundException { - try { - return activityService.getActivityConfigurationSchema(activityType); - } catch (ActivityConfigurationException e) { - throw new InvalidConfigurationException(e); - } catch (ActivityNotFoundException e) { - throw new ActivityTypeNotFoundException(e); - } - } - - @Override - public Set<InputActivityPort> getActivityInputPorts(URI activityType, JsonNode configuration) - throws InvalidConfigurationException, ActivityTypeNotFoundException { - try { - return activityService.getActivityInputPorts(activityType, configuration); - } catch (ActivityConfigurationException e) { - throw new InvalidConfigurationException(e); - } catch (ActivityNotFoundException e) { - throw new ActivityTypeNotFoundException(e); - } - } - - @Override - public Set<OutputActivityPort> getActivityOutputPorts(URI activityType, JsonNode configuration) - throws InvalidConfigurationException, ActivityTypeNotFoundException { - try { - return activityService.getActivityOutputPorts(activityType, configuration); - } catch (ActivityConfigurationException e) { - throw new InvalidConfigurationException(e); - } catch (ActivityNotFoundException e) { - throw new ActivityTypeNotFoundException(e); - } - } - - public void setActivityService(ActivityService activityService) { - this.activityService = activityService; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml ---------------------------------------------------------------------- diff --git a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml b/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml deleted file mode 100644 index 70fdfef..0000000 --- a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans:beans xmlns="http://www.springframework.org/schema/osgi"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:beans="http://www.springframework.org/schema/beans"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/osgi - http://www.springframework.org/schema/osgi/spring-osgi.xsd";> - - <service ref="serviceRegistry" interface="uk.org.taverna.commons.services.ServiceRegistry" /> - - <reference id="activityService" interface="uk.org.taverna.platform.capability.api.ActivityService" /> - -</beans:beans> http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/fea36501/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml ---------------------------------------------------------------------- diff --git a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml b/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml deleted file mode 100644 index 72c88d1..0000000 --- a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <bean id="serviceRegistry" class="uk.org.taverna.commons.services.impl.ServiceRegistryImpl"> - <property name="activityService" ref="activityService" /> - </bean> - -</beans>
