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/FileContents.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/FileContents.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/FileContents.java index fa9978b..179483b 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/FileContents.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/FileContents.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 @@ -31,8 +31,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlMimeType; import javax.xml.bind.annotation.XmlType; -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; /** * An MTOM-capable description of how to transfer the contents of a file.
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/PermissionList.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/PermissionList.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/PermissionList.java index 6568ab2..05c069c 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/PermissionList.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/PermissionList.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 @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.taverna.server.master.common.Permission; +import org.apache.taverna.server.master.common.Permission; /** * The list of permissions to access a workflow run of users <i>other than the 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/TavernaServerSOAP.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/TavernaServerSOAP.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/TavernaServerSOAP.java index f41539c..6d70fe1 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/TavernaServerSOAP.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/TavernaServerSOAP.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,8 +18,8 @@ package org.taverna.server.master.soap; * limitations under the License. */ -import static org.taverna.server.master.common.Namespaces.SERVER_SOAP; -import static org.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.common.Namespaces.SERVER_SOAP; +import static org.apache.taverna.server.master.common.Roles.USER; import java.net.URI; import java.util.Date; @@ -34,30 +34,30 @@ import javax.xml.bind.annotation.XmlElement; import org.apache.cxf.annotations.WSDLDocumentation; import org.apache.taverna.server.usagerecord.JobUsageRecord; -import org.taverna.server.master.common.Capability; -import org.taverna.server.master.common.Credential; -import org.taverna.server.master.common.DirEntryReference; -import org.taverna.server.master.common.InputDescription; -import org.taverna.server.master.common.Permission; -import org.taverna.server.master.common.ProfileList; -import org.taverna.server.master.common.RunReference; -import org.taverna.server.master.common.Status; -import org.taverna.server.master.common.Trust; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.common.version.Version; -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.InvalidCredentialException; -import org.taverna.server.master.exceptions.NoCreateException; -import org.taverna.server.master.exceptions.NoCredentialException; -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.exceptions.UnknownRunException; -import org.taverna.server.master.rest.TavernaServerREST; -import org.taverna.server.port_description.OutputDescription; +import org.apache.taverna.server.master.common.Capability; +import org.apache.taverna.server.master.common.Credential; +import org.apache.taverna.server.master.common.DirEntryReference; +import org.apache.taverna.server.master.common.InputDescription; +import org.apache.taverna.server.master.common.Permission; +import org.apache.taverna.server.master.common.ProfileList; +import org.apache.taverna.server.master.common.RunReference; +import org.apache.taverna.server.master.common.Status; +import org.apache.taverna.server.master.common.Trust; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.common.version.Version; +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.InvalidCredentialException; +import org.apache.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.exceptions.NoCredentialException; +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.exceptions.UnknownRunException; +import org.apache.taverna.server.master.rest.TavernaServerREST; +import org.apache.taverna.server.port_description.OutputDescription; /** * The SOAP service interface to Taverna 3 Server. @@ -309,7 +309,7 @@ public interface TavernaServerSOAP { */ @WebResult(name = "RunInputDescriptor") @WSDLDocumentation("Get a description of what inputs the given workflow run expects to receive.") - org.taverna.server.port_description.InputDescription getRunInputDescriptor( + org.apache.taverna.server.port_description.InputDescription getRunInputDescriptor( @WebParam(name = "runName") @XmlElement(required = true) String runName) throws UnknownRunException; 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/WrappedWorkflow.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/WrappedWorkflow.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/WrappedWorkflow.java index 745876d..5639531 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/WrappedWorkflow.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/WrappedWorkflow.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 @@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlMimeType; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; -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/soap/ZippedDirectory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/ZippedDirectory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/ZippedDirectory.java index 5b2d261..6bd593f 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/ZippedDirectory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/ZippedDirectory.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.api.ContentTypes.APPLICATION_ZIP_TYPE; +import static org.apache.taverna.server.master.api.ContentTypes.APPLICATION_ZIP_TYPE; import java.io.IOException; import java.io.InputStream; @@ -31,8 +31,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlMimeType; import javax.xml.bind.annotation.XmlType; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.interfaces.Directory; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.interfaces.Directory; /** * An MTOM-capable description of how to transfer the zipped contents of a 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/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/package-info.java index cd753b7..7187129 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/soap/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.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 @@ -31,13 +31,13 @@ package org.taverna.server.master.soap; */ 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/usage/UsageRecord.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/UsageRecord.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/UsageRecord.java index b1f0602..07e61d6 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/UsageRecord.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/UsageRecord.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.usage; +package org.apache.taverna.server.master.usage; /* * 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/usage/UsageRecordRecorder.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/UsageRecordRecorder.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/UsageRecordRecorder.java index 18aeb3b..0acb052 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/UsageRecordRecorder.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/UsageRecordRecorder.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.usage; +package org.apache.taverna.server.master.usage; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -32,9 +32,9 @@ import javax.xml.bind.JAXBException; import org.apache.commons.logging.Log; import org.apache.taverna.server.usagerecord.JobUsageRecord; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.api.ManagementModel; -import org.taverna.server.master.utils.Contextualizer; -import org.taverna.server.master.utils.JDOSupport; +import org.apache.taverna.server.master.api.ManagementModel; +import org.apache.taverna.server.master.utils.Contextualizer; +import org.apache.taverna.server.master.utils.JDOSupport; /** * A simple state-aware writer of usage records. It just appends them, one by http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/package-info.java index a7fe733..fa3f9d7 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/usage/package-info.java @@ -3,7 +3,7 @@ /** * Resource usage recording mechanism. */ -package org.taverna.server.master.usage; +package org.apache.taverna.server.master.usage; /* * 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/utils/CallTimeLogger.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CallTimeLogger.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CallTimeLogger.java index 4452935..724a1d9 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CallTimeLogger.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CallTimeLogger.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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 java.lang.System.nanoTime; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.TavernaServer.JMX_ROOT; +import static org.apache.taverna.server.master.TavernaServer.JMX_ROOT; import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -35,7 +35,7 @@ import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedResource; -import org.taverna.server.master.common.version.Version; +import org.apache.taverna.server.master.common.version.Version; /** * This class is responsible for timing all invocations of publicly-exposed @@ -73,7 +73,7 @@ public class CallTimeLogger { * If anything goes wrong with the wrapped call. * @see System#nanoTime() */ - @Around("@annotation(org.taverna.server.master.utils.CallTimeLogger.PerfLogged)") + @Around("@annotation(org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged)") public Object time(ProceedingJoinPoint call) throws Throwable { long fore = nanoTime(); try { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CallTimingFilter.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CallTimingFilter.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CallTimingFilter.java index d8ad78d..1d5942b 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CallTimingFilter.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CallTimingFilter.java @@ -1,7 +1,7 @@ /** * */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/CapabilityLister.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CapabilityLister.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CapabilityLister.java index 1387e05..1d01518 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CapabilityLister.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CapabilityLister.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,7 +26,7 @@ import java.util.Properties; import javax.annotation.PostConstruct; -import org.taverna.server.master.common.Capability; +import org.apache.taverna.server.master.common.Capability; /** * Utility for listing the capabilities supported by this Taverna Server http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CertificateChainFetcher.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CertificateChainFetcher.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CertificateChainFetcher.java index 76ef017..ff21e82 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CertificateChainFetcher.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/CertificateChainFetcher.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/Contextualizer.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/Contextualizer.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/Contextualizer.java index e0ee4d1..7e465dc 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/Contextualizer.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/Contextualizer.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,7 +22,7 @@ import javax.servlet.ServletContext; import javax.ws.rs.core.UriInfo; import org.springframework.web.context.ServletContextAware; -import org.taverna.server.master.common.version.Version; +import org.apache.taverna.server.master.common.version.Version; /** * Convert a string (URL, etc) to a version that is contextualized to the http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/DerbyUtils.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/DerbyUtils.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/DerbyUtils.java index e4be90b..eec5475 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/DerbyUtils.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/DerbyUtils.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/FilenameUtils.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/FilenameUtils.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/FilenameUtils.java index 3c39326..848217e 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/FilenameUtils.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/FilenameUtils.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,13 +22,13 @@ import java.util.List; import javax.ws.rs.core.PathSegment; -import org.taverna.server.master.common.DirEntryReference; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.NoDirectoryEntryException; -import org.taverna.server.master.interfaces.Directory; -import org.taverna.server.master.interfaces.DirectoryEntry; -import org.taverna.server.master.interfaces.File; -import org.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.common.DirEntryReference; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.NoDirectoryEntryException; +import org.apache.taverna.server.master.interfaces.Directory; +import org.apache.taverna.server.master.interfaces.DirectoryEntry; +import org.apache.taverna.server.master.interfaces.File; +import org.apache.taverna.server.master.interfaces.TavernaRun; /** * Utility functions for getting entries from directories. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/FlushThreadLocalCacheInterceptor.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/FlushThreadLocalCacheInterceptor.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/FlushThreadLocalCacheInterceptor.java index 7f5f92a..3a5ef0f 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/FlushThreadLocalCacheInterceptor.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/FlushThreadLocalCacheInterceptor.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/InvocationCounter.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/InvocationCounter.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/InvocationCounter.java index 0600857..3420a27 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/InvocationCounter.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/InvocationCounter.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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 org.aspectj.lang.annotation.Before; public class InvocationCounter { private int count; - @Before("@annotation(org.taverna.server.master.utils.InvocationCounter.CallCounted)") + @Before("@annotation(org.apache.taverna.server.master.utils.InvocationCounter.CallCounted)") public synchronized void count() { count++; } http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/JCECheck.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/JCECheck.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/JCECheck.java index 7f248ff..ccd2dc3 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/JCECheck.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/JCECheck.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/JDOSupport.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/JDOSupport.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/JDOSupport.java index 96f6a11..5e3ed61 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/JDOSupport.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/JDOSupport.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -187,7 +187,7 @@ public abstract class JDOSupport<T> { private Log log = getLog("Taverna.Server.Utils"); private volatile int txid; - @Around(value = "@annotation(org.taverna.server.master.utils.JDOSupport.WithinSingleTransaction) && target(support)", argNames = "support") + @Around(value = "@annotation(org.apache.taverna.server.master.utils.JDOSupport.WithinSingleTransaction) && target(support)", argNames = "support") Object applyTransaction(ProceedingJoinPoint pjp, JDOSupport<?> support) throws Throwable { synchronized (lock) { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/LoggingDerbyAdapter.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/LoggingDerbyAdapter.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/LoggingDerbyAdapter.java index 8bd0506..75564d4 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/LoggingDerbyAdapter.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/LoggingDerbyAdapter.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/OneShotThread.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/OneShotThread.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/OneShotThread.java index 32cca5a..a025aa5 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/OneShotThread.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/OneShotThread.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/RestUtils.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/RestUtils.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/RestUtils.java index d69612e..c68ecc9 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/RestUtils.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/RestUtils.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/RuntimeExceptionWrapper.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/RuntimeExceptionWrapper.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/RuntimeExceptionWrapper.java index 333febe..093d2d8 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/RuntimeExceptionWrapper.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/RuntimeExceptionWrapper.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,7 +20,7 @@ package org.taverna.server.master.utils; import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; -import org.taverna.server.master.exceptions.GeneralFailureException; +import org.apache.taverna.server.master.exceptions.GeneralFailureException; /** * Aspect used to convert {@linkplain RuntimeException runtime exceptions} into @@ -39,7 +39,7 @@ public class RuntimeExceptionWrapper { * @throws GeneralFailureException * The known exception type that it is mapped to. */ - @AfterThrowing(pointcut = "execution(* org.taverna.server.master.rest..*(..)) && !bean(*Provider.*)", throwing = "exn") + @AfterThrowing(pointcut = "execution(* org.apache.taverna.server.master.rest..*(..)) && !bean(*Provider.*)", throwing = "exn") public void wrapRuntimeException(RuntimeException exn) throws GeneralFailureException { // Exclude security-related exceptions http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/UsernamePrincipal.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/UsernamePrincipal.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/UsernamePrincipal.java index 25cf64f..541917a 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/UsernamePrincipal.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/UsernamePrincipal.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/WSDLHeadOptionsInterceptor.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/WSDLHeadOptionsInterceptor.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/WSDLHeadOptionsInterceptor.java index 1bd2a95..2ace683 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/WSDLHeadOptionsInterceptor.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/WSDLHeadOptionsInterceptor.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/WebappAwareDataSource.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/WebappAwareDataSource.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/WebappAwareDataSource.java index 24246b5..15b7929 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/WebappAwareDataSource.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/WebappAwareDataSource.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,7 +21,7 @@ package org.taverna.server.master.utils; import static java.lang.Thread.currentThread; import static java.sql.DriverManager.deregisterDriver; import static java.sql.DriverManager.getDrivers; -import static org.taverna.server.master.utils.Contextualizer.ROOT_PLACEHOLDER; +import static org.apache.taverna.server.master.utils.Contextualizer.ROOT_PLACEHOLDER; import java.io.PrintWriter; import java.sql.Connection; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/X500Utils.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/X500Utils.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/X500Utils.java index d258079..0a52262 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/X500Utils.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/X500Utils.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/utils/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/package-info.java index 64a9f68..05ddd60 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/utils/package-info.java @@ -4,7 +4,7 @@ * Miscellaneous utility classes. Includes aspects that might be attached * for purposes such as transaction management and invocation tracking. */ -package org.taverna.server.master.utils; +package org.apache.taverna.server.master.utils; /* * 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/worker/CompletionNotifier.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/CompletionNotifier.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/CompletionNotifier.java index 1868f94..d13f09e 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/CompletionNotifier.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/CompletionNotifier.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * 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/worker/FactoryBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/FactoryBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/FactoryBean.java index d38f0cc..a9556df 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/FactoryBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/FactoryBean.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * 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.worker; * limitations under the License. */ -import org.taverna.server.master.notification.atom.EventDAO; +import org.apache.taverna.server.master.notification.atom.EventDAO; /** * What the remote run really needs of its factory. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PasswordIssuer.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PasswordIssuer.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PasswordIssuer.java index 649db64..99b1ee1 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PasswordIssuer.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PasswordIssuer.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * 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/worker/PolicyImpl.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PolicyImpl.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PolicyImpl.java index 37d5760..3312499 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PolicyImpl.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PolicyImpl.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * 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.worker; * limitations under the License. */ -import static org.taverna.server.master.identity.WorkflowInternalAuthProvider.PREFIX; +import static org.apache.taverna.server.master.identity.WorkflowInternalAuthProvider.PREFIX; import java.net.URI; import java.util.List; @@ -29,15 +29,15 @@ import org.springframework.beans.factory.annotation.Required; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; -import org.taverna.server.master.common.Roles; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.exceptions.NoCreateException; -import org.taverna.server.master.exceptions.NoDestroyException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.interfaces.Policy; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.TavernaSecurityContext; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.common.Roles; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.exceptions.NoDestroyException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.interfaces.Policy; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.TavernaSecurityContext; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * Basic policy implementation that allows any workflow to be instantiated by http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PolicyLimits.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PolicyLimits.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PolicyLimits.java index 43c0aa4..a6134aa 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PolicyLimits.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/PolicyLimits.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,7 +21,7 @@ package org.taverna.server.master.worker; import java.net.URI; import java.util.List; -import org.taverna.server.master.common.Status; +import org.apache.taverna.server.master.common.Status; /** * The worker policy delegates certain limits to the state model of the http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RemoteRunDelegate.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RemoteRunDelegate.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RemoteRunDelegate.java index fb1ac47..6a8c63e 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RemoteRunDelegate.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RemoteRunDelegate.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,8 +25,8 @@ import static java.util.Collections.unmodifiableSet; import static java.util.UUID.randomUUID; import static org.apache.commons.io.IOUtils.closeQuietly; import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.worker.RemoteRunDelegate.checkBadFilename; -import static org.taverna.server.master.worker.RunConnection.NAME_LENGTH; +import static org.apache.taverna.server.master.worker.RemoteRunDelegate.checkBadFilename; +import static org.apache.taverna.server.master.worker.RunConnection.NAME_LENGTH; import java.io.IOException; import java.io.ObjectInputStream; @@ -52,33 +52,33 @@ import java.util.zip.ZipOutputStream; import javax.annotation.Nonnull; import org.apache.commons.logging.Log; -import org.taverna.server.localworker.remote.IllegalStateTransitionException; -import org.taverna.server.localworker.remote.ImplementationException; -import org.taverna.server.localworker.remote.RemoteDirectory; -import org.taverna.server.localworker.remote.RemoteDirectoryEntry; -import org.taverna.server.localworker.remote.RemoteFile; -import org.taverna.server.localworker.remote.RemoteInput; -import org.taverna.server.localworker.remote.RemoteListener; -import org.taverna.server.localworker.remote.RemoteSingleRun; -import org.taverna.server.localworker.remote.RemoteStatus; -import org.taverna.server.localworker.remote.StillWorkingOnItException; -import org.taverna.server.master.common.Status; -import org.taverna.server.master.common.Workflow; -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.NoListenerException; -import org.taverna.server.master.exceptions.OverloadedException; -import org.taverna.server.master.exceptions.UnknownRunException; -import org.taverna.server.master.interfaces.Directory; -import org.taverna.server.master.interfaces.DirectoryEntry; -import org.taverna.server.master.interfaces.File; -import org.taverna.server.master.interfaces.Input; -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.SecurityContextFactory; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.TavernaSecurityContext; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.localworker.remote.IllegalStateTransitionException; +import org.apache.taverna.server.localworker.remote.ImplementationException; +import org.apache.taverna.server.localworker.remote.RemoteDirectory; +import org.apache.taverna.server.localworker.remote.RemoteDirectoryEntry; +import org.apache.taverna.server.localworker.remote.RemoteFile; +import org.apache.taverna.server.localworker.remote.RemoteInput; +import org.apache.taverna.server.localworker.remote.RemoteListener; +import org.apache.taverna.server.localworker.remote.RemoteSingleRun; +import org.apache.taverna.server.localworker.remote.RemoteStatus; +import org.apache.taverna.server.localworker.remote.StillWorkingOnItException; +import org.apache.taverna.server.master.common.Status; +import org.apache.taverna.server.master.common.Workflow; +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.NoListenerException; +import org.apache.taverna.server.master.exceptions.OverloadedException; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.interfaces.Directory; +import org.apache.taverna.server.master.interfaces.DirectoryEntry; +import org.apache.taverna.server.master.interfaces.File; +import org.apache.taverna.server.master.interfaces.Input; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.SecurityContextFactory; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.TavernaSecurityContext; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * Bridging shim between the WebApp world and the RMI world. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunConnection.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunConnection.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunConnection.java index 0c2b1a9..dce0284 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunConnection.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunConnection.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * 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.worker; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -import static org.taverna.server.master.worker.RunConnection.COUNT_QUERY; -import static org.taverna.server.master.worker.RunConnection.NAMES_QUERY; -import static org.taverna.server.master.worker.RunConnection.SCHEMA; -import static org.taverna.server.master.worker.RunConnection.TABLE; -import static org.taverna.server.master.worker.RunConnection.TIMEOUT_QUERY; -import static org.taverna.server.master.worker.RunConnection.UNTERMINATED_QUERY; +import static org.apache.taverna.server.master.worker.RunConnection.COUNT_QUERY; +import static org.apache.taverna.server.master.worker.RunConnection.NAMES_QUERY; +import static org.apache.taverna.server.master.worker.RunConnection.SCHEMA; +import static org.apache.taverna.server.master.worker.RunConnection.TABLE; +import static org.apache.taverna.server.master.worker.RunConnection.TIMEOUT_QUERY; +import static org.apache.taverna.server.master.worker.RunConnection.UNTERMINATED_QUERY; import java.io.IOException; import java.rmi.MarshalledObject; @@ -42,12 +42,12 @@ import javax.jdo.annotations.PrimaryKey; import javax.jdo.annotations.Queries; import javax.jdo.annotations.Query; -import org.taverna.server.localworker.remote.RemoteSingleRun; -import org.taverna.server.master.common.Credential; -import org.taverna.server.master.common.Trust; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.interfaces.SecurityContextFactory; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.localworker.remote.RemoteSingleRun; +import org.apache.taverna.server.master.common.Credential; +import org.apache.taverna.server.master.common.Trust; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.interfaces.SecurityContextFactory; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * The representation of the connections to the runs that actually participates @@ -228,7 +228,7 @@ public class RunConnection { run = new MarshalledObject<>(rrd.run); securityContextFactory = rrd.getSecurityContext().getFactory(); owner = rrd.getSecurityContext().getOwner().getName(); - securityToken = ((org.taverna.server.master.worker.SecurityContextFactory) securityContextFactory) + securityToken = ((org.apache.taverna.server.master.worker.SecurityContextFactory) securityContextFactory) .issueNewPassword(); } // Properties that are set multiple times http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDBSupport.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDBSupport.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDBSupport.java index 5fa96b8..9cbe5b4 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDBSupport.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDBSupport.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * 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 java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.taverna.server.master.notification.NotificationEngine; +import org.apache.taverna.server.master.notification.NotificationEngine; /** * The interface to the database of 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/worker/RunDatabase.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDatabase.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDatabase.java index 65aec70..b9470a2 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDatabase.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDatabase.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -36,15 +36,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.common.Status; -import org.taverna.server.master.exceptions.UnknownRunException; -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.Policy; -import org.taverna.server.master.interfaces.RunStore; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.notification.NotificationEngine; -import org.taverna.server.master.notification.NotificationEngine.Message; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.common.Status; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.Policy; +import org.apache.taverna.server.master.interfaces.RunStore; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.notification.NotificationEngine; +import org.apache.taverna.server.master.notification.NotificationEngine.Message; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * The main facade bean that interfaces to the database of 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/worker/RunDatabaseDAO.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDatabaseDAO.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDatabaseDAO.java index 1c75d22..c7e0de6 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDatabaseDAO.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunDatabaseDAO.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * 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.worker; * limitations under the License. */ -import static org.taverna.server.master.worker.RunConnection.toDBform; +import static org.apache.taverna.server.master.worker.RunConnection.toDBform; import java.io.IOException; import java.util.ArrayList; @@ -35,11 +35,11 @@ import javax.jdo.annotations.PersistenceAware; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.interfaces.Policy; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.JDOSupport; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.interfaces.Policy; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.JDOSupport; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * This handles storing runs, interfacing with the underlying state engine as http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunFactoryConfiguration.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunFactoryConfiguration.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunFactoryConfiguration.java index 642a6d6..c60bc94 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunFactoryConfiguration.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/RunFactoryConfiguration.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * 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.worker; import static org.springframework.jmx.support.MetricType.COUNTER; import static org.springframework.jmx.support.MetricType.GAUGE; -import static org.taverna.server.master.TavernaServer.JMX_ROOT; +import static org.apache.taverna.server.master.TavernaServer.JMX_ROOT; import java.util.List; @@ -33,8 +33,8 @@ import org.springframework.core.annotation.Order; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedMetric; import org.springframework.jmx.export.annotation.ManagedResource; -import org.taverna.server.master.factories.ConfigurableRunFactory; -import org.taverna.server.master.localworker.LocalWorkerState; +import org.apache.taverna.server.master.factories.ConfigurableRunFactory; +import org.apache.taverna.server.master.localworker.LocalWorkerState; @ManagedResource(objectName = JMX_ROOT + "Factory", description = "The factory for runs.") public abstract class RunFactoryConfiguration implements ConfigurableRunFactory { @@ -386,7 +386,7 @@ public abstract class RunFactoryConfiguration implements ConfigurableRunFactory /** * @return A count of the number of runs believed to actually be in the - * {@linkplain uk.org.taverna.server.master.common.Status#Operating + * {@linkplain uk.org.apache.taverna.server.master.common.Status#Operating * operating} state. * @throws Exception * If anything goes wrong. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextDelegate.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextDelegate.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextDelegate.java index bb76f85..e331d3f 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextDelegate.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextDelegate.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,10 +21,10 @@ package org.taverna.server.master.worker; import static java.lang.String.format; import static java.util.Arrays.fill; import static java.util.UUID.randomUUID; -import static org.taverna.server.master.defaults.Default.CERTIFICATE_FIELD_NAMES; -import static org.taverna.server.master.defaults.Default.CERTIFICATE_TYPE; -import static org.taverna.server.master.defaults.Default.CREDENTIAL_FILE_SIZE_LIMIT; -import static org.taverna.server.master.identity.WorkflowInternalAuthProvider.PREFIX; +import static org.apache.taverna.server.master.defaults.Default.CERTIFICATE_FIELD_NAMES; +import static org.apache.taverna.server.master.defaults.Default.CERTIFICATE_TYPE; +import static org.apache.taverna.server.master.defaults.Default.CREDENTIAL_FILE_SIZE_LIMIT; +import static org.apache.taverna.server.master.identity.WorkflowInternalAuthProvider.PREFIX; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -56,16 +56,16 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; -import org.taverna.server.localworker.remote.ImplementationException; -import org.taverna.server.localworker.remote.RemoteSecurityContext; -import org.taverna.server.master.common.Credential; -import org.taverna.server.master.common.Trust; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.InvalidCredentialException; -import org.taverna.server.master.exceptions.NoDirectoryEntryException; -import org.taverna.server.master.interfaces.File; -import org.taverna.server.master.interfaces.TavernaSecurityContext; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.localworker.remote.ImplementationException; +import org.apache.taverna.server.localworker.remote.RemoteSecurityContext; +import org.apache.taverna.server.master.common.Credential; +import org.apache.taverna.server.master.common.Trust; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.InvalidCredentialException; +import org.apache.taverna.server.master.exceptions.NoDirectoryEntryException; +import org.apache.taverna.server.master.interfaces.File; +import org.apache.taverna.server.master.interfaces.TavernaSecurityContext; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * Implementation of a security context. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextDelegateImpl.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextDelegateImpl.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextDelegateImpl.java index ef29b55..b413eea 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextDelegateImpl.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextDelegateImpl.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -43,11 +43,11 @@ import javax.xml.ws.handler.MessageContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.taverna.server.localworker.remote.RemoteSecurityContext; -import org.taverna.server.master.common.Credential; -import org.taverna.server.master.exceptions.InvalidCredentialException; -import org.taverna.server.master.utils.UsernamePrincipal; -import org.taverna.server.master.utils.X500Utils; +import org.apache.taverna.server.localworker.remote.RemoteSecurityContext; +import org.apache.taverna.server.master.common.Credential; +import org.apache.taverna.server.master.exceptions.InvalidCredentialException; +import org.apache.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.utils.X500Utils; /** * Factoring out of the part of the security context handling that actually http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextFactory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextFactory.java index 1d485d8..9bc3634 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextFactory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SecurityContextFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -33,12 +33,12 @@ import org.apache.commons.logging.Log; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.springframework.beans.factory.annotation.Required; import org.springframework.beans.factory.annotation.Value; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.UriBuilderFactory; -import org.taverna.server.master.utils.CertificateChainFetcher; -import org.taverna.server.master.utils.FilenameUtils; -import org.taverna.server.master.utils.UsernamePrincipal; -import org.taverna.server.master.utils.X500Utils; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.UriBuilderFactory; +import org.apache.taverna.server.master.utils.CertificateChainFetcher; +import org.apache.taverna.server.master.utils.FilenameUtils; +import org.apache.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.utils.X500Utils; /** * Singleton factory. Really is a singleton (and is also very trivial); the @@ -49,7 +49,7 @@ import org.taverna.server.master.utils.X500Utils; * @author Donal Fellows */ public class SecurityContextFactory implements - org.taverna.server.master.interfaces.SecurityContextFactory { + org.apache.taverna.server.master.interfaces.SecurityContextFactory { private static final long serialVersionUID = 12345678987654321L; private static SecurityContextFactory instance; transient RunDBSupport db; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SimpleFormattedCompletionNotifier.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SimpleFormattedCompletionNotifier.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SimpleFormattedCompletionNotifier.java index f9f4d16..69cbfc2 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SimpleFormattedCompletionNotifier.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/SimpleFormattedCompletionNotifier.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * 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.worker; * limitations under the License. */ -import static org.taverna.server.master.defaults.Default.NOTIFY_MESSAGE_FORMAT; +import static org.apache.taverna.server.master.defaults.Default.NOTIFY_MESSAGE_FORMAT; import java.text.MessageFormat; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/VelocityCompletionNotifier.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/VelocityCompletionNotifier.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/VelocityCompletionNotifier.java index a81e610..d2f7763 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/VelocityCompletionNotifier.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/VelocityCompletionNotifier.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,10 +22,10 @@ import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.common.version.Version; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.UriBuilderFactory; +import org.apache.taverna.server.master.common.version.Version; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.UriBuilderFactory; public class VelocityCompletionNotifier implements CompletionNotifier { private String subject; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/WorkerModel.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/WorkerModel.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/WorkerModel.java index 510c8d0..21b4635 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/WorkerModel.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/WorkerModel.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,7 +21,7 @@ package org.taverna.server.master.worker; import java.net.URI; import java.util.List; -import org.taverna.server.master.common.Status; +import org.apache.taverna.server.master.common.Status; /** * Profile of the getters and setters in a worker system. Ensures that the http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/package-info.java index e96b794..b4fd58a 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/worker/package-info.java @@ -3,7 +3,7 @@ /** * A Taverna Server back-end that works by forking off workflow executors. */ -package org.taverna.server.master.worker; +package org.apache.taverna.server.master.worker; /* * 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/webapp/META-INF/persistence.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/webapp/META-INF/persistence.xml b/taverna-server-webapp/src/main/webapp/META-INF/persistence.xml index ced0a39..19d2f15 100644 --- a/taverna-server-webapp/src/main/webapp/META-INF/persistence.xml +++ b/taverna-server-webapp/src/main/webapp/META-INF/persistence.xml @@ -19,12 +19,12 @@ limitations under the License. xmlns="http://java.sun.com/xml/ns/persistence"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd "> <persistence-unit name="TavernaServer"> - <class>org.taverna.server.master.WebappState</class> - <class>org.taverna.server.master.identity.User</class> - <class>org.taverna.server.master.localworker.PersistedState</class> - <class>org.taverna.server.master.notification.atom.Event</class> - <class>org.taverna.server.master.usage.UsageRecord</class> - <class>org.taverna.server.master.worker.RunConnection</class> + <class>org.apache.taverna.server.master.WebappState</class> + <class>org.apache.taverna.server.master.identity.User</class> + <class>org.apache.taverna.server.master.localworker.PersistedState</class> + <class>org.apache.taverna.server.master.notification.atom.Event</class> + <class>org.apache.taverna.server.master.usage.UsageRecord</class> + <class>org.apache.taverna.server.master.worker.RunConnection</class> <exclude-unlisted-classes>true</exclude-unlisted-classes> </persistence-unit> </persistence>
