http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/package-info.java index 0a1a52f..37552c4 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/package-info.java @@ -11,7 +11,7 @@ @XmlNs(prefix = "ts-soap", namespaceURI = SERVER_SOAP), @XmlNs(prefix = "feed", namespaceURI = FEED), @XmlNs(prefix = "admin", namespaceURI = ADMIN) }) -package org.taverna.server.master.notification.atom; +package org.apache.taverna.server.master.notification.atom; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,12 +30,12 @@ package org.taverna.server.master.notification.atom; */ import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED; -import static org.taverna.server.master.common.Namespaces.ADMIN; -import static org.taverna.server.master.common.Namespaces.FEED; -import static org.taverna.server.master.common.Namespaces.SERVER; -import static org.taverna.server.master.common.Namespaces.SERVER_REST; -import static org.taverna.server.master.common.Namespaces.SERVER_SOAP; -import static org.taverna.server.master.common.Namespaces.XLINK; +import static org.apache.taverna.server.master.common.Namespaces.ADMIN; +import static org.apache.taverna.server.master.common.Namespaces.FEED; +import static org.apache.taverna.server.master.common.Namespaces.SERVER; +import static org.apache.taverna.server.master.common.Namespaces.SERVER_REST; +import static org.apache.taverna.server.master.common.Namespaces.SERVER_SOAP; +import static org.apache.taverna.server.master.common.Namespaces.XLINK; import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlSchema;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/package-info.java index 43335cf..4e35a04 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/package-info.java @@ -4,7 +4,7 @@ * The notification fabric and implementations of notification dispatchers * that support subscription. */ -package org.taverna.server.master.notification; +package org.apache.taverna.server.master.notification; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/package-info.java index d912ac8..c79384c 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/package-info.java @@ -4,7 +4,7 @@ * The core of the implementation of Taverna Server, including the * implementations of the SOAP and REST interfaces. */ -package org.taverna.server.master; +package org.apache.taverna.server.master; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/ContentTypes.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/ContentTypes.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/ContentTypes.java index d9aef82..e4b1d45 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/ContentTypes.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/ContentTypes.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/DirectoryContents.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/DirectoryContents.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/DirectoryContents.java index 42d4b0e..ce30852 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/DirectoryContents.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/DirectoryContents.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,7 +18,7 @@ package org.taverna.server.master.rest; * limitations under the License. */ -import static org.taverna.server.master.common.Uri.secure; +import static org.apache.taverna.server.master.common.Uri.secure; import java.util.ArrayList; import java.util.Collection; @@ -31,8 +31,8 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; -import org.taverna.server.master.common.DirEntryReference; -import org.taverna.server.master.interfaces.DirectoryEntry; +import org.apache.taverna.server.master.common.DirEntryReference; +import org.apache.taverna.server.master.interfaces.DirectoryEntry; /** * The result of a RESTful operation to list the contents of a directory. Done http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/FileSegment.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/FileSegment.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/FileSegment.java index 6b7aaff..75b56f9 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/FileSegment.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/FileSegment.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,8 +26,8 @@ import java.util.regex.Pattern; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.interfaces.File; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.interfaces.File; /** * Representation of a segment of a file to be read by JAX-RS. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/InteractionFeedREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/InteractionFeedREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/InteractionFeedREST.java index 69705d9..a039baa 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/InteractionFeedREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/InteractionFeedREST.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,7 +18,7 @@ package org.taverna.server.master.rest; * limitations under the License. */ -import static org.taverna.server.master.rest.ContentTypes.ATOM; +import static org.apache.taverna.server.master.rest.ContentTypes.ATOM; import java.net.MalformedURLException; @@ -35,9 +35,9 @@ import javax.ws.rs.core.Response; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; import org.apache.cxf.jaxrs.model.wadl.Description; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.NoDirectoryEntryException; -import org.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.NoDirectoryEntryException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; /** * A very stripped down ATOM feed for the interaction service. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/ListenerDefinition.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/ListenerDefinition.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/ListenerDefinition.java index f877d7a..cbee33b 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/ListenerDefinition.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/ListenerDefinition.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/MakeOrUpdateDirEntry.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/MakeOrUpdateDirEntry.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/MakeOrUpdateDirEntry.java index 52e6d04..9cbaf13 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/MakeOrUpdateDirEntry.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/MakeOrUpdateDirEntry.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerDirectoryREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerDirectoryREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerDirectoryREST.java index 1ed8a64..5f6e7d5 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerDirectoryREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerDirectoryREST.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,12 +20,12 @@ package org.taverna.server.master.rest; import static java.util.Collections.unmodifiableList; import static javax.ws.rs.core.MediaType.WILDCARD; -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.rest.ContentTypes.BYTES; -import static org.taverna.server.master.rest.ContentTypes.JSON; -import static org.taverna.server.master.rest.ContentTypes.URI_LIST; -import static org.taverna.server.master.rest.ContentTypes.XML; -import static org.taverna.server.master.rest.ContentTypes.ZIP; +import static org.apache.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.rest.ContentTypes.BYTES; +import static org.apache.taverna.server.master.rest.ContentTypes.JSON; +import static org.apache.taverna.server.master.rest.ContentTypes.URI_LIST; +import static org.apache.taverna.server.master.rest.ContentTypes.XML; +import static org.apache.taverna.server.master.rest.ContentTypes.ZIP; import java.io.InputStream; import java.net.URI; @@ -50,11 +50,11 @@ import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.Variant; import org.apache.cxf.jaxrs.model.wadl.Description; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.NoDirectoryEntryException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.interfaces.Directory; -import org.taverna.server.master.interfaces.File; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.NoDirectoryEntryException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.interfaces.Directory; +import org.apache.taverna.server.master.interfaces.File; /** * Representation of how a workflow run's working directory tree looks. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerInputREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerInputREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerInputREST.java index 154a1eb..64f614f 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerInputREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerInputREST.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,13 +18,13 @@ package org.taverna.server.master.rest; * limitations under the License. */ -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.rest.ContentTypes.JSON; -import static org.taverna.server.master.rest.ContentTypes.TEXT; -import static org.taverna.server.master.rest.ContentTypes.XML; -import static org.taverna.server.master.rest.TavernaServerInputREST.PathNames.BACLAVA; -import static org.taverna.server.master.rest.TavernaServerInputREST.PathNames.EXPECTED; -import static org.taverna.server.master.rest.TavernaServerInputREST.PathNames.ONE_INPUT; +import static org.apache.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.rest.ContentTypes.JSON; +import static org.apache.taverna.server.master.rest.ContentTypes.TEXT; +import static org.apache.taverna.server.master.rest.ContentTypes.XML; +import static org.apache.taverna.server.master.rest.TavernaServerInputREST.PathNames.BACLAVA; +import static org.apache.taverna.server.master.rest.TavernaServerInputREST.PathNames.EXPECTED; +import static org.apache.taverna.server.master.rest.TavernaServerInputREST.PathNames.ONE_INPUT; import java.net.URI; import java.util.ArrayList; @@ -53,16 +53,16 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import org.apache.cxf.jaxrs.model.wadl.Description; -import org.taverna.server.master.common.Uri; -import org.taverna.server.master.common.VersionedElement; -import org.taverna.server.master.exceptions.BadInputPortNameException; -import org.taverna.server.master.exceptions.BadPropertyValueException; -import org.taverna.server.master.exceptions.BadStateChangeException; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.interfaces.Input; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.port_description.InputDescription; +import org.apache.taverna.server.master.common.Uri; +import org.apache.taverna.server.master.common.VersionedElement; +import org.apache.taverna.server.master.exceptions.BadInputPortNameException; +import org.apache.taverna.server.master.exceptions.BadPropertyValueException; +import org.apache.taverna.server.master.exceptions.BadStateChangeException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.interfaces.Input; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.port_description.InputDescription; /** * This represents how a Taverna Server workflow run's inputs looks to a RESTful http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerListenersREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerListenersREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerListenersREST.java index e554997..fe7af90 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerListenersREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerListenersREST.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,11 +18,11 @@ package org.taverna.server.master.rest; * limitations under the License. */ -import static org.taverna.server.master.common.Namespaces.XLINK; -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.rest.ContentTypes.JSON; -import static org.taverna.server.master.rest.ContentTypes.TEXT; -import static org.taverna.server.master.rest.ContentTypes.XML; +import static org.apache.taverna.server.master.common.Namespaces.XLINK; +import static org.apache.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.rest.ContentTypes.JSON; +import static org.apache.taverna.server.master.rest.ContentTypes.TEXT; +import static org.apache.taverna.server.master.rest.ContentTypes.XML; import java.net.URI; import java.util.ArrayList; @@ -50,11 +50,11 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import org.apache.cxf.jaxrs.model.wadl.Description; -import org.taverna.server.master.common.Uri; -import org.taverna.server.master.common.VersionedElement; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.common.Uri; +import org.apache.taverna.server.master.common.VersionedElement; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.interfaces.Listener; /** * This represents <i>all</i> the event listeners attached to a workflow run. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerREST.java index 161b017..8f58747 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerREST.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,22 +18,22 @@ package org.taverna.server.master.rest; * limitations under the License. */ -import static org.taverna.server.master.common.Namespaces.SERVER; -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.rest.ContentTypes.JSON; -import static org.taverna.server.master.rest.ContentTypes.URI_LIST; -import static org.taverna.server.master.rest.ContentTypes.XML; -import static org.taverna.server.master.rest.TavernaServerREST.PathNames.POL; -import static org.taverna.server.master.rest.TavernaServerREST.PathNames.POL_CAPABILITIES; -import static org.taverna.server.master.rest.TavernaServerREST.PathNames.POL_NOTIFIERS; -import static org.taverna.server.master.rest.TavernaServerREST.PathNames.POL_OP_LIMIT; -import static org.taverna.server.master.rest.TavernaServerREST.PathNames.POL_PERM_LIST; -import static org.taverna.server.master.rest.TavernaServerREST.PathNames.POL_PERM_WF; -import static org.taverna.server.master.rest.TavernaServerREST.PathNames.POL_RUN_LIMIT; -import static org.taverna.server.master.rest.TavernaServerREST.PathNames.ROOT; -import static org.taverna.server.master.rest.TavernaServerREST.PathNames.RUNS; -import static org.taverna.server.master.rest.handler.Scufl2DocumentHandler.SCUFL2; -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW; +import static org.apache.taverna.server.master.common.Namespaces.SERVER; +import static org.apache.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.rest.ContentTypes.JSON; +import static org.apache.taverna.server.master.rest.ContentTypes.URI_LIST; +import static org.apache.taverna.server.master.rest.ContentTypes.XML; +import static org.apache.taverna.server.master.rest.TavernaServerREST.PathNames.POL; +import static org.apache.taverna.server.master.rest.TavernaServerREST.PathNames.POL_CAPABILITIES; +import static org.apache.taverna.server.master.rest.TavernaServerREST.PathNames.POL_NOTIFIERS; +import static org.apache.taverna.server.master.rest.TavernaServerREST.PathNames.POL_OP_LIMIT; +import static org.apache.taverna.server.master.rest.TavernaServerREST.PathNames.POL_PERM_LIST; +import static org.apache.taverna.server.master.rest.TavernaServerREST.PathNames.POL_PERM_WF; +import static org.apache.taverna.server.master.rest.TavernaServerREST.PathNames.POL_RUN_LIMIT; +import static org.apache.taverna.server.master.rest.TavernaServerREST.PathNames.ROOT; +import static org.apache.taverna.server.master.rest.TavernaServerREST.PathNames.RUNS; +import static org.apache.taverna.server.master.rest.handler.Scufl2DocumentHandler.SCUFL2; +import static org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW; import java.net.URI; import java.util.ArrayList; @@ -62,17 +62,17 @@ import javax.xml.bind.annotation.XmlValue; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; import org.apache.cxf.jaxrs.model.wadl.Description; -import org.taverna.server.master.common.Capability; -import org.taverna.server.master.common.RunReference; -import org.taverna.server.master.common.Uri; -import org.taverna.server.master.common.VersionedElement; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.common.version.Version; -import org.taverna.server.master.exceptions.NoCreateException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.exceptions.UnknownRunException; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.soap.TavernaServerSOAP; +import org.apache.taverna.server.master.common.Capability; +import org.apache.taverna.server.master.common.RunReference; +import org.apache.taverna.server.master.common.Uri; +import org.apache.taverna.server.master.common.VersionedElement; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.common.version.Version; +import org.apache.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.soap.TavernaServerSOAP; /** * The REST service interface to Taverna 3 Server. @@ -307,7 +307,7 @@ public interface TavernaServerREST { /** * Gets the maximum number of simultaneous - * {@linkplain org.taverna.server.master.common.Status.Operating + * {@linkplain org.apache.taverna.server.master.common.Status.Operating * operating} runs that the user may create. The <i>actual</i> number * they can start may be lower than this. If this number is lower than * the number they currently have, they will be unable to start any runs http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerRunREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerRunREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerRunREST.java index ef6ddd4..9a8fa22 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerRunREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerRunREST.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,34 +20,34 @@ package org.taverna.server.master.rest; import static javax.ws.rs.core.UriBuilder.fromUri; import static org.joda.time.format.ISODateTimeFormat.basicDateTime; -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.rest.handler.Scufl2DocumentHandler.SCUFL2; -import static org.taverna.server.master.interaction.InteractionFeedSupport.FEED_URL_DIR; -import static org.taverna.server.master.rest.ContentTypes.JSON; -import static org.taverna.server.master.rest.ContentTypes.ROBUNDLE; -import static org.taverna.server.master.rest.ContentTypes.TEXT; -import static org.taverna.server.master.rest.ContentTypes.XML; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.DIR; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.GENERATE_PROVENANCE; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.IN; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.LISTEN; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.LOG; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.NAME; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.OUT; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.PROFILE; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.ROOT; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.RUNBUNDLE; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.SEC; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.STATUS; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.STDERR; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.STDOUT; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.T_CREATE; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.T_EXPIRE; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.T_FINISH; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.T_START; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.USAGE; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.WF; -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW; +import static org.apache.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.rest.handler.Scufl2DocumentHandler.SCUFL2; +import static org.apache.taverna.server.master.interaction.InteractionFeedSupport.FEED_URL_DIR; +import static org.apache.taverna.server.master.rest.ContentTypes.JSON; +import static org.apache.taverna.server.master.rest.ContentTypes.ROBUNDLE; +import static org.apache.taverna.server.master.rest.ContentTypes.TEXT; +import static org.apache.taverna.server.master.rest.ContentTypes.XML; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.DIR; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.GENERATE_PROVENANCE; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.IN; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.LISTEN; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.LOG; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.NAME; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.OUT; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.PROFILE; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.ROOT; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.RUNBUNDLE; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.SEC; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.STATUS; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.STDERR; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.STDOUT; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.T_CREATE; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.T_EXPIRE; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.T_FINISH; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.T_START; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.USAGE; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.WF; +import static org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW; import java.net.URI; import java.util.ArrayList; @@ -76,21 +76,21 @@ import javax.xml.bind.annotation.XmlValue; import org.apache.cxf.jaxrs.model.wadl.Description; import org.joda.time.format.DateTimeFormatter; -import org.taverna.server.master.common.Namespaces; -import org.taverna.server.master.common.ProfileList; -import org.taverna.server.master.common.Status; -import org.taverna.server.master.common.Uri; -import org.taverna.server.master.common.VersionedElement; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.exceptions.BadStateChangeException; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.NoDirectoryEntryException; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.exceptions.NotOwnerException; -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.port_description.OutputDescription; +import org.apache.taverna.server.master.common.Namespaces; +import org.apache.taverna.server.master.common.ProfileList; +import org.apache.taverna.server.master.common.Status; +import org.apache.taverna.server.master.common.Uri; +import org.apache.taverna.server.master.common.VersionedElement; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.exceptions.BadStateChangeException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.NoDirectoryEntryException; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.exceptions.NotOwnerException; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.port_description.OutputDescription; /** * This represents how a Taverna Server workflow run looks to a RESTful API. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerSecurityREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerSecurityREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerSecurityREST.java index f5101e7..16c1359 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerSecurityREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/TavernaServerSecurityREST.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,20 +19,20 @@ package org.taverna.server.master.rest; */ import static java.util.Collections.emptyList; -import static org.taverna.server.master.common.Namespaces.SERVER; -import static org.taverna.server.master.common.Namespaces.XLINK; -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.rest.ContentTypes.JSON; -import static org.taverna.server.master.rest.ContentTypes.TEXT; -import static org.taverna.server.master.rest.ContentTypes.XML; -import static org.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.CREDS; -import static org.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.ONE_CRED; -import static org.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.ONE_PERM; -import static org.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.ONE_TRUST; -import static org.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.OWNER; -import static org.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.PERMS; -import static org.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.ROOT; -import static org.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.TRUSTS; +import static org.apache.taverna.server.master.common.Namespaces.SERVER; +import static org.apache.taverna.server.master.common.Namespaces.XLINK; +import static org.apache.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.rest.ContentTypes.JSON; +import static org.apache.taverna.server.master.rest.ContentTypes.TEXT; +import static org.apache.taverna.server.master.rest.ContentTypes.XML; +import static org.apache.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.CREDS; +import static org.apache.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.ONE_CRED; +import static org.apache.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.ONE_PERM; +import static org.apache.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.ONE_TRUST; +import static org.apache.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.OWNER; +import static org.apache.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.PERMS; +import static org.apache.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.ROOT; +import static org.apache.taverna.server.master.rest.TavernaServerSecurityREST.PathNames.TRUSTS; import java.net.URI; import java.util.ArrayList; @@ -64,14 +64,14 @@ import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import org.apache.cxf.jaxrs.model.wadl.Description; -import org.taverna.server.master.common.Credential; -import org.taverna.server.master.common.Permission; -import org.taverna.server.master.common.Trust; -import org.taverna.server.master.common.Uri; -import org.taverna.server.master.common.VersionedElement; -import org.taverna.server.master.exceptions.BadStateChangeException; -import org.taverna.server.master.exceptions.InvalidCredentialException; -import org.taverna.server.master.exceptions.NoCredentialException; +import org.apache.taverna.server.master.common.Credential; +import org.apache.taverna.server.master.common.Permission; +import org.apache.taverna.server.master.common.Trust; +import org.apache.taverna.server.master.common.Uri; +import org.apache.taverna.server.master.common.VersionedElement; +import org.apache.taverna.server.master.exceptions.BadStateChangeException; +import org.apache.taverna.server.master.exceptions.InvalidCredentialException; +import org.apache.taverna.server.master.exceptions.NoCredentialException; /** * Manages the security of the workflow run. In general, only the owner of a run http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/AccessDeniedHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/AccessDeniedHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/AccessDeniedHandler.java index 3418975..76e3bc5 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/AccessDeniedHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/AccessDeniedHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadInputPortNameHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadInputPortNameHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadInputPortNameHandler.java index a78693d..d147342 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadInputPortNameHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadInputPortNameHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.BadInputPortNameException; +import org.apache.taverna.server.master.exceptions.BadInputPortNameException; @Provider public class BadInputPortNameHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadPropertyValueHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadPropertyValueHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadPropertyValueHandler.java index e956749..bc8f0ea 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadPropertyValueHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadPropertyValueHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.BadPropertyValueException; +import org.apache.taverna.server.master.exceptions.BadPropertyValueException; @Provider public class BadPropertyValueHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadStateChangeHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadStateChangeHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadStateChangeHandler.java index 53f441b..1246c3b 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadStateChangeHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/BadStateChangeHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.BadStateChangeException; +import org.apache.taverna.server.master.exceptions.BadStateChangeException; @Provider public class BadStateChangeHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/EntryHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/EntryHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/EntryHandler.java index bc79c22..b852d87 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/EntryHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/EntryHandler.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FeedHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FeedHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FeedHandler.java index 77e7e49..5a31aed 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FeedHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FeedHandler.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileConcatenationHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileConcatenationHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileConcatenationHandler.java index e0924ad..c610b3b 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileConcatenationHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileConcatenationHandler.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,9 +26,9 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.FileConcatenation; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.interfaces.File; +import org.apache.taverna.server.master.FileConcatenation; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.interfaces.File; public class FileConcatenationHandler implements MessageBodyWriter<FileConcatenation> { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileMessageHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileMessageHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileMessageHandler.java index 7d2b381..0a5f114 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileMessageHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileMessageHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -32,8 +32,8 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; import org.apache.commons.logging.Log; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.interfaces.File; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.interfaces.File; /** * How to write out a File object with JAX-RS. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileSegmentHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileSegmentHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileSegmentHandler.java index 82d5e0a..0c780e0 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileSegmentHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FileSegmentHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,8 +31,8 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.rest.FileSegment; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.rest.FileSegment; /** * How to write out a segment of a file with JAX-RS. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FilesystemAccessHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FilesystemAccessHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FilesystemAccessHandler.java index cfa863c..e5e5bd3 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FilesystemAccessHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/FilesystemAccessHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; @Provider public class FilesystemAccessHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/GeneralFailureHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/GeneralFailureHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/GeneralFailureHandler.java index fe4ba0b..047d8aa 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/GeneralFailureHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/GeneralFailureHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,7 +23,7 @@ import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; -import org.taverna.server.master.exceptions.GeneralFailureException; +import org.apache.taverna.server.master.exceptions.GeneralFailureException; public class GeneralFailureHandler extends HandlerCore implements ExceptionMapper<GeneralFailureException> { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/HandlerCore.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/HandlerCore.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/HandlerCore.java index bc92154..553606f 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/HandlerCore.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/HandlerCore.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,7 +25,7 @@ import static org.apache.commons.logging.LogFactory.getLog; import javax.ws.rs.core.Response; import org.apache.commons.logging.Log; -import org.taverna.server.master.api.ManagementModel; +import org.apache.taverna.server.master.api.ManagementModel; /** * Base class for handlers that grants Spring-enabled access to the management http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/IllegalArgumentHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/IllegalArgumentHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/IllegalArgumentHandler.java index d7ec8f4..8857696 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/IllegalArgumentHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/IllegalArgumentHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/ImplementationProblemHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/ImplementationProblemHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/ImplementationProblemHandler.java index 806fc67..bee3033 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/ImplementationProblemHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/ImplementationProblemHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,7 +23,7 @@ import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; -import org.taverna.server.localworker.remote.ImplementationException; +import org.apache.taverna.server.localworker.remote.ImplementationException; public class ImplementationProblemHandler extends HandlerCore implements ExceptionMapper<ImplementationException> { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/InputStreamMessageHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/InputStreamMessageHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/InputStreamMessageHandler.java index 6b4470b..b082257 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/InputStreamMessageHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/InputStreamMessageHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/InvalidCredentialHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/InvalidCredentialHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/InvalidCredentialHandler.java index 7208aa4..54cf970 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/InvalidCredentialHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/InvalidCredentialHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.InvalidCredentialException; +import org.apache.taverna.server.master.exceptions.InvalidCredentialException; @Provider public class InvalidCredentialHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/JAXBExceptionHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/JAXBExceptionHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/JAXBExceptionHandler.java index cf5952e..504b901 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/JAXBExceptionHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/JAXBExceptionHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NegotiationFailedHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NegotiationFailedHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NegotiationFailedHandler.java index 00457fe..be05167 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NegotiationFailedHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NegotiationFailedHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,7 +25,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.rest.TavernaServerDirectoryREST.NegotiationFailedException; +import org.apache.taverna.server.master.rest.TavernaServerDirectoryREST.NegotiationFailedException; @Provider public class NegotiationFailedHandler implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoCreateHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoCreateHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoCreateHandler.java index f20f876..d6cc083 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoCreateHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoCreateHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.exceptions.NoCreateException; @Provider public class NoCreateHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoCredentialHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoCredentialHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoCredentialHandler.java index 6644901..b6260ac 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoCredentialHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoCredentialHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,7 +23,7 @@ import static javax.ws.rs.core.Response.Status.NOT_FOUND; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; -import org.taverna.server.master.exceptions.NoCredentialException; +import org.apache.taverna.server.master.exceptions.NoCredentialException; public class NoCredentialHandler extends HandlerCore implements ExceptionMapper<NoCredentialException> { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoDestroyHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoDestroyHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoDestroyHandler.java index 2c0f5a9..fcd980a 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoDestroyHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoDestroyHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.NoDestroyException; +import org.apache.taverna.server.master.exceptions.NoDestroyException; @Provider public class NoDestroyHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoDirectoryEntryHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoDirectoryEntryHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoDirectoryEntryHandler.java index 2f72487..8e4d352 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoDirectoryEntryHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoDirectoryEntryHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.NoDirectoryEntryException; +import org.apache.taverna.server.master.exceptions.NoDirectoryEntryException; @Provider public class NoDirectoryEntryHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoListenerHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoListenerHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoListenerHandler.java index e119b60..ad7fa90 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoListenerHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoListenerHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.exceptions.NoListenerException; @Provider public class NoListenerHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoUpdateHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoUpdateHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoUpdateHandler.java index 2d5dde3..17c1475 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoUpdateHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NoUpdateHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; @Provider public class NoUpdateHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NotOwnerHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NotOwnerHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NotOwnerHandler.java index baeb6aa..ab90ebc 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NotOwnerHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/NotOwnerHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,7 +23,7 @@ import static javax.ws.rs.core.Response.Status.FORBIDDEN; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; -import org.taverna.server.master.exceptions.NotOwnerException; +import org.apache.taverna.server.master.exceptions.NotOwnerException; public class NotOwnerHandler extends HandlerCore implements ExceptionMapper<NotOwnerException> { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/OverloadedHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/OverloadedHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/OverloadedHandler.java index 9e142f3..951776f 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/OverloadedHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/OverloadedHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,7 +23,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.OverloadedException; +import org.apache.taverna.server.master.exceptions.OverloadedException; @Provider public class OverloadedHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/PermissionHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/PermissionHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/PermissionHandler.java index d7a4afc..54cee43 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/PermissionHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/PermissionHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -34,7 +34,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; -import org.taverna.server.master.common.Permission; +import org.apache.taverna.server.master.common.Permission; /** * Handler that allows CXF to send and receive {@linkplain Permission http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/Scufl2DocumentHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/Scufl2DocumentHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/Scufl2DocumentHandler.java index cf1ccdf..a050c0e 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/Scufl2DocumentHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/Scufl2DocumentHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,7 +31,7 @@ import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.common.Workflow; import org.apache.taverna.scufl2.api.io.ReaderException; import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/T2FlowDocumentHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/T2FlowDocumentHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/T2FlowDocumentHandler.java index 1f6d328..2952ee1 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/T2FlowDocumentHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/T2FlowDocumentHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -39,7 +39,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.common.Workflow; import org.w3c.dom.Document; import org.xml.sax.SAXException; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/URIListHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/URIListHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/URIListHandler.java index 453ac73..0452074 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/URIListHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/URIListHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,7 +19,7 @@ package org.taverna.server.master.rest.handler; */ import static javax.ws.rs.core.Response.status; -import static org.taverna.server.master.rest.handler.URIListHandler.URI_LIST; +import static org.apache.taverna.server.master.rest.handler.URIListHandler.URI_LIST; import java.io.BufferedReader; import java.io.BufferedWriter; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/UnknownRunHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/UnknownRunHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/UnknownRunHandler.java index 4d5c6e8..6751339 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/UnknownRunHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/UnknownRunHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.exceptions.UnknownRunException; @Provider public class UnknownRunHandler extends HandlerCore implements http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/ZipStreamHandler.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/ZipStreamHandler.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/ZipStreamHandler.java index 69e526d..ca7a092 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/ZipStreamHandler.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/ZipStreamHandler.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,7 +19,7 @@ package org.taverna.server.master.rest.handler; */ import static org.apache.commons.io.IOUtils.copy; -import static org.taverna.server.master.api.ContentTypes.APPLICATION_ZIP_TYPE; +import static org.apache.taverna.server.master.api.ContentTypes.APPLICATION_ZIP_TYPE; import java.io.IOException; import java.io.OutputStream; @@ -33,7 +33,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import org.taverna.server.master.interfaces.Directory.ZipStream; +import org.apache.taverna.server.master.interfaces.Directory.ZipStream; /** * How to write a ZIP file as the result entity of a request. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/package-info.java index 8404ead..0ed4b8d 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/handler/package-info.java @@ -12,7 +12,7 @@ @XmlNs(prefix = "port", namespaceURI = DATA), @XmlNs(prefix = "feed", namespaceURI = FEED), @XmlNs(prefix = "admin", namespaceURI = ADMIN) }) -package org.taverna.server.master.rest.handler; +package org.apache.taverna.server.master.rest.handler; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,13 +31,13 @@ package org.taverna.server.master.rest.handler; */ import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED; -import static org.taverna.server.master.common.Namespaces.ADMIN; -import static org.taverna.server.master.common.Namespaces.FEED; -import static org.taverna.server.master.common.Namespaces.SERVER; -import static org.taverna.server.master.common.Namespaces.SERVER_REST; -import static org.taverna.server.master.common.Namespaces.SERVER_SOAP; -import static org.taverna.server.master.common.Namespaces.XLINK; -import static org.taverna.server.port_description.Namespaces.DATA; +import static org.apache.taverna.server.master.common.Namespaces.ADMIN; +import static org.apache.taverna.server.master.common.Namespaces.FEED; +import static org.apache.taverna.server.master.common.Namespaces.SERVER; +import static org.apache.taverna.server.master.common.Namespaces.SERVER_REST; +import static org.apache.taverna.server.master.common.Namespaces.SERVER_SOAP; +import static org.apache.taverna.server.master.common.Namespaces.XLINK; +import static org.apache.taverna.server.port_description.Namespaces.DATA; import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlSchema; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/package-info.java index d35dc7b..7397d81 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/rest/package-info.java @@ -12,7 +12,7 @@ @XmlNs(prefix = "port", namespaceURI = DATA), @XmlNs(prefix = "feed", namespaceURI = FEED), @XmlNs(prefix = "admin", namespaceURI = ADMIN) }) -package org.taverna.server.master.rest; +package org.apache.taverna.server.master.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,13 +31,13 @@ package org.taverna.server.master.rest; */ import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED; -import static org.taverna.server.master.common.Namespaces.ADMIN; -import static org.taverna.server.master.common.Namespaces.FEED; -import static org.taverna.server.master.common.Namespaces.SERVER; -import static org.taverna.server.master.common.Namespaces.SERVER_REST; -import static org.taverna.server.master.common.Namespaces.SERVER_SOAP; -import static org.taverna.server.master.common.Namespaces.XLINK; -import static org.taverna.server.port_description.Namespaces.DATA; +import static org.apache.taverna.server.master.common.Namespaces.ADMIN; +import static org.apache.taverna.server.master.common.Namespaces.FEED; +import static org.apache.taverna.server.master.common.Namespaces.SERVER; +import static org.apache.taverna.server.master.common.Namespaces.SERVER_REST; +import static org.apache.taverna.server.master.common.Namespaces.SERVER_SOAP; +import static org.apache.taverna.server.master.common.Namespaces.XLINK; +import static org.apache.taverna.server.port_description.Namespaces.DATA; import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlSchema; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/DirEntry.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/DirEntry.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/DirEntry.java index 752c6b1..70744c9 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/DirEntry.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/DirEntry.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.soap; +package org.apache.taverna.server.master.soap; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,7 +18,7 @@ package org.taverna.server.master.soap; * limitations under the License. */ -import static org.taverna.server.master.common.Namespaces.XLINK; +import static org.apache.taverna.server.master.common.Namespaces.XLINK; import java.net.URI; @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; -import org.taverna.server.master.common.DirEntryReference; +import org.apache.taverna.server.master.common.DirEntryReference; /** * A more Taverna-friendly version of the directory entry descriptor classes.
