http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/RunREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/RunREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/RunREST.java index a04de46..9ee9471 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/RunREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/RunREST.java @@ -1,6 +1,6 @@ /* */ -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 @@ -26,11 +26,11 @@ import static javax.ws.rs.core.Response.status; import static org.apache.commons.logging.LogFactory.getLog; import static org.joda.time.format.ISODateTimeFormat.dateTime; import static org.joda.time.format.ISODateTimeFormat.dateTimeParser; -import static org.taverna.server.master.common.Roles.SELF; -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.common.Status.Initialized; -import static org.taverna.server.master.common.Status.Operating; -import static org.taverna.server.master.utils.RestUtils.opt; +import static org.apache.taverna.server.master.common.Roles.SELF; +import static org.apache.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.common.Status.Initialized; +import static org.apache.taverna.server.master.common.Status.Operating; +import static org.apache.taverna.server.master.utils.RestUtils.opt; import java.util.Date; @@ -43,28 +43,28 @@ import org.apache.commons.logging.Log; import org.joda.time.DateTime; import org.apache.taverna.server.usagerecord.JobUsageRecord; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.api.RunBean; -import org.taverna.server.master.common.ProfileList; -import org.taverna.server.master.common.Status; -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.exceptions.OverloadedException; -import org.taverna.server.master.exceptions.UnknownRunException; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.TavernaSecurityContext; -import org.taverna.server.master.rest.InteractionFeedREST; -import org.taverna.server.master.rest.TavernaServerInputREST; -import org.taverna.server.master.rest.TavernaServerListenersREST; -import org.taverna.server.master.rest.TavernaServerRunREST; -import org.taverna.server.master.rest.TavernaServerSecurityREST; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.InvocationCounter.CallCounted; -import org.taverna.server.port_description.OutputDescription; +import org.apache.taverna.server.master.api.RunBean; +import org.apache.taverna.server.master.common.ProfileList; +import org.apache.taverna.server.master.common.Status; +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.exceptions.OverloadedException; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.TavernaSecurityContext; +import org.apache.taverna.server.master.rest.InteractionFeedREST; +import org.apache.taverna.server.master.rest.TavernaServerInputREST; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST; +import org.apache.taverna.server.master.rest.TavernaServerRunREST; +import org.apache.taverna.server.master.rest.TavernaServerSecurityREST; +import org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.InvocationCounter.CallCounted; +import org.apache.taverna.server.port_description.OutputDescription; /** * RESTful interface to a single 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/RunSecurityREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/RunSecurityREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/RunSecurityREST.java index 9dc69d7..7e98ee1 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/RunSecurityREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/RunSecurityREST.java @@ -1,6 +1,6 @@ /* */ -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 @@ -21,9 +21,9 @@ package org.taverna.server.master; import static java.util.UUID.randomUUID; import static javax.ws.rs.core.Response.created; import static javax.ws.rs.core.Response.noContent; -import static org.taverna.server.master.common.Status.Initialized; -import static org.taverna.server.master.common.Uri.secure; -import static org.taverna.server.master.utils.RestUtils.opt; +import static org.apache.taverna.server.master.common.Status.Initialized; +import static org.apache.taverna.server.master.common.Uri.secure; +import static org.apache.taverna.server.master.utils.RestUtils.opt; import java.net.URI; import java.util.Map; @@ -31,18 +31,18 @@ import java.util.Map; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.taverna.server.master.api.SecurityBean; -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.exceptions.BadStateChangeException; -import org.taverna.server.master.exceptions.InvalidCredentialException; -import org.taverna.server.master.exceptions.NoCredentialException; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.TavernaSecurityContext; -import org.taverna.server.master.rest.TavernaServerSecurityREST; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.InvocationCounter.CallCounted; +import org.apache.taverna.server.master.api.SecurityBean; +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.exceptions.BadStateChangeException; +import org.apache.taverna.server.master.exceptions.InvalidCredentialException; +import org.apache.taverna.server.master.exceptions.NoCredentialException; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.TavernaSecurityContext; +import org.apache.taverna.server.master.rest.TavernaServerSecurityREST; +import org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.InvocationCounter.CallCounted; /** * RESTful interface to a single workflow run's security settings. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/SingleListenerREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/SingleListenerREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/SingleListenerREST.java index 2c841cc..5987c67 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/SingleListenerREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/SingleListenerREST.java @@ -1,6 +1,6 @@ /* */ -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 @@ -19,23 +19,23 @@ package org.taverna.server.master; */ import static java.util.Arrays.asList; -import static org.taverna.server.master.common.Uri.secure; -import static org.taverna.server.master.utils.RestUtils.opt; +import static org.apache.taverna.server.master.common.Uri.secure; +import static org.apache.taverna.server.master.utils.RestUtils.opt; import java.util.List; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.taverna.server.master.api.OneListenerBean; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.rest.TavernaServerListenersREST; -import org.taverna.server.master.rest.TavernaServerListenersREST.ListenerDescription; -import org.taverna.server.master.rest.TavernaServerListenersREST.TavernaServerListenerREST; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.InvocationCounter.CallCounted; +import org.apache.taverna.server.master.api.OneListenerBean; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST.ListenerDescription; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST.TavernaServerListenerREST; +import org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.InvocationCounter.CallCounted; /** * RESTful interface to a single listener 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/TavernaServer.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/TavernaServer.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/TavernaServer.java index 4844147..bf0842f 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/TavernaServer.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/TavernaServer.java @@ -1,6 +1,6 @@ /* */ -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 @@ -28,16 +28,16 @@ import static javax.xml.ws.handler.MessageContext.HTTP_REQUEST_HEADERS; import static javax.xml.ws.handler.MessageContext.PATH_INFO; import static org.apache.commons.io.IOUtils.toByteArray; import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.TavernaServerSupport.PROV_BUNDLE; -import static org.taverna.server.master.common.DirEntryReference.newInstance; -import static org.taverna.server.master.common.Namespaces.SERVER_SOAP; -import static org.taverna.server.master.common.Roles.ADMIN; -import static org.taverna.server.master.common.Roles.SELF; -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.common.Status.Initialized; -import static org.taverna.server.master.common.Uri.secure; -import static org.taverna.server.master.soap.DirEntry.convert; -import static org.taverna.server.master.utils.RestUtils.opt; +import static org.apache.taverna.server.master.TavernaServerSupport.PROV_BUNDLE; +import static org.apache.taverna.server.master.common.DirEntryReference.newInstance; +import static org.apache.taverna.server.master.common.Namespaces.SERVER_SOAP; +import static org.apache.taverna.server.master.common.Roles.ADMIN; +import static org.apache.taverna.server.master.common.Roles.SELF; +import static org.apache.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.common.Status.Initialized; +import static org.apache.taverna.server.master.common.Uri.secure; +import static org.apache.taverna.server.master.soap.DirEntry.convert; +import static org.apache.taverna.server.master.utils.RestUtils.opt; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -69,59 +69,59 @@ import org.apache.commons.logging.Log; import org.apache.cxf.annotations.WSDLDocumentation; import org.apache.taverna.server.usagerecord.JobUsageRecord; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.api.SupportAware; -import org.taverna.server.master.api.TavernaServerBean; -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.OverloadedException; -import org.taverna.server.master.exceptions.UnknownRunException; -import org.taverna.server.master.factories.ListenerFactory; -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.Policy; -import org.taverna.server.master.interfaces.RunStore; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.TavernaSecurityContext; -import org.taverna.server.master.notification.NotificationEngine; -import org.taverna.server.master.notification.atom.EventDAO; -import org.taverna.server.master.rest.TavernaServerREST; -import org.taverna.server.master.rest.TavernaServerREST.EnabledNotificationFabrics; -import org.taverna.server.master.rest.TavernaServerREST.PermittedListeners; -import org.taverna.server.master.rest.TavernaServerREST.PermittedWorkflows; -import org.taverna.server.master.rest.TavernaServerREST.PolicyView; -import org.taverna.server.master.rest.TavernaServerRunREST; -import org.taverna.server.master.soap.DirEntry; -import org.taverna.server.master.soap.FileContents; -import org.taverna.server.master.soap.PermissionList; -import org.taverna.server.master.soap.TavernaServerSOAP; -import org.taverna.server.master.soap.WrappedWorkflow; -import org.taverna.server.master.soap.ZippedDirectory; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.FilenameUtils; -import org.taverna.server.master.utils.InvocationCounter.CallCounted; -import org.taverna.server.port_description.OutputDescription; +import org.apache.taverna.server.master.api.SupportAware; +import org.apache.taverna.server.master.api.TavernaServerBean; +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.OverloadedException; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.factories.ListenerFactory; +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.Policy; +import org.apache.taverna.server.master.interfaces.RunStore; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.TavernaSecurityContext; +import org.apache.taverna.server.master.notification.NotificationEngine; +import org.apache.taverna.server.master.notification.atom.EventDAO; +import org.apache.taverna.server.master.rest.TavernaServerREST; +import org.apache.taverna.server.master.rest.TavernaServerREST.EnabledNotificationFabrics; +import org.apache.taverna.server.master.rest.TavernaServerREST.PermittedListeners; +import org.apache.taverna.server.master.rest.TavernaServerREST.PermittedWorkflows; +import org.apache.taverna.server.master.rest.TavernaServerREST.PolicyView; +import org.apache.taverna.server.master.rest.TavernaServerRunREST; +import org.apache.taverna.server.master.soap.DirEntry; +import org.apache.taverna.server.master.soap.FileContents; +import org.apache.taverna.server.master.soap.PermissionList; +import org.apache.taverna.server.master.soap.TavernaServerSOAP; +import org.apache.taverna.server.master.soap.WrappedWorkflow; +import org.apache.taverna.server.master.soap.ZippedDirectory; +import org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.FilenameUtils; +import org.apache.taverna.server.master.utils.InvocationCounter.CallCounted; +import org.apache.taverna.server.port_description.OutputDescription; /** * The core implementation of the web application. @@ -130,7 +130,7 @@ import org.taverna.server.port_description.OutputDescription; */ @Path("/") @DeclareRoles({ USER, ADMIN }) -@WebService(endpointInterface = "org.taverna.server.master.soap.TavernaServerSOAP", serviceName = "TavernaServer", targetNamespace = SERVER_SOAP) +@WebService(endpointInterface = "org.apache.taverna.server.master.soap.TavernaServerSOAP", serviceName = "TavernaServer", targetNamespace = SERVER_SOAP) @WSDLDocumentation("An instance of Taverna " + Version.JAVA + " Server.") public abstract class TavernaServer implements TavernaServerSOAP, TavernaServerREST, TavernaServerBean { @@ -1245,7 +1245,7 @@ public abstract class TavernaServer implements TavernaServerSOAP, @CallCounted @PerfLogged @RolesAllowed(USER) - public org.taverna.server.port_description.InputDescription getRunInputDescriptor( + public org.apache.taverna.server.port_description.InputDescription getRunInputDescriptor( String runName) throws UnknownRunException { return cdBuilder.makeInputDescriptor(support.getRun(runName), null); } http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/TavernaServerSupport.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/TavernaServerSupport.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/TavernaServerSupport.java index 533acf5..3c23c0d 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/TavernaServerSupport.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/TavernaServerSupport.java @@ -1,6 +1,6 @@ /* */ -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 @@ -25,9 +25,9 @@ import static java.lang.Math.min; import static org.apache.commons.logging.LogFactory.getLog; 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.taverna.server.master.common.Roles.ADMIN; -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW; +import static org.apache.taverna.server.master.TavernaServer.JMX_ROOT; +import static org.apache.taverna.server.master.common.Roles.ADMIN; +import static org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -61,37 +61,37 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; -import org.taverna.server.master.api.ManagementModel; -import org.taverna.server.master.api.TavernaServerBean; -import org.taverna.server.master.common.Capability; -import org.taverna.server.master.common.Permission; -import org.taverna.server.master.common.ProfileList; -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.FilesystemAccessException; -import org.taverna.server.master.exceptions.NoCreateException; -import org.taverna.server.master.exceptions.NoDestroyException; -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.UnknownRunException; -import org.taverna.server.master.factories.ListenerFactory; -import org.taverna.server.master.factories.RunFactory; -import org.taverna.server.master.identity.WorkflowInternalAuthProvider.WorkflowSelfAuthority; -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.LocalIdentityMapper; -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.interfaces.TavernaSecurityContext; -import org.taverna.server.master.rest.handler.T2FlowDocumentHandler; -import org.taverna.server.master.utils.CapabilityLister; -import org.taverna.server.master.utils.FilenameUtils; -import org.taverna.server.master.utils.InvocationCounter; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.api.ManagementModel; +import org.apache.taverna.server.master.api.TavernaServerBean; +import org.apache.taverna.server.master.common.Capability; +import org.apache.taverna.server.master.common.Permission; +import org.apache.taverna.server.master.common.ProfileList; +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.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.exceptions.NoDestroyException; +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.UnknownRunException; +import org.apache.taverna.server.master.factories.ListenerFactory; +import org.apache.taverna.server.master.factories.RunFactory; +import org.apache.taverna.server.master.identity.WorkflowInternalAuthProvider.WorkflowSelfAuthority; +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.LocalIdentityMapper; +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.interfaces.TavernaSecurityContext; +import org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler; +import org.apache.taverna.server.master.utils.CapabilityLister; +import org.apache.taverna.server.master.utils.FilenameUtils; +import org.apache.taverna.server.master.utils.InvocationCounter; +import org.apache.taverna.server.master.utils.UsernamePrincipal; import org.apache.taverna.scufl2.api.profiles.Profile; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/Admin.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/Admin.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/Admin.java index 03c0c8b..f7402b3 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/Admin.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/Admin.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.admin; +package org.apache.taverna.server.master.admin; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,40 +18,40 @@ package org.taverna.server.master.admin; * limitations under the License. */ -import static org.taverna.server.master.admin.Paths.ALLOW_NEW; -import static org.taverna.server.master.admin.Paths.ARGS; -import static org.taverna.server.master.admin.Paths.EXEC_WF; -import static org.taverna.server.master.admin.Paths.EXITCODE; -import static org.taverna.server.master.admin.Paths.FACTORIES; -import static org.taverna.server.master.admin.Paths.GEN_PROV; -import static org.taverna.server.master.admin.Paths.INVOKES; -import static org.taverna.server.master.admin.Paths.JAR_FORKER; -import static org.taverna.server.master.admin.Paths.JAR_WORKER; -import static org.taverna.server.master.admin.Paths.JAVA; -import static org.taverna.server.master.admin.Paths.LIFE; -import static org.taverna.server.master.admin.Paths.LOG_EXN; -import static org.taverna.server.master.admin.Paths.LOG_WFS; -import static org.taverna.server.master.admin.Paths.OPERATING; -import static org.taverna.server.master.admin.Paths.OP_LIMIT; -import static org.taverna.server.master.admin.Paths.PASSFILE; -import static org.taverna.server.master.admin.Paths.PERM_WF; -import static org.taverna.server.master.admin.Paths.REG_HOST; -import static org.taverna.server.master.admin.Paths.REG_JAR; -import static org.taverna.server.master.admin.Paths.REG_POLL; -import static org.taverna.server.master.admin.Paths.REG_PORT; -import static org.taverna.server.master.admin.Paths.REG_WAIT; -import static org.taverna.server.master.admin.Paths.ROOT; -import static org.taverna.server.master.admin.Paths.RUNS; -import static org.taverna.server.master.admin.Paths.RUN_LIMIT; -import static org.taverna.server.master.admin.Paths.STARTUP; -import static org.taverna.server.master.admin.Paths.TOTAL_RUNS; -import static org.taverna.server.master.admin.Paths.URS; -import static org.taverna.server.master.admin.Paths.UR_FILE; -import static org.taverna.server.master.admin.Paths.USER; -import static org.taverna.server.master.admin.Paths.USERS; -import static org.taverna.server.master.admin.Types.JSON; -import static org.taverna.server.master.admin.Types.PLAIN; -import static org.taverna.server.master.admin.Types.XML; +import static org.apache.taverna.server.master.admin.Paths.ALLOW_NEW; +import static org.apache.taverna.server.master.admin.Paths.ARGS; +import static org.apache.taverna.server.master.admin.Paths.EXEC_WF; +import static org.apache.taverna.server.master.admin.Paths.EXITCODE; +import static org.apache.taverna.server.master.admin.Paths.FACTORIES; +import static org.apache.taverna.server.master.admin.Paths.GEN_PROV; +import static org.apache.taverna.server.master.admin.Paths.INVOKES; +import static org.apache.taverna.server.master.admin.Paths.JAR_FORKER; +import static org.apache.taverna.server.master.admin.Paths.JAR_WORKER; +import static org.apache.taverna.server.master.admin.Paths.JAVA; +import static org.apache.taverna.server.master.admin.Paths.LIFE; +import static org.apache.taverna.server.master.admin.Paths.LOG_EXN; +import static org.apache.taverna.server.master.admin.Paths.LOG_WFS; +import static org.apache.taverna.server.master.admin.Paths.OPERATING; +import static org.apache.taverna.server.master.admin.Paths.OP_LIMIT; +import static org.apache.taverna.server.master.admin.Paths.PASSFILE; +import static org.apache.taverna.server.master.admin.Paths.PERM_WF; +import static org.apache.taverna.server.master.admin.Paths.REG_HOST; +import static org.apache.taverna.server.master.admin.Paths.REG_JAR; +import static org.apache.taverna.server.master.admin.Paths.REG_POLL; +import static org.apache.taverna.server.master.admin.Paths.REG_PORT; +import static org.apache.taverna.server.master.admin.Paths.REG_WAIT; +import static org.apache.taverna.server.master.admin.Paths.ROOT; +import static org.apache.taverna.server.master.admin.Paths.RUNS; +import static org.apache.taverna.server.master.admin.Paths.RUN_LIMIT; +import static org.apache.taverna.server.master.admin.Paths.STARTUP; +import static org.apache.taverna.server.master.admin.Paths.TOTAL_RUNS; +import static org.apache.taverna.server.master.admin.Paths.URS; +import static org.apache.taverna.server.master.admin.Paths.UR_FILE; +import static org.apache.taverna.server.master.admin.Paths.USER; +import static org.apache.taverna.server.master.admin.Paths.USERS; +import static org.apache.taverna.server.master.admin.Types.JSON; +import static org.apache.taverna.server.master.admin.Types.PLAIN; +import static org.apache.taverna.server.master.admin.Types.XML; import java.io.IOException; import java.net.URI; @@ -77,8 +77,8 @@ import javax.xml.bind.annotation.XmlType; import org.apache.cxf.jaxrs.model.wadl.Description; import org.apache.taverna.server.usagerecord.JobUsageRecord; -import org.taverna.server.master.common.Uri; -import org.taverna.server.master.common.VersionedElement; +import org.apache.taverna.server.master.common.Uri; +import org.apache.taverna.server.master.common.VersionedElement; /** * The administration interface for 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/admin/AdminBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/AdminBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/AdminBean.java index 0233cd5..4cef9d6 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/AdminBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/AdminBean.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.admin; +package org.apache.taverna.server.master.admin; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,9 +23,9 @@ import static java.util.UUID.randomUUID; import static javax.ws.rs.core.Response.created; import static javax.ws.rs.core.Response.noContent; import static javax.ws.rs.core.Response.Status.NOT_FOUND; -import static org.taverna.server.master.common.Roles.ADMIN; -import static org.taverna.server.master.common.Uri.secure; -import static org.taverna.server.master.utils.RestUtils.opt; +import static org.apache.taverna.server.master.common.Roles.ADMIN; +import static org.apache.taverna.server.master.common.Uri.secure; +import static org.apache.taverna.server.master.utils.RestUtils.opt; import java.io.FileNotFoundException; import java.io.IOException; @@ -40,15 +40,15 @@ import javax.ws.rs.core.UriInfo; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.api.ManagementModel; -import org.taverna.server.master.exceptions.GeneralFailureException; -import org.taverna.server.master.factories.ConfigurableRunFactory; -import org.taverna.server.master.identity.User; -import org.taverna.server.master.identity.UserStoreAPI; -import org.taverna.server.master.usage.UsageRecordRecorder; -import org.taverna.server.master.utils.InvocationCounter; -import org.taverna.server.master.worker.RunDBSupport; -import org.taverna.server.master.worker.WorkerModel; +import org.apache.taverna.server.master.api.ManagementModel; +import org.apache.taverna.server.master.exceptions.GeneralFailureException; +import org.apache.taverna.server.master.factories.ConfigurableRunFactory; +import org.apache.taverna.server.master.identity.User; +import org.apache.taverna.server.master.identity.UserStoreAPI; +import org.apache.taverna.server.master.usage.UsageRecordRecorder; +import org.apache.taverna.server.master.utils.InvocationCounter; +import org.apache.taverna.server.master.worker.RunDBSupport; +import org.apache.taverna.server.master.worker.WorkerModel; /** * The administration interface to 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/admin/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/package-info.java index 0a4174e..792ea72 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/admin/package-info.java @@ -13,7 +13,7 @@ @XmlNs(prefix = "admin", namespaceURI = ADMIN), @XmlNs(prefix = "ur", namespaceURI = UR), @XmlNs(prefix = "ds", namespaceURI = XSIG) }) -package org.taverna.server.master.admin; +package org.apache.taverna.server.master.admin; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -32,14 +32,14 @@ package org.taverna.server.master.admin; */ 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.UR; -import static org.taverna.server.master.common.Namespaces.XLINK; -import static org.taverna.server.master.common.Namespaces.XSIG; +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.UR; +import static org.apache.taverna.server.master.common.Namespaces.XLINK; +import static org.apache.taverna.server.master.common.Namespaces.XSIG; 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/api/ContentTypes.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ContentTypes.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ContentTypes.java index 2ad6063..5abcdd0 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ContentTypes.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ContentTypes.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * 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/api/DirectoryBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/DirectoryBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/DirectoryBean.java index 7cb1b7e..1f9b846 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/DirectoryBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/DirectoryBean.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,9 +16,9 @@ package org.taverna.server.master.api; * limitations under the License. */ -import org.taverna.server.master.rest.TavernaServerDirectoryREST; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.utils.FilenameUtils; +import org.apache.taverna.server.master.rest.TavernaServerDirectoryREST; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.utils.FilenameUtils; /** * Description of properties supported by {@link DirectoryREST}. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/FeedBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/FeedBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/FeedBean.java index c977974..59e8040 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/FeedBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/FeedBean.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,8 +16,8 @@ package org.taverna.server.master.api; * limitations under the License. */ -import org.taverna.server.master.InteractionFeed; -import org.taverna.server.master.interaction.InteractionFeedSupport; +import org.apache.taverna.server.master.InteractionFeed; +import org.apache.taverna.server.master.interaction.InteractionFeedSupport; /** * Description of properties supported by {@link InteractionFeed}. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/InputBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/InputBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/InputBean.java index 17003e5..99c627d 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/InputBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/InputBean.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * 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.api; import javax.ws.rs.core.UriInfo; -import org.taverna.server.master.ContentsDescriptorBuilder; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.rest.TavernaServerInputREST; -import org.taverna.server.master.utils.FilenameUtils; +import org.apache.taverna.server.master.ContentsDescriptorBuilder; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.rest.TavernaServerInputREST; +import org.apache.taverna.server.master.utils.FilenameUtils; /** - * Description of properties supported by {@link org.taverna.server.master.InputREST}. + * Description of properties supported by {@link org.apache.taverna.server.master.InputREST}. * * @author Donal Fellows */ http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ListenerPropertyBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ListenerPropertyBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ListenerPropertyBean.java index 52a52f2..37b05c7 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ListenerPropertyBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ListenerPropertyBean.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,9 +16,9 @@ package org.taverna.server.master.api; * limitations under the License. */ -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.rest.TavernaServerListenersREST; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST; /** * Description of properties supported by {@link ListenerPropertyREST}. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ListenersBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ListenersBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ListenersBean.java index 63035f7..9060af2 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ListenersBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ListenersBean.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,8 +16,8 @@ package org.taverna.server.master.api; * limitations under the License. */ -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.rest.TavernaServerListenersREST; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST; /** * Description of properties supported by {@link ListenersREST}. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ManagementModel.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ManagementModel.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ManagementModel.java index dc02279..dc619ea 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ManagementModel.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/ManagementModel.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * 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/api/OneListenerBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/OneListenerBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/OneListenerBean.java index f7a7134..0cb893c 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/OneListenerBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/OneListenerBean.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,9 +16,9 @@ package org.taverna.server.master.api; * limitations under the License. */ -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.rest.TavernaServerListenersREST.TavernaServerListenerREST; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST.TavernaServerListenerREST; /** * Description of properties supported by {@link InputREST}. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/RunBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/RunBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/RunBean.java index 274d9f0..71c2057 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/RunBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/RunBean.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,11 +16,11 @@ package org.taverna.server.master.api; * limitations under the License. */ -import org.taverna.server.master.ContentsDescriptorBuilder; -import org.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.ContentsDescriptorBuilder; +import org.apache.taverna.server.master.interfaces.TavernaRun; /** - * Description of properties supported by {@link org.taverna.server.master.RunREST}. + * Description of properties supported by {@link org.apache.taverna.server.master.RunREST}. * * @author Donal Fellows */ http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/SecurityBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/SecurityBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/SecurityBean.java index ddbc9b9..1ced5b5 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/SecurityBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/SecurityBean.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,9 +16,9 @@ package org.taverna.server.master.api; * limitations under the License. */ -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.TavernaSecurityContext; -import org.taverna.server.master.rest.TavernaServerSecurityREST; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.TavernaSecurityContext; +import org.apache.taverna.server.master.rest.TavernaServerSecurityREST; /** * Description of properties supported by {@link RunSecurityREST}. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/SupportAware.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/SupportAware.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/SupportAware.java index 117533f..e57f522 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/SupportAware.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/SupportAware.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,7 +17,7 @@ package org.taverna.server.master.api; */ import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.TavernaServerSupport; +import org.apache.taverna.server.master.TavernaServerSupport; /** * Indicates that this is a class that wants to be told by Spring about 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/api/TavernaServerBean.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/TavernaServerBean.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/TavernaServerBean.java index 8873857..4151479 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/TavernaServerBean.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/TavernaServerBean.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,17 +21,17 @@ package org.taverna.server.master.api; import javax.annotation.Nonnull; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.ContentsDescriptorBuilder; -import org.taverna.server.master.TavernaServerSupport; -import org.taverna.server.master.interfaces.Policy; -import org.taverna.server.master.interfaces.RunStore; -import org.taverna.server.master.interfaces.TavernaSecurityContext; -import org.taverna.server.master.interfaces.UriBuilderFactory; -import org.taverna.server.master.notification.NotificationEngine; -import org.taverna.server.master.notification.atom.EventDAO; -import org.taverna.server.master.rest.TavernaServerREST; -import org.taverna.server.master.soap.TavernaServerSOAP; -import org.taverna.server.master.utils.FilenameUtils; +import org.apache.taverna.server.master.ContentsDescriptorBuilder; +import org.apache.taverna.server.master.TavernaServerSupport; +import org.apache.taverna.server.master.interfaces.Policy; +import org.apache.taverna.server.master.interfaces.RunStore; +import org.apache.taverna.server.master.interfaces.TavernaSecurityContext; +import org.apache.taverna.server.master.interfaces.UriBuilderFactory; +import org.apache.taverna.server.master.notification.NotificationEngine; +import org.apache.taverna.server.master.notification.atom.EventDAO; +import org.apache.taverna.server.master.rest.TavernaServerREST; +import org.apache.taverna.server.master.soap.TavernaServerSOAP; +import org.apache.taverna.server.master.utils.FilenameUtils; /** * The methods of the webapp that are accessed by beans other than itself or http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/package-info.java index 0966e24..cfffa6c 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/api/package-info.java @@ -3,7 +3,7 @@ * * @author Donal Fellows */ -package org.taverna.server.master.api; +package org.apache.taverna.server.master.api; /* * 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/common/Capability.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Capability.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Capability.java index 75f9549..a3cdb6f 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Capability.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Capability.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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/common/Credential.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Credential.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Credential.java index c6627da..0aabe57 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Credential.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Credential.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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.common; * 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.io.Serializable; import java.net.URI; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/DirEntryReference.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/DirEntryReference.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/DirEntryReference.java index 424e32a..5597f23 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/DirEntryReference.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/DirEntryReference.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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.common; * 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; @@ -30,8 +30,8 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import org.taverna.server.master.interfaces.Directory; -import org.taverna.server.master.interfaces.DirectoryEntry; +import org.apache.taverna.server.master.interfaces.Directory; +import org.apache.taverna.server.master.interfaces.DirectoryEntry; /** * A reference to something that is in a directory below the working directory http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/InputDescription.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/InputDescription.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/InputDescription.java index b1eb55c..1e90c5b 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/InputDescription.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/InputDescription.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,8 +27,8 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; -import org.taverna.server.master.interfaces.Input; -import org.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.Input; +import org.apache.taverna.server.master.interfaces.TavernaRun; /** * A description of the inputs to a workflow, described using JAXB. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Namespaces.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Namespaces.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Namespaces.java index d2035ee..c8386bb 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Namespaces.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Namespaces.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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/common/Permission.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Permission.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Permission.java index 3e0a307..103edba 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Permission.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Permission.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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.xml.bind.annotation.XmlType; /** * Description of a permission to access a particular workflow run. Note that * users always have full access to their own runs, as does any user with the " - * <tt>{@value org.taverna.server.master.common.Roles#ADMIN}</tt>" ability. + * <tt>{@value org.apache.taverna.server.master.common.Roles#ADMIN}</tt>" ability. * * @author Donal Fellows */ http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/ProfileList.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/ProfileList.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/ProfileList.java index d9b0a9e..8334804 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/ProfileList.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/ProfileList.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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/common/Roles.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Roles.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Roles.java index bdcf876..7c3f9e3 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Roles.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Roles.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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/common/RunReference.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/RunReference.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/RunReference.java index cc80f60..1d6a9cc 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/RunReference.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/RunReference.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,9 +18,9 @@ package org.taverna.server.master.common; * limitations under the License. */ -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.VersionedElement.VERSION; +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.VersionedElement.VERSION; import java.net.URI; @@ -36,7 +36,7 @@ import javax.xml.bind.annotation.XmlValue; * A reference to a single workflow run, described using JAXB. * * @author Donal Fellows - * @see org.taverna.server.master.interfaces.TavernaRun TavernaRun + * @see org.apache.taverna.server.master.interfaces.TavernaRun TavernaRun */ @XmlRootElement @XmlType(name = "TavernaRun") http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Status.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Status.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Status.java index 1aad4ef..c9c877a 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Status.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Status.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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/common/Trust.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Trust.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Trust.java index c61e72a..787c8a3 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Trust.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Trust.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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.common; * 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.io.Serializable; import java.security.cert.Certificate; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Uri.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Uri.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Uri.java index ba0bb3c..c6570c2 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Uri.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Uri.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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.common; import static javax.ws.rs.core.UriBuilder.fromUri; import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.common.Namespaces.XLINK; +import static org.apache.taverna.server.master.common.Namespaces.XLINK; import java.lang.reflect.Method; import java.net.URI; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/VersionedElement.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/VersionedElement.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/VersionedElement.java index 735a72d..0ba82af 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/VersionedElement.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/VersionedElement.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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.common; */ import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.common.Namespaces.SERVER; +import static org.apache.taverna.server.master.common.Namespaces.SERVER; import java.io.IOException; import java.io.InputStream; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Workflow.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Workflow.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Workflow.java index 3a7d5f7..e645545 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Workflow.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/Workflow.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common; +package org.apache.taverna.server.master.common; /* * 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 static javax.xml.bind.Marshaller.JAXB_ENCODING; import static javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT; import static javax.xml.bind.annotation.XmlAccessType.NONE; import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.rest.handler.Scufl2DocumentHandler.SCUFL2; -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW; -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW_NS; -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW_ROOTNAME; +import static org.apache.taverna.server.master.rest.handler.Scufl2DocumentHandler.SCUFL2; +import static org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW; +import static org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW_NS; +import static org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW_ROOTNAME; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -52,8 +52,8 @@ import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import javax.xml.parsers.DocumentBuilderFactory; -import org.taverna.server.master.rest.handler.Scufl2DocumentHandler; -import org.taverna.server.master.rest.handler.T2FlowDocumentHandler; +import org.apache.taverna.server.master.rest.handler.Scufl2DocumentHandler; +import org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler; import org.w3c.dom.Document; import org.w3c.dom.Element; 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/common/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/package-info.java index e000cef..8fb9e87 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/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.common; +package org.apache.taverna.server.master.common; /* * 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.common; */ 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/common/version/Version.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/version/Version.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/version/Version.java index bd50db2..e5483cc 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/version/Version.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/common/version/Version.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.common.version; +package org.apache.taverna.server.master.common.version; /* * 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.common.version; * limitations under the License. */ -import static org.taverna.server.master.common.version.Constants.PATCH; -import static org.taverna.server.master.common.version.Constants.VERSION; +import static org.apache.taverna.server.master.common.version.Constants.PATCH; +import static org.apache.taverna.server.master.common.version.Constants.VERSION; /** * Common location for describing the version of the 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/defaults/Default.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/defaults/Default.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/defaults/Default.java index 679a5f4..1cdb67f 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/defaults/Default.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/defaults/Default.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.defaults; +package org.apache.taverna.server.master.defaults; /* * 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.defaults; * limitations under the License. */ -import org.taverna.server.master.common.Status; -import org.taverna.server.master.localworker.LocalWorkerState; +import org.apache.taverna.server.master.common.Status; +import org.apache.taverna.server.master.localworker.LocalWorkerState; /** * This defines a collection of default values, collecting them from various http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/defaults/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/defaults/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/defaults/package-info.java index 5585c77..cef0e13 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/defaults/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/defaults/package-info.java @@ -2,7 +2,7 @@ * This package contains information about the various default values supported by the server. * @author Donal Fellows */ -package org.taverna.server.master.defaults; +package org.apache.taverna.server.master.defaults; /* * 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/exceptions/BadInputPortNameException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadInputPortNameException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadInputPortNameException.java index 64d07f0..b8bc21a 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadInputPortNameException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadInputPortNameException.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.exceptions; +package org.apache.taverna.server.master.exceptions; /* * 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/exceptions/BadPropertyValueException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadPropertyValueException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadPropertyValueException.java index 61bf740..9fb58e7 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadPropertyValueException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadPropertyValueException.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.exceptions; +package org.apache.taverna.server.master.exceptions; /* * 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/exceptions/BadStateChangeException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadStateChangeException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadStateChangeException.java index 152410f..2814588 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadStateChangeException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/BadStateChangeException.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.exceptions; +package org.apache.taverna.server.master.exceptions; /* * 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/exceptions/FilesystemAccessException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/FilesystemAccessException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/FilesystemAccessException.java index e0894e4..2e011ea 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/FilesystemAccessException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/FilesystemAccessException.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.exceptions; +package org.apache.taverna.server.master.exceptions; /* * 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/exceptions/GeneralFailureException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/GeneralFailureException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/GeneralFailureException.java index de3fab5..a1d35e6 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/GeneralFailureException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/GeneralFailureException.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.exceptions; +package org.apache.taverna.server.master.exceptions; /* * 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.exceptions; * limitations under the License. */ -import static org.taverna.server.master.common.Namespaces.SERVER_SOAP; +import static org.apache.taverna.server.master.common.Namespaces.SERVER_SOAP; import javax.xml.ws.WebFault; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/InvalidCredentialException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/InvalidCredentialException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/InvalidCredentialException.java index 7e00093..aadaf6e 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/InvalidCredentialException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/InvalidCredentialException.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.exceptions; +package org.apache.taverna.server.master.exceptions; /* * 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/exceptions/NoCreateException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoCreateException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoCreateException.java index d665adb..19fe447 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoCreateException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoCreateException.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.exceptions; +package org.apache.taverna.server.master.exceptions; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with
