You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:37:01 UTC

[41/70] [abbrv] incubator-taverna-common-activities git commit: taverna-rest-activity/

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/598ad6de/src/main/java/net/sf/taverna/t2/activities/rest/URISignatureHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/net/sf/taverna/t2/activities/rest/URISignatureHandler.java b/src/main/java/net/sf/taverna/t2/activities/rest/URISignatureHandler.java
deleted file mode 100644
index 6a669f6..0000000
--- a/src/main/java/net/sf/taverna/t2/activities/rest/URISignatureHandler.java
+++ /dev/null
@@ -1,412 +0,0 @@
-package net.sf.taverna.t2.activities.rest;
-
-import java.io.UnsupportedEncodingException;
-import java.text.Normalizer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-
-
-/**
- * This class deals with URI signatures - essentially, strings that represent
- * some resource's URI with zero or more placeholders. URI signatures are known
- * at workflow definition time and represent the pattern of the complete URIs
- * that will be used at workflow run time.
- * 
- * An example of the URI signature is:
- * http://sysmo-db.org/sops/{sop_id}/experimental_conditions
- * /{cond_id}?condition_unit={unit}
- * 
- * Placeholders "{sop_id}", "{cond_id}" and "{unit}" will be replaced by the
- * real values prior to using the URI for a real request.
- * 
- * This class is concerned with validation of URI signatures, extraction of
- * placeholders and substituting placeholders to generate complete URIs.
- * 
- * @author Sergejs Aleksejevs
- */
-public class URISignatureHandler {
-	
-	private static Logger logger = Logger.getLogger(URISignatureHandler.class);
-	
-
-	public static final char PLACEHOLDER_START_SYMBOL = '{';
-	public static final char PLACEHOLDER_END_SYMBOL = '}';
-
-	/**
-	 * Extracts placeholders of the given URI signature with their positions in
-	 * the signature in the order of their occurrence.
-	 * 
-	 * Extraction is done in a robust way with signature validity checks being
-	 * carried out simultaneously. This makes sure that even with no explicit
-	 * validation (see {@link URISignatureHandler#isValid(String)}) no
-	 * unexpected faults occur.
-	 * 
-	 * @param uriSignature
-	 *            The URI signature to process.
-	 * @return A map of placeholders as they are encountered (from start to end)
-	 *         in the URI signature and their start positions. Keys of the map
-	 *         are the "titles" of the placeholders without opening and closing
-	 *         placeholder symbols; values are the URI signature string indices,
-	 *         where the title of the corresponding placeholder starts in the
-	 *         string.
-	 */
-	public static LinkedHashMap<String, Integer> extractPlaceholdersWithPositions(
-			String uriSignature) {
-		// no signature - nothing to process
-		if (uriSignature == null || uriSignature.isEmpty())
-			throw new URISignatureParsingException(
-					"URI signature is null or empty - nothing to process.");
-
-		LinkedHashMap<String, Integer> foundPlaceholdersWithPositions = new LinkedHashMap<>();
-
-		int nestingLevel = 0;
-		int startSymbolIdx = -1;
-
-		// go through the signature character by character trying to extract
-		// placeholders
-		for (int i = 0; i < uriSignature.length(); i++) {
-			switch (uriSignature.charAt(i)) {
-			case PLACEHOLDER_START_SYMBOL:
-				if (++nestingLevel != 1)
-					throw new URISignatureParsingException(
-							"Malformed URL: at least two parameter placeholder opening\n" +
-									"symbols follow each other without being closed appropriately\n" +
-							"(possibly the signature contains nested placeholders).");
-				startSymbolIdx = i;
-				break;
-
-			case PLACEHOLDER_END_SYMBOL:
-				if (--nestingLevel < 0)
-					throw new URISignatureParsingException(
-							"Malformed URL: parameter placeholder closing symbol found before the opening one.");
-				if (nestingLevel == 0) {
-					// correctly opened and closed placeholder found; check if
-					// it is a "fresh" one
-					String placeholderCandidate = uriSignature.substring(
-							startSymbolIdx + 1, i);
-					if (!foundPlaceholdersWithPositions
-							.containsKey(placeholderCandidate)) {
-						foundPlaceholdersWithPositions.put(
-								placeholderCandidate, startSymbolIdx + 1);
-					} else {
-						throw new URISignatureParsingException(
-								"Malformed URL: duplicate parameter placeholder \""
-										+ placeholderCandidate + "\" found.");
-					}
-				}
-				break;
-
-			default:
-				continue;
-			}
-		}
-
-		// the final check - make sure that after traversing the string, we are
-		// not "inside" one of the placeholders (e.g. this could happen if a
-		// placeholder
-		// opening symbol was found, but the closing one never occurred after
-		// that)
-		if (nestingLevel > 0)
-			throw new URISignatureParsingException(
-					"Malformed URL: parameter placeholder opening symbol found,\n"
-							+ "but the closing one has not been encountered.");
-
-		return foundPlaceholdersWithPositions;
-	}
-
-	/**
-	 * Works identical to
-	 * {@link URISignatureHandler#extractPlaceholdersWithPositions(String)}
-	 * except for returning only the list of placeholder titles - without
-	 * positions.
-	 * 
-	 * @param uriSignature
-	 *            The URI signature to process.
-	 * @return List of the placeholder titles in the order of their occurrence
-	 *         in the provided URI signature.
-	 */
-	public static List<String> extractPlaceholders(String uriSignature) {
-		return new ArrayList<>(extractPlaceholdersWithPositions(uriSignature)
-				.keySet());
-	}
-
-	/**
-	 * This method performs explicit validation of the URI signature. If the
-	 * validation succeeds, the method terminates quietly; in case of any
-	 * identified problems a {@link URISignatureParsingException} is thrown.
-	 * 
-	 * @param uriSignature
-	 *            The URI signature to validate.
-	 * @throws URISignatureParsingException
-	 */
-	public static void validate(String uriSignature)
-			throws URISignatureParsingException {
-		// this method essentially needs to do exactly the same thing
-		// as the method to extract the placeholders with their corresponding
-		// positions; all necessary validation is already performed there -
-		// hence the trick is simply to call that method (discarding its
-		// output),
-		// while keeping track of any exceptions that may be generated by the
-		// called method;
-		//
-		// for this simply call the placeholder extraction method - any
-		// exceptions
-		// will be forwarded up the method call stack; in case of success, the
-		// method
-		// will terminate quietly
-		extractPlaceholdersWithPositions(uriSignature);
-	}
-	
-	 /**
-	  * Check if the URL string contains "unsafe" characters, i.e. characters 
-	  * that need URL-encoding.
-	  * From RFC 1738: "...Only alphanumerics [0-9a-zA-Z], the special 
-	  * characters "$-_.+!*'()," (not including the quotes) and reserved 
-	  * characters used for their reserved purposes may be 
-	  * used unencoded within a URL." 
-	  * Reserved characters are: ";/?:@&=" ..." and "%" used for escaping.
-	 */
-	public static void checkForUnsafeCharacters(String candidateURLSignature) throws URISignatureParsingException{
-		String allowedURLCharactersString = new String("abcdefghijklmnopqrstuvwxyz0123456789$-_.+!*'(),;/?:@&=%");
-		char[] allowedURLCharactersArray = allowedURLCharactersString.toCharArray();
-		List<Character> allowedURLCharactersList = new ArrayList<Character>();
-		    for (char value : allowedURLCharactersArray)
-		    	allowedURLCharactersList.add(new Character(value));
-
-		int index = 0;
-		String unsafeCharactersDetected = "";
-		while (index < candidateURLSignature.length()){
-			char character = candidateURLSignature.charAt(index);
-			if (character == '{') { // a start of a parameter
-				// This is a paramater name - ignore until we find the closing '}'
-				index++;
-				while(character != '}' && index < candidateURLSignature.length()){
-					character = candidateURLSignature.charAt(index);
-					index++;
-				}
-			} else if (!allowedURLCharactersList.contains(Character
-					.valueOf(Character.toLowerCase(character)))) {
-				// We found an unsafe character in the URL - add to the list of unsafe characters
-				unsafeCharactersDetected += "'" + character + "', ";
-				index++;
-			} else {
-				index++;
-			}
-		}
-		String message = "";
-		unsafeCharactersDetected = unsafeCharactersDetected.trim();
-		if (unsafeCharactersDetected.endsWith(",")){ // remove the last ","
-			unsafeCharactersDetected = unsafeCharactersDetected.substring(0, unsafeCharactersDetected.lastIndexOf(','));
-		}
-		if  (!unsafeCharactersDetected.equals("")){
-			message += "REST service's URL contains unsafe characters that need\nto be URL-encoded or the service will most probably fail:\n"+ unsafeCharactersDetected;	
-			throw new URISignatureParsingException(message);
-		}
-	}
-
-
-	/**
-	 * Tests whether the provided URI signature is valid or not.
-	 * 
-	 * @param uriSignature
-	 *            URI signature to check for validity.
-	 * @return <code>true</code> if the URI signature is valid;
-	 *         <code>false</code> otherwise.
-	 */
-	public static boolean isValid(String uriSignature) {
-		try {
-			// no exceptions are generated by validate(), the validation has
-			// succeeded
-			validate(uriSignature);
-			return (true);
-		} catch (URISignatureParsingException e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Substitutes real values for all placeholders encountered in the URI
-	 * signature and produces a complete URI that can be used directly.
-	 * 
-	 * @param uriSignature
-	 *            The URI signature to use as a basis.
-	 * @param parameters
-	 *            Map of {name,value} pairs for all placeholders in the
-	 *            signature. These values will be used to replace the
-	 *            placeholders in the signature.
-	 * @param escapeParameters
-	 *            Whether to URL-escape paramaters before placing them in the
-	 *            final URL.
-	 * @return A complete URI with all placeholders replaced by the provided
-	 *         values.
-	 * @throws URISignatureParsingException
-	 *             Thrown if there is a problem with the provided URI signature
-	 *             (e.g. null, empty, ill-formed, etc).
-	 * @throws URIGenerationFromSignatureException
-	 *             Thrown if there is a problem with the provided parameter map
-	 *             (e.g. null, empty, not containing enough values for some of
-	 *             the placeholders found in <code>uriSignature</code>.
-	 */
-	public static String generateCompleteURI(String uriSignature,
-			Map<String, String> specifiedParameters, boolean escapeParameters)
-			throws URISignatureParsingException,
-			URIGenerationFromSignatureException {
-		StringBuilder completeURI = new StringBuilder(uriSignature);
-
-		// no need to make any checks on the uriSignature - it is
-		// already handled by extractPlaceholdersWithPositions() --
-		// if something goes wrong a runtime exception will be thrown
-		// during placeholder extraction
-		LinkedHashMap<String, Integer> placeholdersWithPositions = extractPlaceholdersWithPositions(uriSignature);
-
-		// check that the URI signature contains some placeholders
-		if (placeholdersWithPositions.keySet().size() > 0) {
-			Map<String, String> parameters;
-			// some work will actually have to be done to replace placeholders
-			// with real values;
-			// check that the parameter map contains some values
-			if (specifiedParameters == null || specifiedParameters.isEmpty()) {
-				parameters = Collections.emptyMap();
-			} else {
-				parameters = specifiedParameters;
-			}
-
-			// the 'placeholders' linked list is guaranteed to be in the order
-			// of occurrence of placeholders in the URI signature;
-			// this will allow to traverse the URI signature and replace the
-			// placeholders in the reverse order --
-			// this way it is possible to use the indices of placeholders that
-			// were already found during their extraction to
-			// improve performance
-			LinkedList<String> placeholders = new LinkedList<String>(
-					placeholdersWithPositions.keySet());
-			Collections.reverse(placeholders);
-			Iterator<String> placeholdersIterator = placeholders.iterator();
-
-			while (placeholdersIterator.hasNext()) {
-				String placeholder = placeholdersIterator.next();
-				int placeholderStartPos = placeholdersWithPositions
-						.get(placeholder) - 1;
-				int placeholderEndPos = placeholderStartPos
-						+ placeholder.length() + 2;
-				if (parameters.containsKey(placeholder)) {
-					if (escapeParameters) {
-						completeURI.replace(placeholderStartPos,
-								placeholderEndPos, urlEncodeQuery(parameters
-										.get(placeholder)));
-					} else {
-						completeURI.replace(placeholderStartPos,
-								placeholderEndPos, parameters.get(placeholder));
-					}
-				} else {
-					int qnPos = completeURI.lastIndexOf("?", placeholderStartPos);
- 					int ampPos = completeURI.lastIndexOf("&", placeholderStartPos);
- 					int slashPos = completeURI.lastIndexOf("/", placeholderStartPos);
- 					int startParamPos = Math.max(qnPos, ampPos);
-					if (startParamPos > -1 && startParamPos > slashPos) {
- 						// We found an optional parameter, so delete all of it
- 						if (qnPos > ampPos) {
- 							// It might be the first or only parameter so delete carefully
- 							if (placeholderEndPos >= (completeURI.length() - 1)) {
- 								// No parameters
- 								completeURI.replace(startParamPos, placeholderEndPos, "");
- 							} else {
- 								// Remove the & from the following parameter, not the ? that starts
- 								completeURI.replace(startParamPos + 1, placeholderEndPos + 1, "");
- 							}
-						} else {
- 							// Just delete the optional parameter in total
-							completeURI.replace(startParamPos, placeholderEndPos, "");
- 						}
- 					} else {
- 						throw new URIGenerationFromSignatureException(
- 								"Parameter map does not contain a key/value for \""
- 										+ placeholder + "\" mandatory placeholder");
- 					}
-				}
-			}
-		}
-		/*
-		 * else { NO PLACEHOLDERS, SO NOTHING TO REPLACE WITH REAL VALUES - JUST
-		 * RETURN THE ORIGINAL 'uriSignature' }
-		 */
-
-		return (completeURI.toString());
-	}
-
-	/**
-	 * Exceptions of this type may be thrown when errors occur during URI
-	 * signature parsing - these will often indicate the reason for failure
-	 * (e.g. missing URI signature, nested placeholders, ill-formed signature,
-	 * etc).
-	 * 
-	 * @author Sergejs Aleksejevs
-	 */
-	@SuppressWarnings("serial")
-	public static class URISignatureParsingException extends
-			IllegalArgumentException {
-		public URISignatureParsingException() {
-		}
-
-		public URISignatureParsingException(String message) {
-			super(message);
-		}
-	}
-
-	/**
-	 * Exceptions of this type may be thrown during generation of a complete URI
-	 * from the provided signature and parameter hash. These may occur because
-	 * of wrong parameters, etc.
-	 * 
-	 * @author Sergejs Aleksejevs
-	 */
-	@SuppressWarnings("serial")
-	public static class URIGenerationFromSignatureException extends
-			RuntimeException {
-		public URIGenerationFromSignatureException() {
-		}
-
-		public URIGenerationFromSignatureException(String message) {
-			super(message);
-		}
-	}
-
-	/**
-	 * Prepares the string to serve as a part of url query to the server.
-	 * 
-	 * @param query
-	 *            The string that needs URL encoding.
-	 * @return URL encoded string that can be inserted into the request URL.
-	 */
-	public static String urlEncodeQuery(String query) {
-		String ns = Normalizer.normalize(query, Normalizer.Form.NFC);
-		byte[] bb = null;
-		try {
-			bb = ns.getBytes("UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			logger.error(e);
-			return query;
-		}
-		
-		StringBuffer sb = new StringBuffer();
-		
-		for (int i = 0; i < bb.length; i++) {
-		    int b = bb[i] & 0xff;
-		    if (!Character.isLetterOrDigit(b) || (b >= 0x80)) {
-		    	sb.append("%");
-		    	sb.append(Integer.toHexString(b).toUpperCase());
-			} else {
-		    	sb.append((char)b);
-		    }
-		}
-		return sb.toString();
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/598ad6de/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
----------------------------------------------------------------------
diff --git a/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer b/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
deleted file mode 100644
index 86b3ad6..0000000
--- a/src/main/resources/META-INF/services/net.sf.taverna.t2.workbench.report.explainer.VisitExplainer
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.taverna.t2.activities.rest.RESTActivityHealthCheckVisitExplainer
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/598ad6de/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
----------------------------------------------------------------------
diff --git a/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker b/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
deleted file mode 100644
index 737de29..0000000
--- a/src/main/resources/META-INF/services/net.sf.taverna.t2.workflowmodel.health.HealthChecker
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.taverna.t2.activities.rest.RESTActivityHealthChecker
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/598ad6de/src/main/resources/META-INF/spring/rest-activity-context-osgi.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/META-INF/spring/rest-activity-context-osgi.xml b/src/main/resources/META-INF/spring/rest-activity-context-osgi.xml
deleted file mode 100644
index 44fa5c4..0000000
--- a/src/main/resources/META-INF/spring/rest-activity-context-osgi.xml
+++ /dev/null
@@ -1,16 +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="RESTActivityHealthChecker" interface="net.sf.taverna.t2.workflowmodel.health.HealthChecker" />
-
-	<service ref="restActivityFactory" interface="net.sf.taverna.t2.workflowmodel.processor.activity.ActivityFactory" />
-
-	<reference id="credentialManager" interface="net.sf.taverna.t2.security.credentialmanager.CredentialManager" />
-	<reference id="edits" interface="net.sf.taverna.t2.workflowmodel.Edits" />
-
-</beans:beans>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/598ad6de/src/main/resources/META-INF/spring/rest-activity-context.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/META-INF/spring/rest-activity-context.xml b/src/main/resources/META-INF/spring/rest-activity-context.xml
deleted file mode 100644
index f1c900e..0000000
--- a/src/main/resources/META-INF/spring/rest-activity-context.xml
+++ /dev/null
@@ -1,13 +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="RESTActivityHealthChecker" class="net.sf.taverna.t2.activities.rest.RESTActivityHealthChecker" />
-
-	<bean id="restActivityFactory" class="net.sf.taverna.t2.activities.rest.RESTActivityFactory">
-		<property name="credentialManager" ref="credentialManager" />
-		<property name="edits" ref="edits" />
-	</bean>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/598ad6de/src/main/resources/schema.json
----------------------------------------------------------------------
diff --git a/src/main/resources/schema.json b/src/main/resources/schema.json
deleted file mode 100644
index 376b479..0000000
--- a/src/main/resources/schema.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-03/schema#",
-    "id": "http://ns.taverna.org.uk/2010/activity/rest.schema.json",
-    "title": "REST activity configuration",
-    "type": "object",
-    "properties": {
-        "@context": {
-            "description": "JSON-LD context for interpreting the configuration as RDF",
-            "required": true,
-            "enum": ["http://ns.taverna.org.uk/2010/activity/rest.context.json"]
-        },
-        "request": {
-            "type": "object",
-            "description": "The HTTP request the REST activity is to perform",
-            "required": true,
-            "properties": {
-                "httpMethod": {
-                    "description": "The HTTP method of the REST request",
-                    "default": "GET",
-                    "enum": ["GET", "POST", "PUT", "DELETE"]
-                },
-                "absoluteURITemplate": {
-                    "type": "string",
-                    "required": true,
-                    "description": "The URI template for this request.  The template is an URI with 0 or more {variables}, e.g. http://example.com/user/{username}?page={page} (RFC6570 Level 1). Matching activity input ports are created for each variable, so the variable name must be a valid Taverna input port name. "
-                },
-                "headers": {
-                    "description": "HTTP headers of the request. GET requests SHOULD include Accept. PUT and POST request SHOULD include Content-Type. The header Expect: 100-continue is recognized and supported by the REST activity for POST and PUT requests.",
-                    "type": "array",
-                    "items": {
-                        "type": "object",
-                        "properties": {
-                            "header": {
-                                "type": "string",
-                                "required": true,
-                                "description": "The HTTP header name, e.g. Accept or Content-Type"
-                            },
-                            "value": {
-                                "type": "string",
-                                "required": true,
-                                "description": "The value of the HTTP header, e.g. text/plain"
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "outgoingDataFormat": {
-            "description": "Format of the POSTed content",
-            "default": "String",
-            "enum": ["String", "Binary"]
-        },
-        "showRedirectionOutputPort": {
-            "type": "boolean",
-            "default": false,
-            "description": "If set, the output port 'redirection' is added, showing the URL of the requested body. This is particularly useful for following redirection. "
-        },
-        "showActualURLPort": {
-            "type": "boolean",
-            "default": false,
-            "description": "If true, the output port 'actualURL' is added to show the requested URL after expanding the template."
-        },
-        "showResponseHeadersPort": {
-            "type": "boolean",
-            "default": false,
-            "description": "If true, the output port 'responseHeaders' is added to show the response header from the HTTP server."
-        },
-        "escapeParameters": {
-            "type": "boolean",
-            "default": true,
-            "description": "If true (default), input port values are URI-escaped (RFC 2396) before expanding variables in the URI template."
-        }
-        
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/598ad6de/src/test/java/net/sf/taverna/t2/activities/rest/ApacheHttpClientUsageTest.java.bak
----------------------------------------------------------------------
diff --git a/src/test/java/net/sf/taverna/t2/activities/rest/ApacheHttpClientUsageTest.java.bak b/src/test/java/net/sf/taverna/t2/activities/rest/ApacheHttpClientUsageTest.java.bak
deleted file mode 100644
index 518fbc3..0000000
--- a/src/test/java/net/sf/taverna/t2/activities/rest/ApacheHttpClientUsageTest.java.bak
+++ /dev/null
@@ -1,215 +0,0 @@
-package net.sf.taverna.t2.activities.rest;
-
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.ExecutionContext;
-import org.apache.http.protocol.HttpContext;
-
-/**
- * 
- * @author Sergejs Aleksejevs
- */
-public class ApacheHttpClientUsageTest extends JFrame implements ActionListener
-{
-  private JComboBox cbHttpMethod;
-  private JTextField tfAddressBar;
-  private JButton bGo;
-  private JTextArea taResponse;
-  private JScrollPane spResponse;
-  
-  
-  /**
-   * Constructor is solely involved in the UI initialisation.
-   */
-  public ApacheHttpClientUsageTest()
-  {
-    Container contentPane = this.getContentPane();
-    contentPane.setLayout(new BorderLayout(5,5));
-    
-    bGo = new JButton("GO!");
-    bGo.addActionListener(this);
-    bGo.setDefaultCapable(true);
-    this.getRootPane().setDefaultButton(bGo);
-    
-    tfAddressBar = new JTextField(50);
-    tfAddressBar.setPreferredSize(new Dimension(0,bGo.getPreferredSize().height));
-    tfAddressBar.setText("http://test.biocatalogue.org/");
-    
-    JPanel jpAddressBar = new JPanel();
-    jpAddressBar.add(tfAddressBar);
-    jpAddressBar.add(bGo);
-    
-    cbHttpMethod = new JComboBox(RESTActivity.HTTP_METHOD.values());
-    cbHttpMethod.setBorder(BorderFactory.createCompoundBorder(
-        BorderFactory.createEmptyBorder(5, 5, 5, 5),
-        cbHttpMethod.getBorder()));
-    
-    JPanel jpAllNavigation = new JPanel(new BorderLayout());
-    jpAllNavigation.add(jpAddressBar, BorderLayout.NORTH);
-    jpAllNavigation.add(cbHttpMethod, BorderLayout.CENTER);
-    
-    contentPane.add(jpAllNavigation, BorderLayout.NORTH);
-    
-    taResponse = new JTextArea(20, 20);
-    taResponse.setEditable(true);
-    
-    spResponse = new JScrollPane(taResponse);
-    spResponse.setBorder(BorderFactory.createCompoundBorder(
-        BorderFactory.createEmptyBorder(0, 5, 5, 5),
-        BorderFactory.createEtchedBorder()));
-    contentPane.add(spResponse, BorderLayout.CENTER);
-    
-    this.pack();
-    this.setLocationRelativeTo(null); // center on screen
-  }
-  
-  
-  /**
-   * Click handler for the only button there is - the "GO!" button 
-   */
-  public void actionPerformed(ActionEvent e)
-  {
-    if (e.getSource().equals(bGo))
-    {
-      try { 
-        switch ((RESTActivity.HTTP_METHOD)cbHttpMethod.getSelectedItem()) {
-          case GET:    doGET(); break;
-          case POST:   doPOST(); break;
-          case PUT:    doPUT(); break;
-          case DELETE: doDELETE(); break;
-        }
-      }
-      catch (Exception ex) {
-        taResponse.setText(ex + "\n\n" + ex.getStackTrace());
-      }
-    }
-  }
-  
-  
-  private void doGET() {
-    HttpGet httpGet = new HttpGet(tfAddressBar.getText());
-    httpGet.addHeader("Accept", "application/xml");
-    performHTTPRequest(httpGet);
-  }
-  
-  
-  private void doPOST() throws UnsupportedEncodingException {
-//    // POST TO MYEXPERIMENT - basic auth
-//    HttpPost httpPost = new HttpPost("http://sandbox.myexperiment.org/comment.xml");
-//    httpPost.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(("LOGIN" + ":" + "PASSWORD").getBytes())));
-//    httpPost.addHeader("Accept", "application/xml");
-//    httpPost.addHeader("Content-Type", "application/xml");
-//    httpPost.setEntity(new StringEntity("<comment><subject resource=\"http://sandbox.myexperiment.org/files/226\"/><comment>1234567</comment></comment>"));
-//    performHTTPRequest(httpPost);
-    
-    // POST TO BIOCATALOGUE - no auth
-    HttpPost httpPost = new HttpPost(tfAddressBar.getText());
-    httpPost.addHeader("Accept", "application/xml");
-    httpPost.addHeader("Content-Type", "application/xml");
-    httpPost.setEntity(new StringEntity("<searchByData><searchType>input</searchType><limit>20</limit><data>test</data></searchByData>"));
-    performHTTPRequest(httpPost);
-  }
-  
-  
-  private void doPUT() throws UnsupportedEncodingException {
-    HttpPut httpPut = new HttpPut("http://sandbox.myexperiment.org/comment.xml?id=251");
-    httpPut.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(("LOGIN" + ":" + "PASSWORD").getBytes())));
-    httpPut.addHeader("Accept", "application/xml");
-    httpPut.addHeader("Content-Type", "application/xml");
-    httpPut.setEntity(new StringEntity("<comment><subject resource=\"http://sandbox.myexperiment.org/files/226\"/><comment>12345678</comment></comment>"));
-    performHTTPRequest(httpPut);
-  }
-  
-  
-  private void doDELETE() {
-    HttpDelete httpDelete = new HttpDelete("http://sandbox.myexperiment.org/comment.xml?id=251");
-    httpDelete.addHeader("Authorization", "Basic " + new String(Base64.encodeBase64(("LOGIN" + ":" + "PASSWORD").getBytes())));
-    httpDelete.addHeader("Accept", "application/xml");
-    performHTTPRequest(httpDelete);
-  }
-  
-  
-  private void performHTTPRequest(HttpRequestBase httpRequest) {
-    try {
-      StringBuilder responseStr = new StringBuilder();
-      // ---------------------------------------------
-      
-      HttpClient httpClient = new DefaultHttpClient();
-      HttpContext localContext = new BasicHttpContext();
-      
-      HttpResponse response = httpClient.execute(httpRequest, localContext);
-      // ---
-      // TRACK WHERE THE FINAL REDIRECT ENDS UP - target host + URI
-      HttpHost target = (HttpHost) localContext.getAttribute(ExecutionContext.HTTP_TARGET_HOST);
-      HttpUriRequest req = (HttpUriRequest) localContext.getAttribute(ExecutionContext.HTTP_REQUEST);
-
-      responseStr.append("Final request URI: " + req.getMethod() + " " + target + req.getURI() + "\n");
-//      System.out.println("Target host: " + target);
-//      System.out.println("Final request URI: " + req.getURI());
-//      System.out.println("Final request method: " + req.getMethod());
-      // ---
-      responseStr.append(response.getStatusLine() + "\n");
-      
-      HttpEntity entity = response.getEntity();
-      responseStr.append(entity.getContentType() + "\n\n");
-      
-      if (entity != null) {
-        InputStream in = entity.getContent();
-        BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-        
-        String str;
-        while ((str = reader.readLine()) != null) {
-          responseStr.append(str + "\n");
-        }
-        
-        taResponse.setText(responseStr.toString());
-        taResponse.setCaretPosition(0);
-      }
-      
-      httpClient.getConnectionManager().shutdown();
-    }
-    catch (Exception ex) {
-      taResponse.setText(ex.getMessage() + "\n\n" + ex.getStackTrace());
-    }
-  }
-  
-  
-  public static void main(String[] args)
-  {
-    ApacheHttpClientUsageTest frame = new ApacheHttpClientUsageTest();
-    frame.setVisible(true);
-    frame.tfAddressBar.setCaretPosition(frame.tfAddressBar.getText().length());
-  }
-  
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/598ad6de/src/test/java/net/sf/taverna/t2/activities/rest/ExampleActivityTest.java.bak
----------------------------------------------------------------------
diff --git a/src/test/java/net/sf/taverna/t2/activities/rest/ExampleActivityTest.java.bak b/src/test/java/net/sf/taverna/t2/activities/rest/ExampleActivityTest.java.bak
deleted file mode 100644
index 56b6904..0000000
--- a/src/test/java/net/sf/taverna/t2/activities/rest/ExampleActivityTest.java.bak
+++ /dev/null
@@ -1,153 +0,0 @@
-package net.sf.taverna.t2.activities.rest;
-
-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.reference.ErrorDocument;
-import net.sf.taverna.t2.reference.ExternalReferenceSPI;
-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 ExampleActivityTest {
-
-	private RESTActivityConfigurationBean configBean;
-
-	private RESTActivity activity = new RESTActivity();
-
-	@Before
-	public void makeConfigBean() throws Exception {
-		configBean = new RESTActivityConfigurationBean();
-		configBean.setExampleString("something");
-		configBean
-				.setExampleUri(URI.create("http://localhost:8080/myEndPoint"));
-	}
-
-	@Test(expected = ActivityConfigurationException.class)
-	public void invalidConfiguration() throws ActivityConfigurationException {
-		RESTActivityConfigurationBean invalidBean = new RESTActivityConfigurationBean();
-		invalidBean.setExampleString("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", ExternalReferenceSPI.class);
-
-		Map<String, Object> outputs = ActivityInvoker.invokeAsyncActivity(
-				activity, inputs, expectedOutputTypes);
-
-		assertEquals("Unexpected outputs", 2, outputs.size());
-		assertEquals("da39a3ee5e6b4b0d3255bfef95601890afd80709", outputs.get("simpleOutput"));
-		ErrorDocument errorDoc = (ErrorDocument) outputs.get("moreOutputs");
-		assertEquals("java.lang.Exception: There are no more values",
-		             errorDoc.getExceptionMessage());
-
-	}
-	
-	
-	
-	@Test
-  public void checksumOfExtraData() throws Exception {
-    configBean.setExampleString("specialCase");
-	  activity.configure(configBean);
-
-    Map<String, Object> inputs = new HashMap<String, Object>();
-    inputs.put("firstInput", "hello");
-    inputs.put("extraData", Arrays.asList("Test1".getBytes("utf8"),
-        "Test2".getBytes("utf8")));
-
-
-    Map<String, Class<?>> expectedOutputTypes = new HashMap<String, Class<?>>();
-    expectedOutputTypes.put("simpleOutput", String.class);
-    expectedOutputTypes.put("moreOutputs", ExternalReferenceSPI.class);
-    expectedOutputTypes.put("report", String.class);
-
-
-    Map<String, Object> outputs = ActivityInvoker.invokeAsyncActivity(
-        activity, inputs, expectedOutputTypes);
-
-    assertEquals("Unexpected outputs", 3, outputs.size());
-    assertEquals("35bceb434ff8e69fb89b829e461c921a28b423b3", outputs.get("simpleOutput"));
-    ErrorDocument errorDoc = (ErrorDocument) outputs.get("moreOutputs");
-    assertEquals("java.lang.Exception: There are no more values",
-                 errorDoc.getExceptionMessage());
-
-  }
-	
-	
-
-	@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);
-
-		RESTActivityConfigurationBean specialBean = new RESTActivityConfigurationBean();
-		specialBean.setExampleString("specialCase");
-		specialBean.setExampleUri(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-common-activities/blob/598ad6de/src/test/java/net/sf/taverna/t2/activities/rest/URISignatureHandlerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/net/sf/taverna/t2/activities/rest/URISignatureHandlerTest.java b/src/test/java/net/sf/taverna/t2/activities/rest/URISignatureHandlerTest.java
deleted file mode 100644
index 8aad5ec..0000000
--- a/src/test/java/net/sf/taverna/t2/activities/rest/URISignatureHandlerTest.java
+++ /dev/null
@@ -1,594 +0,0 @@
-package net.sf.taverna.t2.activities.rest;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.*;
-
-import static org.junit.Assert.*;
-
-public class URISignatureHandlerTest {
-	// ==========================================================================
-	// TEST URIs
-	// ==========================================================================
-
-	final String validURI_NoPlaceholders = "http://sysmo-db.org/sops/";
-	final String validURI_PlaceholdersInMainPartOfURIOnly = "http://sysmo-db.org/sops/{sop_id}/experimental_conditions/{cond_id}";
-	final String validURI_PlaceholdersInQueryStringOnly = "http://sandbox.myexperiment.org/user.xml?id={user_id}&verbose=true";
-	final String validURI_3MixedPlaceholders = "http://sysmo-db.org/sops/{sop_id}/experimental_conditions/{cond_id}?condition_unit={unit}";
-
-	final String badURI_nullURI = null;
-	final String badURI_emptyURI = "";
-	final String badURI_SingleOpeningSymbolNoClosingSymbol = "http://sysmo-db.org/sops/{sop_id/experimental_conditions";
-	final String badURI_SingleClosingSymbolNoOpeningSymbol = "http://sysmo-db.org/sops/sop_id}/experimental_conditions";
-	final String badURI_DoubleOpeningSymbolsNoClosingSymbol = "http://sysmo-db.org/sops/{{sop_id/experimental_conditions";
-	final String badURI_DoubleOpeningSymbols = "http://sysmo-db.org/sops/{{sop_id}/experimental_conditions";
-	final String badURI_DoubleOpeningSymbolsSpaced = "http://sysmo-db.org/sops/{sop_{id}/experimental_conditions";
-	final String badURI_DoubleClosingSymbols = "http://sysmo-db.org/sops/{sop_id}}/experimental_conditions";
-	final String badURI_DoubleClosingSymbolsSpaced = "http://sysmo-db.org/sops/{sop}_id}/experimental_conditions";
-	final String badURI_NestedPlaceholders = "http://sandbox.myexperiment.org/user.xml?id={user_{id}}&verbose=true";
-	final String badURI_NestedPlaceholdersSpaced = "http://sandbox.myexperiment.org/user.xml?id={us{er}_id}&verbose=true";
-	final String badURI_DuplicatePlaceholders = "http://sandbox.myexperiment.org/user.xml?id={user_id}&verbose={user_id}";
-	final String badURI_DuplicatePlaceholdersWithOthers = "http://sysmo-db.org/sops/{unit}/experimental_conditions/{cond_id}?condition_unit={unit}";
-	
-     final String validURI_MultipleQueryString =
-            "http://dr-site.esrin.esa.int/{catalogue}/genesi/ASA_IMS_1P/rdf/?count={count?}&startPage={startPage?}&startIndex={startIndex?}&q={searchTerms?}"; 	
-
-	// ==========================================================================
-	// TEST URI SIGNATURE BOOLEAN VALIDATION
-	// ==========================================================================
-
-	// success cases
-
-	@Test
-	public void isValid_validURI_NoPlaceholders() {
-		assertTrue(URISignatureHandler.isValid(validURI_NoPlaceholders));
-	}
-
-	@Test
-	public void isValid_validURI_PlaceholdersInMainPartOfURIOnly() {
-		assertTrue(URISignatureHandler
-				.isValid(validURI_PlaceholdersInMainPartOfURIOnly));
-	}
-
-	@Test
-	public void isValid_validURI_PlaceholdersInQueryStringOnly() {
-		assertTrue(URISignatureHandler
-				.isValid(validURI_PlaceholdersInQueryStringOnly));
-	}
-
-	@Test
-	public void isValid_validURI_MixedPlaceholders() {
-		assertTrue(URISignatureHandler.isValid(validURI_3MixedPlaceholders));
-	}
-
- 	@Test
- 	public void isValid_validURI_MultipleQueryString() {
- 		assertTrue(URISignatureHandler.isValid(validURI_MultipleQueryString));
- 	}
- 	
-	// failure cases
-
-	@Test
-	public void isValid_badURI_nullURI() {
-		assertFalse(URISignatureHandler.isValid(badURI_nullURI));
-	}
-
-	@Test
-	public void isValid_badURI_emptyURI() {
-		assertFalse(URISignatureHandler.isValid(badURI_emptyURI));
-	}
-
-	@Test
-	public void isValid_badURI_SingleOpeningSymbolNoClosingSymbol() {
-		assertFalse(URISignatureHandler
-				.isValid(badURI_SingleOpeningSymbolNoClosingSymbol));
-	}
-
-	@Test
-	public void isValid_badURI_SingleClosingSymbolNoOpeningSymbol() {
-		assertFalse(URISignatureHandler
-				.isValid(badURI_SingleClosingSymbolNoOpeningSymbol));
-	}
-
-	@Test
-	public void isValid_badURI_DoubleOpeningSymbolsNoClosingSymbol() {
-		assertFalse(URISignatureHandler
-				.isValid(badURI_DoubleOpeningSymbolsNoClosingSymbol));
-	}
-
-	@Test
-	public void isValid_badURI_DoubleOpeningSymbols() {
-		assertFalse(URISignatureHandler.isValid(badURI_DoubleOpeningSymbols));
-	}
-
-	@Test
-	public void isValid_badURI_DoubleOpeningSymbolsSpaced() {
-		assertFalse(URISignatureHandler
-				.isValid(badURI_DoubleOpeningSymbolsSpaced));
-	}
-
-	@Test
-	public void isValid_badURI_DoubleClosingSymbols() {
-		assertFalse(URISignatureHandler.isValid(badURI_DoubleClosingSymbols));
-	}
-
-	@Test
-	public void isValid_badURI_DoubleClosingSymbolsSpaced() {
-		assertFalse(URISignatureHandler
-				.isValid(badURI_DoubleClosingSymbolsSpaced));
-	}
-
-	@Test
-	public void isValid_badURI_NestedPlaceholders() {
-		assertFalse(URISignatureHandler.isValid(badURI_NestedPlaceholders));
-	}
-
-	@Test
-	public void isValid_badURI_NestedPlaceholdersSpaced() {
-		assertFalse(URISignatureHandler
-				.isValid(badURI_NestedPlaceholdersSpaced));
-	}
-
-	@Test
-	public void isValid_badURI_DuplicatePlaceholders() {
-		assertFalse(URISignatureHandler.isValid(badURI_DuplicatePlaceholders));
-	}
-
-	@Test
-	public void isValid_badURI_DuplicatePlaceholdersWithOthers() {
-		assertFalse(URISignatureHandler
-				.isValid(badURI_DuplicatePlaceholdersWithOthers));
-	}
-
-	// ==========================================================================
-	// TEST URI SIGNATURE DETAILED VALIDATION
-	// ==========================================================================
-
-	// success cases
-
-	@Test
-	public void validate_validURI_NoPlaceholders() {
-		// nothing should happen when this is executed if validation succeeds
-		URISignatureHandler.validate(validURI_NoPlaceholders);
-	}
-
-	@Test
-	public void validate_validURI_PlaceholdersInMainPartOfURIOnly() {
-		// nothing should happen when this is executed if validation succeeds
-		URISignatureHandler.validate(validURI_PlaceholdersInMainPartOfURIOnly);
-	}
-
-	@Test
-	public void validate_validURI_PlaceholdersInQueryStringOnly() {
-		// nothing should happen when this is executed if validation succeeds
-		URISignatureHandler.validate(validURI_PlaceholdersInQueryStringOnly);
-	}
-
-	@Test
-	public void validate_validURI_MixedPlaceholders() {
-		// nothing should happen when this is executed if validation succeeds
-		URISignatureHandler.validate(validURI_3MixedPlaceholders);
-	}
-
- 	@Test
- 	public void validate_validURI_validURI_Multiple() {
- 		URISignatureHandler.validate(validURI_MultipleQueryString);
- 	}
-	
-	// failure cases
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_nullURI() {
-		URISignatureHandler.validate(badURI_nullURI);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_emptyURI() {
-		URISignatureHandler.validate(badURI_emptyURI);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_SingleOpeningSymbolNoClosingSymbol() {
-		URISignatureHandler.validate(badURI_SingleOpeningSymbolNoClosingSymbol);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_SingleClosingSymbolNoOpeningSymbol() {
-		URISignatureHandler.validate(badURI_SingleClosingSymbolNoOpeningSymbol);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_DoubleOpeningSymbolsNoClosingSymbol() {
-		URISignatureHandler
-				.validate(badURI_DoubleOpeningSymbolsNoClosingSymbol);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_DoubleOpeningSymbols() {
-		URISignatureHandler.validate(badURI_DoubleOpeningSymbols);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_DoubleOpeningSymbolsSpaced() {
-		URISignatureHandler.validate(badURI_DoubleOpeningSymbolsSpaced);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_DoubleClosingSymbols() {
-		URISignatureHandler.validate(badURI_DoubleClosingSymbols);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_DoubleClosingSymbolsSpaced() {
-		URISignatureHandler.validate(badURI_DoubleClosingSymbolsSpaced);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_NestedPlaceholders() {
-		URISignatureHandler.validate(badURI_NestedPlaceholders);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_NestedPlaceholdersSpaced() {
-		URISignatureHandler.validate(badURI_NestedPlaceholdersSpaced);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_DuplicatePlaceholders() {
-		URISignatureHandler.validate(badURI_DuplicatePlaceholders);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void validate_badURI_DuplicatePlaceholdersWithOthers() {
-		URISignatureHandler.validate(badURI_DuplicatePlaceholdersWithOthers);
-	}
-
-	// ==========================================================================
-	// TEST PLACEHOLDER EXTRACTION FROM URI SIGNATURE
-	// ==========================================================================
-
-	// success cases
-
-	@Test
-	public void extractPlaceholders_validURI_NoPlaceholders() {
-		List<String> placeholders = URISignatureHandler
-				.extractPlaceholders(validURI_NoPlaceholders);
-		assertNotNull(placeholders);
-		assertEquals(0, placeholders.size());
-	}
-
-	@Test
-	public void extractPlaceholders_validURI_PlaceholdersInMainPartOfURIOnly() {
-		List<String> placeholders = URISignatureHandler
-				.extractPlaceholders(validURI_PlaceholdersInMainPartOfURIOnly);
-		assertNotNull(placeholders);
-		assertEquals(2, placeholders.size());
-		assertEquals("Wrong first placeholder", "sop_id", placeholders.get(0));
-		assertEquals("Wrong second placeholder", "cond_id", placeholders.get(1));
-	}
-
-	@Test
-	public void extractPlaceholders_validURI_PlaceholdersInQueryStringOnly() {
-		List<String> placeholders = URISignatureHandler
-				.extractPlaceholders(validURI_PlaceholdersInQueryStringOnly);
-		assertNotNull(placeholders);
-		assertEquals(1, placeholders.size());
-		assertEquals("Wrong first placeholder", "user_id", placeholders.get(0));
-	}
-
-	@Test
-	public void extractPlaceholders_validURI_MixedPlaceholders() {
-		List<String> placeholders = URISignatureHandler
-				.extractPlaceholders(validURI_3MixedPlaceholders);
-		assertNotNull(placeholders);
-		assertEquals("Wrong number of placeholders extracted", 3, placeholders
-				.size());
-		assertEquals("Wrong first placeholder", "sop_id", placeholders.get(0));
-		assertEquals("Wrong second placeholder", "cond_id", placeholders.get(1));
-		assertEquals("Wrong third placeholder", "unit", placeholders.get(2));
-	}
-
-	@Test
- 	public void extractPlaceholders_validURI_MultipleQueryString() {
- 		List<String> placeholders = URISignatureHandler
- 				.extractPlaceholders(validURI_MultipleQueryString);
- 		assertNotNull(placeholders);
- 		assertEquals(5, placeholders.size());
- 		assertEquals("Wrong first placeholder", "catalogue", placeholders.get(0));
- 		assertEquals("Wrong second placeholder", "count?", placeholders.get(1));
- 		assertEquals("Wrong third placeholder", "startPage?", placeholders.get(2));
- 		assertEquals("Wrong fourth placeholder", "startIndex?", placeholders.get(3));
- 		assertEquals("Wrong fifth placeholder", "searchTerms?", placeholders.get(4));
- 	}
-	
-	// failure cases
-
-	/*
-	 * These tests are all meant to generate an exception - therefore, no need
-	 * to evaluate generated values, as there will be none returned.
-	 */
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_nullURI() {
-		URISignatureHandler.extractPlaceholders(badURI_nullURI);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_emptyURI() {
-		URISignatureHandler.extractPlaceholders(badURI_emptyURI);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_SingleOpeningSymbolNoClosingSymbol() {
-		URISignatureHandler
-				.extractPlaceholders(badURI_SingleOpeningSymbolNoClosingSymbol);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_SingleClosingSymbolNoOpeningSymbol() {
-		URISignatureHandler
-				.extractPlaceholders(badURI_SingleClosingSymbolNoOpeningSymbol);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_DoubleOpeningSymbolsNoClosingSymbol() {
-		URISignatureHandler
-				.extractPlaceholders(badURI_DoubleOpeningSymbolsNoClosingSymbol);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_DoubleOpeningSymbols() {
-		URISignatureHandler.extractPlaceholders(badURI_DoubleOpeningSymbols);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_DoubleOpeningSymbolsSpaced() {
-		URISignatureHandler
-				.extractPlaceholders(badURI_DoubleOpeningSymbolsSpaced);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_DoubleClosingSymbols() {
-		URISignatureHandler.extractPlaceholders(badURI_DoubleClosingSymbols);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_DoubleClosingSymbolsSpaced() {
-		URISignatureHandler
-				.extractPlaceholders(badURI_DoubleClosingSymbolsSpaced);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_NestedPlaceholders() {
-		URISignatureHandler.extractPlaceholders(badURI_NestedPlaceholders);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_NestedPlaceholdersSpaced() {
-		URISignatureHandler
-				.extractPlaceholders(badURI_NestedPlaceholdersSpaced);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_DuplicatePlaceholders() {
-		URISignatureHandler.extractPlaceholders(badURI_DuplicatePlaceholders);
-	}
-
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void extractPlaceholders_badURI_DuplicatePlaceholdersWithOthers() {
-		URISignatureHandler
-				.extractPlaceholders(badURI_DuplicatePlaceholdersWithOthers);
-	}
-
-	// ==========================================================================
-	// TEST COMPLETE URI GENERATION FROM URI SIGNATURE + PARAMETERS
-	// ==========================================================================
-
-	// success cases
-
-	@SuppressWarnings("serial")
-	@Test
-	public void generateCompleteURI_successfulURIGeneration() {
-		String uriSignature = "http://sysmo-db.org/sops/{sop_id}/experimental_conditions/{cond_id}?condition_unit={unit}";
-		Map<String, String> parameters = new HashMap<String, String>() {
-			{
-				put("sop_id", "111");
-				put("unit", "33");
-				put("cond_id", "2222");
-			}
-		};
-
-		String completeURI = URISignatureHandler.generateCompleteURI(
-				uriSignature, parameters, true);
-		assertEquals(
-				"http://sysmo-db.org/sops/111/experimental_conditions/2222?condition_unit=33",
-				completeURI);
-	}
-
-	@SuppressWarnings("serial")
-	@Test
-	public void generateCompleteURI_successfulURIGeneration_URLParameterEscaping() {
-		String uriSignature = "http://sysmo-db.org/sops/{sop_id}/experimental_conditions/{cond_id}?condition_unit={unit}";
-		Map<String, String> parameters = new HashMap<String, String>() {
-			{
-				put("sop_id", "1 11");
-				put("unit", "3;3");
-				put("cond_id", "2/2$2&2:");
-			}
-		};
-
-		String completeURI = URISignatureHandler.generateCompleteURI(
-				uriSignature, parameters, true);
-		System.err.println(completeURI);
-		assertEquals(
-				"http://sysmo-db.org/sops/1%2011/experimental_conditions/2%2F2%242%262%3A?condition_unit=3%3B3",
-				completeURI);
-	}
-
-	@SuppressWarnings("serial")
-	@Test
-	public void generateCompleteURI_successfulURIGeneration_noURLParameterEscaping() {
-		String uriSignature = "http://sysmo-db.org/sops/{sop_id}/experimental_conditions/{cond_id}?condition_unit={unit}";
-		Map<String, String> parameters = new HashMap<String, String>() {
-			{
-				put("sop_id", "1 11");
-				put("unit", "3;3");
-				put("cond_id", "2/2$2&2:");
-			}
-		};
-
-		String completeURI = URISignatureHandler.generateCompleteURI(
-				uriSignature, parameters, false);
-		assertEquals(
-				"http://sysmo-db.org/sops/1 11/experimental_conditions/2/2$2&2:?condition_unit=3;3",
-				completeURI);
-	}
-	
- 	@SuppressWarnings("serial")
- 	@Test
- 	public void generateCompleteURI_successfulURIGeneration_optionalParams() {
- 		String uriSignature = "http://dr-site.esrin.esa.int/{catalogue}/genesi/ASA_IMS_1P/rdf/?count={count?}&startPage={startPage?}&startIndex={startIndex?}&q={searchTerms?}";
- 		Map<String, String> allParameters = new HashMap<String, String>() {
- 			{
- 				put("catalogue", "catalogue");
- 				put("count?", "10");
- 				put("startPage?", "1");
- 				put("startIndex?", "1");
- 				put("searchTerms?", "term1");
- 			}
- 		};
- 
- 		Map<String, String> parametersMissingOptional = new HashMap<String, String>() {
- 			{
- 				put("catalogue", "catalogue");
- 				put("count?", "10");
- 				put("searchTerms?", "term1");
- 			}
- 		};
- 
- 		Map<String, String> parametersMissingFirstOptional = new HashMap<String, String>() {
- 			{
- 				put("catalogue", "catalogue");
- 				put("startPage?", "1");
- 				put("startIndex?", "1");
- 				put("searchTerms?", "term1");
- 			}
- 		};
- 
- 		String completeURI1 = URISignatureHandler.generateCompleteURI(
- 				uriSignature, allParameters, false);
- 		assertEquals(
-				"http://dr-site.esrin.esa.int/catalogue/genesi/ASA_IMS_1P/rdf/?count=10&startPage=1&startIndex=1&q=term1",
- 				completeURI1);
- 
- 		String completeURI2 = URISignatureHandler.generateCompleteURI(
- 				uriSignature, parametersMissingOptional, false);
- 		assertEquals(
- 				"http://dr-site.esrin.esa.int/catalogue/genesi/ASA_IMS_1P/rdf/?count=10&q=term1",
- 				completeURI2);
- 
- 		String completeURI3 = URISignatureHandler.generateCompleteURI(
- 				uriSignature, parametersMissingFirstOptional, false);
- 		assertEquals(
- 				"http://dr-site.esrin.esa.int/catalogue/genesi/ASA_IMS_1P/rdf/?startPage=1&startIndex=1&q=term1",
- 				completeURI3);
- 	}
- 
-	@Test
-	public void generateCompleteURI_signatureWithNoPlaceholders_nullParameterMap() {
-		String completeURI = URISignatureHandler.generateCompleteURI(
-				validURI_NoPlaceholders, null, true);
-		assertEquals(validURI_NoPlaceholders, completeURI);
-	}
-
-	@Test
-	public void generateCompleteURI_signatureWithNoPlaceholders_emptyParameterMap() {
-		String completeURI = URISignatureHandler.generateCompleteURI(
-				validURI_NoPlaceholders, Collections
-						.<String, String> emptyMap(), true);
-		assertEquals(validURI_NoPlaceholders, completeURI);
-	}
-
-	// failure cases
-
-	@Test(expected = URISignatureHandler.URIGenerationFromSignatureException.class)
-	public void generateCompleteURI_signatureWithPlaceholders_nullParameterMap() {
-		URISignatureHandler.generateCompleteURI(validURI_3MixedPlaceholders,
-				null, true);
-	}
-
-	@Test(expected = URISignatureHandler.URIGenerationFromSignatureException.class)
-	public void generateCompleteURI_signatureWithPlaceholders_emptyParameterMap() {
-		URISignatureHandler.generateCompleteURI(validURI_3MixedPlaceholders,
-				Collections.<String, String> emptyMap(), true);
-	}
-
-	@SuppressWarnings("serial")
-	@Test
-	public void generateCompleteURI_signatureWithPlaceholders_missingParameterURIGeneration_FailureNotExpected() {
-		String uriSignature = "http://sysmo-db.org/sops/{sop_id}/experimental_conditions/{cond_id}?condition_unit={unit}";
-		Map<String, String> parameters = new HashMap<String, String>() {
-			{
-				put("sop_id", "111");
-				put("cond_id", "2222");
-			}
-		};
-
-		String completeURI = URISignatureHandler.generateCompleteURI(
-				uriSignature, parameters, true);
-
-		assertEquals(
-				"http://sysmo-db.org/sops/111/experimental_conditions/2222",
-				completeURI);
-	}
-
-	// the following failure case is just to confirm the validation of the URI
-	// signature by the validation mechanism, which is the same for
-	// generateCompleteURI()
-	// and extractPlaceholders()
-
-	@SuppressWarnings("serial")
-	@Test(expected = URISignatureHandler.URISignatureParsingException.class)
-	public void generateCompleteURI_duplicatePlaceholderURIGeneration_FailureExpected() {
-		String uriSignature = "http://sysmo-db.org/sops/{sop_id}/experimental_conditions/{cond_id}?condition_unit={sop_id}";
-		Map<String, String> parameters = new HashMap<String, String>() {
-			{
-				put("sop_id", "111");
-				put("unit", "33");
-				put("cond_id", "2222");
-			}
-		};
-
-		String completeURI = URISignatureHandler.generateCompleteURI(
-				uriSignature, parameters, true);
-
-		assertEquals(
-				"http://sysmo-db.org/sops/111/experimental_conditions/2222?condition_unit=33",
-				completeURI);
-	}
-
-	@SuppressWarnings("serial")
- 	@Test(expected = URISignatureHandler.URIGenerationFromSignatureException.class)
- 	public void generateCompleteURI_failureURIGeneration_optionalParams() {
- 		String uriSignature = "http://dr-site.esrin.esa.int/{catalogue}/genesi/ASA_IMS_1P/rdf/?count={count?}&startPage={startPage?}&startIndex={startIndex?}&q={searchTerms?}";
- 
- 		Map<String, String> parametersMissingCompulsory = new HashMap<String, String>() {
- 			{
- 				put("count?", "10");
- 				put("startPage?", "1");
- 				put("startIndex?", "1");
- 				put("searchTerms?", "term1");
- 			}
- 		};
- 
- 		String completeURI = URISignatureHandler.generateCompleteURI(
- 				uriSignature, parametersMissingCompulsory, false);
- 
- 		assertEquals(
- 				"http://dr-site.esrin.esa.int/catalogue/genesi/ASA_IMS_1P/rdf/?count={count?}&startPage={startPage?}&startIndex={startIndex?}&q={searchTerms?}",
- 				completeURI);
- 	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/598ad6de/taverna-rest-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/pom.xml b/taverna-rest-activity/pom.xml
new file mode 100644
index 0000000..cb90583
--- /dev/null
+++ b/taverna-rest-activity/pom.xml
@@ -0,0 +1,109 @@
+<?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>net.sf.taverna</groupId>
+		<artifactId>taverna-parent</artifactId>
+		<version>3.0.1-SNAPSHOT</version>
+	</parent>
+	<groupId>net.sf.taverna.t2.activities</groupId>
+	<artifactId>rest-activity</artifactId>
+	<version>2.0.1-SNAPSHOT</version>
+	<name>Taverna REST Activity</name>
+	<packaging>bundle</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>net.sf.taverna.t2.core</groupId>
+			<artifactId>reference-api</artifactId>
+			<version>${t2.core.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.taverna.t2.core</groupId>
+			<artifactId>workflowmodel-api</artifactId>
+			<version>${t2.core.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.taverna.t2.security</groupId>
+			<artifactId>credential-manager</artifactId>
+			<version>${t2.security.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>${commons.codec.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>com.springsource.org.apache.httpcomponents.httpclient</artifactId>
+			<version>${apache.httpclient.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.httpcomponents</groupId>
+					<artifactId>com.springsource.org.apache.httpcomponents.httpclient-cache</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.httpcomponents</groupId>
+					<artifactId>com.springsource.org.apache.httpcomponents.httpmime</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.taverna.t2.activities</groupId>
+			<artifactId>activity-test-utils</artifactId>
+			<version>${t2.activities.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- 
+		   for opening configuration dialog of XPath activity 
+		   from 'Solution' area of 'VisitExplainer'
+
+		<dependency>
+			<groupId>net.sf.taverna.t2.ui-api</groupId>
+			<artifactId>report-api</artifactId>
+			<version>${t2.ui.api.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.taverna.t2.ui-components</groupId>
+			<artifactId>report-view</artifactId>
+			<version>${t2.ui.components.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>
+	<scm>
+		<connection>scm:git:https://github.com/taverna/taverna-rest-activity.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com/taverna/taverna-rest-activity.git</developerConnection>
+		<url>https://github.com/taverna/taverna-rest-activity/</url>
+		<tag>HEAD</tag>
+	</scm>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/598ad6de/taverna-rest-activity/src/main/java/net/sf/taverna/t2/activities/rest/HTTPRequest.java
----------------------------------------------------------------------
diff --git a/taverna-rest-activity/src/main/java/net/sf/taverna/t2/activities/rest/HTTPRequest.java b/taverna-rest-activity/src/main/java/net/sf/taverna/t2/activities/rest/HTTPRequest.java
new file mode 100644
index 0000000..9ff240b
--- /dev/null
+++ b/taverna-rest-activity/src/main/java/net/sf/taverna/t2/activities/rest/HTTPRequest.java
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (C) 2011 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 net.sf.taverna.t2.activities.rest;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sf.taverna.t2.activities.rest.RESTActivity.HTTP_METHOD;
+import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationBean;
+import net.sf.taverna.t2.workflowmodel.processor.config.ConfigurationProperty;
+
+/**
+ * HTTP Request configuration bean.
+ *
+ * @author David Withers
+ */
+@ConfigurationBean(uri = RESTActivity.URI + "#Request")
+public class HTTPRequest {
+
+	private HTTP_METHOD method;
+
+	private String absoluteURITemplate;
+
+	private List<HTTPRequestHeader> headers = new ArrayList<HTTPRequestHeader>();
+
+	public HTTP_METHOD getMethod() {
+		return method;
+	}
+
+	@ConfigurationProperty(name = "mthd", label = "HTTP Method", uri="http://www.w3.org/2011/http#mthd")
+	public void setMethod(URI method) {
+		setMethod(HTTP_METHOD.valueOf(method.getFragment()));
+	}
+
+	public void setMethod(HTTP_METHOD method) {
+		this.method = method;
+	}
+
+	public String getAbsoluteURITemplate() {
+		return absoluteURITemplate;
+	}
+
+	@ConfigurationProperty(name = "absoluteURITemplate", label = "URL Template")
+	public void setAbsoluteURITemplate(String absoluteURITemplate) {
+		this.absoluteURITemplate = absoluteURITemplate;
+	}
+
+	public List<HTTPRequestHeader> getHeaders() {
+		return headers;
+	}
+
+	@ConfigurationProperty(name = "headers", label = "HTTP Request Headers", uri="http://www.w3.org/2011/http#headers")
+	public void setHeaders(List<HTTPRequestHeader> headers) {
+		this.headers = headers;
+	}
+
+	public HTTPRequestHeader getHeader(String name) {
+		for (HTTPRequestHeader httpRequestHeader : headers) {
+			if (httpRequestHeader.getFieldName().equals(name)) {
+				return httpRequestHeader;
+			}
+		}
+		return null;
+	}
+
+	public void setHeader(String name, String value) {
+		HTTPRequestHeader httpRequestHeader = getHeader(name);
+		if (httpRequestHeader == null) {
+			httpRequestHeader = new HTTPRequestHeader();
+			httpRequestHeader.setFieldName(name);
+			headers.add(httpRequestHeader);
+		}
+		httpRequestHeader.setFieldValue(value);
+	}
+
+	public void setHeader(String name, boolean use100Continue) {
+		HTTPRequestHeader httpRequestHeader = getHeader(name);
+		if (httpRequestHeader == null) {
+			httpRequestHeader = new HTTPRequestHeader();
+			httpRequestHeader.setFieldName(name);
+			headers.add(httpRequestHeader);
+		}
+		httpRequestHeader.setUse100Continue(use100Continue);
+	}
+
+}