Skip to content
This repository was archived by the owner on Jul 2, 2025. It is now read-only.

Migrate plugin to Taverna 3 #4

Open
edikaradumi wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Migrate plugin to Taverna 3 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9e65fc9
Remove wps_config.xml as it is not used
edikaradumi Jul 12, 2016
8d4a3da
add taverna-git-client template
edikaradumi Jul 12, 2016
96aea11
implemented gis-client inteface and corresponding JUnit tests
edikaradumi Jul 12, 2016
e957dd1
Update 52n-wps-client-lib
edikaradumi Jul 15, 2016
dddc272
format pom code
edikaradumi Jul 15, 2016
84613b9
Add GisClientFactory for creating the required GisClient Implementation
edikaradumi Jul 17, 2016
5d022d2
Update Gis client interface and implementation
edikaradumi Jul 17, 2016
dc01eff
Add Configuration Bean annotations
edikaradumi Jul 17, 2016
f199915
Update ServiceDescription ACTIVITY_TYPE
edikaradumi Jul 17, 2016
a33f3cc
Implement GisActivityFactory
edikaradumi Jul 17, 2016
99d32a7
Update GisActivity to use Jackson object instead of ConfigBean
edikaradumi Jul 18, 2016
223c292
Remove port parsing in GisServiceProvider
edikaradumi Jul 22, 2016
d34cd58
Fix GisActivityFactory tests
edikaradumi Jul 22, 2016
ee17940
example config
edikaradumi Aug 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 34 additions & 33 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,37 +52,38 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-maven-plugin</artifactId>
<version>${taverna.osgi.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.taverna.orgi</groupId>
<artifactId>taverna-maven-plugin</artifactId>
<versionRange>[${taverna.osgi.version},)</versionRange>
<goals>
<goal>plugin-generate</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-maven-plugin</artifactId>
<version>${taverna.osgi.version}</version>
<extensions>true</extensions>
</plugin>
<plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.taverna.orgi</groupId>
<artifactId>taverna-maven-plugin</artifactId>
<versionRange>[${taverna.osgi.version},)</versionRange>
<goals>
<goal>plugin-generate</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>

</plugins>
</build>
Expand Down Expand Up @@ -112,8 +113,8 @@
<modules>
<module>taverna-gis-plugin</module>
<module>taverna-gis-activity</module>
<module>taverna-gis-activity-ui</module>
<module>taverna-gis-plugin</module>
<module>taverna-gis-activity-ui</module>
<module>taverna-gis-client</module>
</modules>

</project>
2 changes: 1 addition & 1 deletion ...s-activity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceDesc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

public class GisServiceDesc extends ServiceDescription {
public static final URI ACTIVITY_TYPE = URI
.create("http://ns.taverna.org.uk/2016/activity/gis");
.create("http://ns.taverna.org.uk/2016/service/gis");


/**
Expand Down
63 changes: 0 additions & 63 deletions ...tivity-ui/src/main/java/org/apache/taverna/gis/ui/serviceprovider/GisServiceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
*/
package org.apache.taverna.gis.ui.serviceprovider;

import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
Expand All @@ -29,23 +28,14 @@
import javax.swing.Icon;

import org.apache.taverna.scufl2.api.common.Visitor;
import org.apache.taverna.scufl2.api.common.WorkflowBean;
import org.apache.taverna.scufl2.api.configurations.Configuration;
import org.apache.taverna.servicedescriptions.AbstractConfigurableServiceProvider;
import org.apache.taverna.servicedescriptions.ConfigurableServiceProvider;
import org.apache.taverna.servicedescriptions.ServiceDescription;
import org.apache.taverna.servicedescriptions.ServiceDescriptionProvider;
import org.apache.taverna.servicedescriptions.ServiceDescriptionProvider.FindServiceDescriptionsCallBack;
import org.apache.taverna.workflowmodel.processor.activity.config.ActivityInputPortDefinitionBean;
import org.apache.taverna.workflowmodel.processor.activity.config.ActivityOutputPortDefinitionBean;
import org.n52.wps.client.WPSClientSession;

import com.fasterxml.jackson.databind.node.ObjectNode;

import net.opengis.wps.x100.InputDescriptionType;
import net.opengis.wps.x100.OutputDescriptionType;
import net.opengis.wps.x100.ProcessDescriptionType;

public class GisServiceProvider extends AbstractConfigurableServiceProvider
implements ConfigurableServiceProvider {

Expand All @@ -68,7 +58,6 @@ private static Configuration defaultConfig() {
/**
* Do the actual search for services. Return using the callBack parameter.
*/
@SuppressWarnings("unchecked")
public void findServiceDescriptionsAsync(FindServiceDescriptionsCallBack callBack) {
// Use callback.status() for long-running searches
callBack.status("Resolving GIS services");
Expand All @@ -89,58 +78,6 @@ public void findServiceDescriptionsAsync(FindServiceDescriptionsCallBack callBac
// TODO: Optional: set description (Set a better description
service.setDescription(processIdentifier);

// TODO: Exctract in a separate method
// Get input ports

WPSClientSession wpsClient = WPSClientSession.getInstance();

ProcessDescriptionType processDescription;
try {
processDescription = wpsClient
.getProcessDescription(serviceUri, processIdentifier);

InputDescriptionType[] inputList = processDescription.getDataInputs()
.getInputArray();

List<ActivityInputPortDefinitionBean> inputPortDefinitions = new ArrayList<ActivityInputPortDefinitionBean>();

for (InputDescriptionType input : inputList) {
ActivityInputPortDefinitionBean newInputPort = new ActivityInputPortDefinitionBean();
newInputPort.setName(input.getIdentifier().getStringValue());
newInputPort.setDepth(0);
newInputPort.setAllowsLiteralValues(true);
newInputPort.setHandledReferenceSchemes(null);
newInputPort.setTranslatedElementType(String.class);

inputPortDefinitions.add(newInputPort);

}

// service.setInputPortDefinitions(inputPortDefinitions);


// Get output ports

OutputDescriptionType[] outputList = processDescription.getProcessOutputs().getOutputArray();
List<ActivityOutputPortDefinitionBean> outputPortDefinitions = new ArrayList<ActivityOutputPortDefinitionBean>();

for( OutputDescriptionType output : outputList )
{
ActivityOutputPortDefinitionBean newOutputPort = new ActivityOutputPortDefinitionBean();
newOutputPort.setName(output.getIdentifier().getStringValue());
newOutputPort.setDepth(0);

outputPortDefinitions.add(newOutputPort);

}

//service.setOutputPortDefinitions(outputPortDefinitions);

} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

results.add(service);

// partialResults() can also be called several times from inside
Expand Down
Loading