Repository: incubator-taverna-plugin-gis Updated Branches: refs/heads/taverna2 235cf7e21 -> 45ca923f9
http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityTest.java ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityTest.java b/apache-taverna-plugin-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityTest.java new file mode 100644 index 0000000..7c160e2 --- /dev/null +++ b/apache-taverna-plugin-gis-activity/src/test/java/org/apache/taverna/gis/GisActivityTest.java @@ -0,0 +1,118 @@ +package org.apache.taverna.gis; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.net.URI; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import net.sf.taverna.t2.activities.testutils.ActivityInvoker; +import net.sf.taverna.t2.workflowmodel.OutputPort; +import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityConfigurationException; +import net.sf.taverna.t2.workflowmodel.processor.activity.ActivityInputPort; + +import org.junit.Before; +import org.junit.Test; + +public class GisActivityTest { + + private GisActivityConfigurationBean configBean; + + private GisActivity activity = new GisActivity(); + + @Before + public void makeConfigBean() throws Exception { + configBean = new GisActivityConfigurationBean(); + configBean.setProcessIdentifier("something"); + configBean + .setOgcServiceUri(URI.create("http://localhost:8080/myEndPoint";)); + } + + @Test(expected = ActivityConfigurationException.class) + public void invalidConfiguration() throws ActivityConfigurationException { + GisActivityConfigurationBean invalidBean = new GisActivityConfigurationBean(); + invalidBean.setProcessIdentifier("invalidExample"); + // Should throw ActivityConfigurationException + activity.configure(invalidBean); + } + + @Test + public void executeAsynch() throws Exception { + activity.configure(configBean); + + Map<String, Object> inputs = new HashMap<String, Object>(); + inputs.put("firstInput", "hello"); + + Map<String, Class<?>> expectedOutputTypes = new HashMap<String, Class<?>>(); + expectedOutputTypes.put("simpleOutput", String.class); + expectedOutputTypes.put("moreOutputs", String.class); + + Map<String, Object> outputs = ActivityInvoker.invokeAsyncActivity( + activity, inputs, expectedOutputTypes); + + assertEquals("Unexpected outputs", 2, outputs.size()); + assertEquals("simple", outputs.get("simpleOutput")); + assertEquals(Arrays.asList("Value 1", "Value 2"), outputs + .get("moreOutputs")); + + } + + @Test + public void reConfiguredActivity() throws Exception { + assertEquals("Unexpected inputs", 0, activity.getInputPorts().size()); + assertEquals("Unexpected outputs", 0, activity.getOutputPorts().size()); + + activity.configure(configBean); + assertEquals("Unexpected inputs", 1, activity.getInputPorts().size()); + assertEquals("Unexpected outputs", 2, activity.getOutputPorts().size()); + + activity.configure(configBean); + // Should not change on reconfigure + assertEquals("Unexpected inputs", 1, activity.getInputPorts().size()); + assertEquals("Unexpected outputs", 2, activity.getOutputPorts().size()); + } + + @Test + public void reConfiguredSpecialPorts() throws Exception { + activity.configure(configBean); + + GisActivityConfigurationBean specialBean = new GisActivityConfigurationBean(); + specialBean.setProcessIdentifier("specialCase"); + specialBean.setOgcServiceUri(URI + .create("http://localhost:8080/myEndPoint";)); + activity.configure(specialBean); + // Should now have added the optional ports + assertEquals("Unexpected inputs", 2, activity.getInputPorts().size()); + assertEquals("Unexpected outputs", 3, activity.getOutputPorts().size()); + } + + @Test + public void configureActivity() throws Exception { + Set<String> expectedInputs = new HashSet<String>(); + expectedInputs.add("firstInput"); + + Set<String> expectedOutputs = new HashSet<String>(); + expectedOutputs.add("simpleOutput"); + expectedOutputs.add("moreOutputs"); + + activity.configure(configBean); + + Set<ActivityInputPort> inputPorts = activity.getInputPorts(); + assertEquals(expectedInputs.size(), inputPorts.size()); + for (ActivityInputPort inputPort : inputPorts) { + assertTrue("Wrong input : " + inputPort.getName(), expectedInputs + .remove(inputPort.getName())); + } + + Set<OutputPort> outputPorts = activity.getOutputPorts(); + assertEquals(expectedOutputs.size(), outputPorts.size()); + for (OutputPort outputPort : outputPorts) { + assertTrue("Wrong output : " + outputPort.getName(), + expectedOutputs.remove(outputPort.getName())); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/target/classes/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/target/classes/META-INF/MANIFEST.MF b/apache-taverna-plugin-gis-activity/target/classes/META-INF/MANIFEST.MF new file mode 100644 index 0000000..3d9fc4f --- /dev/null +++ b/apache-taverna-plugin-gis-activity/target/classes/META-INF/MANIFEST.MF @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Built-By: edi +Build-Jdk: 1.8.0_92 +Created-By: Maven Integration for Eclipse + http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/target/classes/META-INF/maven/org.apache.taverna.gis/apache-taverna-plugin-gis-activity/pom.properties ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/target/classes/META-INF/maven/org.apache.taverna.gis/apache-taverna-plugin-gis-activity/pom.properties b/apache-taverna-plugin-gis-activity/target/classes/META-INF/maven/org.apache.taverna.gis/apache-taverna-plugin-gis-activity/pom.properties new file mode 100644 index 0000000..557f82a --- /dev/null +++ b/apache-taverna-plugin-gis-activity/target/classes/META-INF/maven/org.apache.taverna.gis/apache-taverna-plugin-gis-activity/pom.properties @@ -0,0 +1,7 @@ +#Generated by Maven Integration for Eclipse +#Sun Jul 10 12:53:12 BST 2016 +version=0.0.1-incubating-SNAPSHOT +groupId=org.apache.taverna.gis +m2e.projectName=apache-taverna-plugin-gis-activity +m2e.projectLocation=D\:\\UniManchester\\MScDissertation\\ApacheTavernaPluginGIS\\apache-taverna-plugin-gis\\apache-taverna-plugin-gis-activity +artifactId=apache-taverna-plugin-gis-activity http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/target/classes/META-INF/maven/org.apache.taverna.gis/apache-taverna-plugin-gis-activity/pom.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/target/classes/META-INF/maven/org.apache.taverna.gis/apache-taverna-plugin-gis-activity/pom.xml b/apache-taverna-plugin-gis-activity/target/classes/META-INF/maven/org.apache.taverna.gis/apache-taverna-plugin-gis-activity/pom.xml new file mode 100644 index 0000000..bae1259 --- /dev/null +++ b/apache-taverna-plugin-gis-activity/target/classes/META-INF/maven/org.apache.taverna.gis/apache-taverna-plugin-gis-activity/pom.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.taverna.gis</groupId> + <artifactId>apache-taverna-plugin-gis</artifactId> + <version>0.0.1-incubating-SNAPSHOT</version> + </parent> + <artifactId>apache-taverna-plugin-gis-activity</artifactId> + <name>Gis Taverna activity</name> + + <repositories> + <repository> + <id>n52-releases</id> + <name>52n Releases</name> + <url>http://52north.org/maven/repo/releases</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + + <dependencies> + <dependency> + <groupId>net.sf.taverna.t2.core</groupId> + <artifactId>workflowmodel-api</artifactId> + <version>${t2.core.version}</version> + </dependency> + <dependency> + <groupId>net.sf.taverna.t2.activities</groupId> + <artifactId>activity-test-utils</artifactId> + <version>${t2.activities.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.n52.wps</groupId> + <artifactId>52n-wps-client-lib</artifactId> + <version>3.3.1</version> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/target/classes/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/target/classes/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker b/apache-taverna-plugin-gis-activity/target/classes/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker new file mode 100644 index 0000000..158ab09 --- /dev/null +++ b/apache-taverna-plugin-gis-activity/target/classes/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker @@ -0,0 +1 @@ +org.apache.taverna.gis.GisActivityHealthChecker http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivity$1.class ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivity$1.class b/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivity$1.class new file mode 100644 index 0000000..4b5f038 Binary files /dev/null and b/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivity$1.class differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivity.class ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivity.class b/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivity.class new file mode 100644 index 0000000..3f95391 Binary files /dev/null and b/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivity.class differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivityConfigurationBean.class ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivityConfigurationBean.class b/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivityConfigurationBean.class new file mode 100644 index 0000000..d47bff3 Binary files /dev/null and b/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivityConfigurationBean.class differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivityHealthChecker.class ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivityHealthChecker.class b/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivityHealthChecker.class new file mode 100644 index 0000000..d1de031 Binary files /dev/null and b/apache-taverna-plugin-gis-activity/target/classes/org/apache/taverna/gis/GisActivityHealthChecker.class differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/target/test-classes/org/apache/taverna/gis/GisActivityTest.class ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/target/test-classes/org/apache/taverna/gis/GisActivityTest.class b/apache-taverna-plugin-gis-activity/target/test-classes/org/apache/taverna/gis/GisActivityTest.class new file mode 100644 index 0000000..b5cdb59 Binary files /dev/null and b/apache-taverna-plugin-gis-activity/target/test-classes/org/apache/taverna/gis/GisActivityTest.class differ http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-activity/wps_config.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-activity/wps_config.xml b/apache-taverna-plugin-gis-activity/wps_config.xml new file mode 100644 index 0000000..cd73904 --- /dev/null +++ b/apache-taverna-plugin-gis-activity/wps_config.xml @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="UTF-8"?> +<WPSConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://n52.org/wps https://raw.githubusercontent.com/52North/wps-config/52n-wps-config-1.2.1/src/main/xsd/schema_v2.xsd"; xmlns="http://n52.org/wps";> + <Datahandlers> + <ParserList> + <Parser name="WCPSQueryParser" + className="org.n52.wps.io.datahandler.parser.WCPSQueryParser" + active="true"> + <Format mimetype="text/plain" + schema="http://schemas.opengis.net/wcps/1.0/wcpsAll.xsd"; /> + </Parser> + <Parser name="WKTParser" + className="org.n52.wps.io.datahandler.parser.WKTParser" + active="true"> + <Format mimetype="application/wkt"/> + </Parser> + <Parser name="GenericXMLDataParser" + className="org.n52.wps.io.datahandler.parser.GenericXMLDataParser" + active="true"> + <Format mimetype="text/xml" /> + <Format mimetype="text/xml; subtype=gml/2.1.2" + schema="http://schemas.opengis.net/gml/2.1.2/feature.xsd"; /> + </Parser> + <Parser name="GenericFileParser" + className="org.n52.wps.io.datahandler.parser.GenericFileParser" + active="true"> + <Format mimetype="application/x-zipped-shp" /> + <Format mimetype="application/img" /> + <Format mimetype="image/tiff" /> + <Format mimetype="image/geotiff" /> + <Format mimetype="application/geotiff" /> + <Format mimetype="application/dbase" /> + <Format mimetype="application/remap" /> + <Format mimetype="application/x-erdas-hfa" /> + <Format mimetype="application/x-netcdf" /> + <Format mimetype="application/dgn" /> + <Format mimetype="image/jpeg" /> + <Format mimetype="image/png" /> + <Format mimetype="application/x-geotiff" /> + <Format mimetype="application/hdf4-eos" /> + <Format mimetype="text/plain" /> + <Format mimetype="application/rData" /> + <Format mimetype="application/rData+Spatial" /> + <Format mimetype="application/rData+SpatialPoints" /> + <Format mimetype="application/rData+SpatialPolygons" /> + <Format mimetype="text/html" /> + + <Format mimetype="application/rData" encoding="base64" /> + <Format mimetype="application/rData+Spatial" encoding="base64" /> + <Format mimetype="application/rData+SpatialPoints" encoding="base64" /> + <Format mimetype="application/rData+SpatialPolygons" encoding="base64" /> + <Format mimetype="application/x-zipped-shp" encoding="base64" /> + <Format mimetype="application/img" encoding="base64" /> + <Format mimetype="image/tiff" encoding="base64" /> + <Format mimetype="application/geotiff" encoding="base64" /> + <Format mimetype="application/dbase" encoding="base64" /> + <Format mimetype="application/remap" encoding="base64" /> + <Format mimetype="application/x-erdas-hfa" encoding="base64" /> + <Format mimetype="application/x-netcdf" encoding="base64" /> + <Format mimetype="application/dgn" encoding="base64" /> + <Format mimetype="image/jpeg" encoding="base64" /> + <Format mimetype="image/png" encoding="base64" /> + <Format mimetype="application/x-geotiff" encoding="base64" /> + <Format mimetype="application/hdf4-eos" encoding="base64" /> + <Format mimetype="text/plain" encoding="base64" /> + </Parser> + </ParserList> + <GeneratorList> + <Generator name="WKTGenerator" + className="org.n52.wps.io.datahandler.generator.WKTGenerator" + active="true"> + <Format mimetype="application/wkt"/> + </Generator> + <Generator name="GenericXMLDataGenerator" + className="org.n52.wps.io.datahandler.generator.GenericXMLDataGenerator" + active="true"> + <Format mimetype="text/xml" /> + <Format mimetype="text/xml; subtype=gml/2.1.2" + schema="http://schemas.opengis.net/gml/2.1.2/feature.xsd"; /> + </Generator> + <Generator name="GenericFileGenerator" + className="org.n52.wps.io.datahandler.generator.GenericFileGenerator" + active="true"> + <Format mimetype="application/x-zipped-shp" encoding="base64" /> + <Format mimetype="application/shp" encoding="base64" /> + <Format mimetype="application/img" encoding="base64" /> + <Format mimetype="image/tiff" encoding="base64" /> + <Format mimetype="image/geotiff" encoding="base64" /> + <Format mimetype="application/geotiff" encoding="base64" /> + <Format mimetype="application/dbase" encoding="base64" /> + <Format mimetype="application/remap" encoding="base64" /> + <Format mimetype="application/x-erdas-hfa" encoding="base64" /> + <Format mimetype="application/x-netcdf" encoding="base64" /> + <Format mimetype="application/netcdf" encoding="base64" /> + <Format mimetype="application/dgn" encoding="base64" /> + <Format mimetype="image/jpeg" encoding="base64" /> + <Format mimetype="image/png" encoding="base64" /> + <Format mimetype="application/x-geotiff" encoding="base64" /> + <Format mimetype="text/plain" encoding="base64" /> + <Format mimetype="application/x-zipped-shp" encoding="base64" /> + <Format mimetype="application/rData" encoding="base64" /> + <Format mimetype="application/rData+Spatial" encoding="base64" /> + <Format mimetype="application/rData+SpatialPoints" encoding="base64" /> + <Format mimetype="application/rData+SpatialPolygons" encoding="base64" /> + + <Format mimetype="application/rData" /> + <Format mimetype="application/rData+Spatial" /> + <Format mimetype="application/rData+SpatialPoints" /> + <Format mimetype="application/rData+SpatialPolygons" /> + <Format mimetype="application/x-zipped-shp" /> + <Format mimetype="application/shp" /> + <Format mimetype="application/img" /> + <Format mimetype="image/tiff" /> + <Format mimetype="image/geotiff" /> + <Format mimetype="application/geotiff" /> + <Format mimetype="application/dbase" /> + <Format mimetype="application/remap" /> + <Format mimetype="application/x-erdas-hfa" /> + <Format mimetype="application/x-netcdf" /> + <Format mimetype="application/netcdf" /> + <Format mimetype="application/dgn" /> + <Format mimetype="image/jpeg" /> + <Format mimetype="image/png" /> + <Format mimetype="application/x-geotiff" /> + <Format mimetype="text/plain" /> + <Format mimetype="application/pdf" /> + <Format mimetype="application/zip" /> + <Format mimetype="text/html" /> + </Generator> + </GeneratorList> + </Datahandlers> + <AlgorithmRepositoryList> + <Repository name="LocalAlgorithmRepository" + className="org.n52.wps.server.LocalAlgorithmRepository" active="true"> + <Property name="Algorithm" active="true">org.n52.wps.server.algorithm.JTSConvexHullAlgorithm</Property> + <Property name="Algorithm" active="true">org.n52.wps.server.algorithm.test.DummyTestClass</Property> + <Property name="Algorithm" active="true">org.n52.wps.server.algorithm.test.LongRunningDummyTestClass</Property> + <Property name="Algorithm" active="true">org.n52.wps.server.algorithm.test.MultipleComplexInAndOutputsDummyTestClass</Property> + <Property name="Algorithm" active="true">org.n52.wps.server.algorithm.test.MultiReferenceInputAlgorithm</Property> + <Property name="Algorithm" active="true">org.n52.wps.server.algorithm.test.MultiReferenceBinaryInputAlgorithm</Property> + <Property name="Algorithm" active="true">org.n52.wps.server.algorithm.test.EchoProcess</Property> + </Repository> + <Repository name="UploadedAlgorithmRepository" + className="org.n52.wps.server.UploadedAlgorithmRepository" active="false"> + </Repository> + <Repository name="ServiceLoaderAlgorithmRepository" + className="org.n52.wps.server.ServiceLoaderAlgorithmRepository" active="true"> + </Repository> + <!-- + <Repository name="MCProcessRepository" className="org.n52.wps.mc.MCProcessRepository" active="true"> + <Property name="REMOTE_REPOSITORY" active="false">http://141.30.100.178/gpfeed2/gpfeed.xml</Property> + <Property name="LOCAL_REPOSITORY" active="true">D:\MCpackages</Property> + </Repository> + --> + </AlgorithmRepositoryList> + <RemoteRepositoryList /> + + <Server protocol="http" hostname="localhost" hostport="8080" + includeDataInputsInResponse="false" computationTimeoutMilliSeconds="5" + cacheCapabilites="false" webappPath="wps" repoReloadInterval="0" maxPoolSize="20" keepAliveSeconds="1000" maxQueuedTasks="100" minPoolSize="10" > + <!-- Setting to 'true' will enable filtering of responses documents. Any server URL in + the response document will be replaced with the server URL used in the HTTP request. --> + <Property name="responseURLFilterEnabled" active="true">false</Property> + <Database> + <!-- NOTE: database wipe is only implemented for the FlatFileDatabase (the default) --> + <!-- enable database wiping base on values below --> + <Property name="wipe.enabled" active="true">true</Property> + <!-- scans database every 1 hour --> + <Property name="wipe.period" active="true">PT1H</Property> + <!-- deletes files older than 7 days --> + <Property name="wipe.threshold" active="true">P7D</Property> + </Database> + + <!-- + POSTGRES Connector + ================== + Ensure that the postgres driver is available to the server during + launch. The server will fail to start if Postgres is active but the + driver is missing. However, if the driver exists and the database + cannot be connected to (unavailable, username/pass issue, etc), the + framework will fail-over to the Flatfile Database + jndiName or username/password: If jndiName exists, username + and password are not used. + saveResultsToDb: Setting to false will save results output to file + and put the URI link to the file in the database. Setting to true + stores the actual result output in the database (You probably don't + want this if you have large results). + JNDI Configuration: + <Database> + <Property active="true" name="databaseClass">org.n52.wps.server.database.PostgresDatabase</Property> + <Property active="true" name="jndiName">jndiname</Property> + <Property active="true" name="saveResultsToDb">false</Property> + <Property name="wipe.enabled" active="true">true</Property> + <Property name="wipe.period" active="true">PT1H</Property> + <Property name="wipe.threshold" active="true">P7D</Property> + </Database> + Direct connection configuration: + <Database> + Alternative connection method + <Property active="true" name="databaseName">postgres</Property> + <Property active="true" name="databasePath">//localhost:5432</Property> + <Property active="true" name="username">username</Property> + <Property active="true" name="password">password</Property> + <Property active="true" name="saveResultsToDb">false</Property> + <Property name="wipe.enabled" active="true">true</Property> + <Property name="wipe.period" active="true">PT1H</Property> + <Property name="wipe.threshold" active="true">P7D</Property> + </Database> +--> + + </Server> +</WPSConfiguration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-plugin/.project ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-plugin/.project b/apache-taverna-plugin-gis-plugin/.project new file mode 100644 index 0000000..3cb7bc2 --- /dev/null +++ b/apache-taverna-plugin-gis-plugin/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>apache-taverna-plugin-gis-plugin</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-plugin/.settings/org.eclipse.core.resources.prefs ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-plugin/.settings/org.eclipse.core.resources.prefs b/apache-taverna-plugin-gis-plugin/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/apache-taverna-plugin-gis-plugin/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8 http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-plugin/.settings/org.eclipse.m2e.core.prefs ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-plugin/.settings/org.eclipse.m2e.core.prefs b/apache-taverna-plugin-gis-plugin/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/apache-taverna-plugin-gis-plugin/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/apache-taverna-plugin-gis-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-plugin-gis-plugin/pom.xml b/apache-taverna-plugin-gis-plugin/pom.xml new file mode 100644 index 0000000..90e13eb --- /dev/null +++ b/apache-taverna-plugin-gis-plugin/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.taverna.gis</groupId> + <artifactId>apache-taverna-plugin-gis</artifactId> + <version>0.0.1-incubating-SNAPSHOT</version> + </parent> + <artifactId>apache-taverna-plugin-gis-plugin</artifactId> + <packaging>taverna-plugin</packaging> + <name>Gis Taverna plugin</name> + + <build> + <plugins> + <plugin> + <groupId>net.sf.taverna.t2.maven.plugins</groupId> + <artifactId>maven-taverna-plugin</artifactId> + <version>0.1.1</version> + <extensions>true</extensions> + <configuration> + <provider>org.apache.taverna.gis</provider> + <tavernaVersion>${t2.workbench.version}</tavernaVersion> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>apache-taverna-plugin-gis-activity</artifactId> + <version>0.0.1-incubating-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>apache-taverna-plugin-gis-activity-ui</artifactId> + <version>0.0.1-incubating-SNAPSHOT</version> + </dependency> + </dependencies> +</project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/7e06e81f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..2683990 --- /dev/null +++ b/pom.xml @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <prerequisites> + <maven>3.0.0</maven> + </prerequisites> + <groupId>org.apache.taverna.gis</groupId> + <artifactId>apache-taverna-plugin-gis</artifactId> + <version>0.0.1-incubating-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Gis Taverna project</name> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- Update according to latest Taverna version in + www.mygrid.org.uk/dev/wiki/display/developer/Maven+module+version+numbers + --> + <t2.core.version>1.5</t2.core.version> + <t2.activities.version>1.5</t2.activities.version> + <t2.ui.api.version>1.5</t2.ui.api.version> + <t2.ui.impl.version>1.5</t2.ui.impl.version> + <t2.workbench.version>2.5.0</t2.workbench.version> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.1</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.2.1</version> + <executions> + <execution> + <goals> + <goal>jar</goal> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.17</version> + <configuration> + <skip>false</skip> + <systemProperties> + <property> + <name>java.awt.headless</name> + <value>true</value> + </property> + </systemProperties> + </configuration> + </plugin> + + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + <scope>test</scope> + </dependency> + </dependencies> + + <repositories> + <repository> + <!-- The myGrid repository for Taverna dependencies --> + <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> + <!-- The repository that your jars are deployed to --> + <id>my-repository</id> + <name>My Repository</name> + <url>http://repository.example.com/maven/repository</url> + </repository> + <repository> + <!-- The repository that your snapshot jars are deployed to --> + <releases> + <enabled>false</enabled> + </releases> + <snapshots/> + <id>my-snapshot-repository</id> + <name>My snapshot Repository</name> + <url>file:///tmp/test-plugins/</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>mygrid-repository</id> + <name>myGrid Repository</name> + <url>http://www.mygrid.org.uk/maven/repository</url> + </pluginRepository> + </pluginRepositories> + + <!-- The location of your plugin site --> + <distributionManagement> + <repository> + <id>my-plugin-site</id> + <name>My Plugin Site</name> + <url>scpexe://repository.example.com/www/taverna/plugins/</url> + </repository> + <snapshotRepository> + <id>my-test-plugin-site</id> + <name>My Test Plugin Site</name> + <url>file:///tmp/test-plugins/</url> + </snapshotRepository> + </distributionManagement> + + <modules> + <module>apache-taverna-plugin-gis-activity</module> + <module>apache-taverna-plugin-gis-activity-ui</module> + <module>apache-taverna-plugin-gis-plugin</module> + </modules> +</project> \ No newline at end of file
