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/NoCredentialException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoCredentialException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoCredentialException.java index b351c1c..63d44da 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoCredentialException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoCredentialException.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/NoDestroyException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoDestroyException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoDestroyException.java index 42de7d1..f0263f8 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoDestroyException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoDestroyException.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/NoDirectoryEntryException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoDirectoryEntryException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoDirectoryEntryException.java index 32300d1..9524e87 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoDirectoryEntryException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoDirectoryEntryException.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/NoListenerException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoListenerException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoListenerException.java index ef84e9e..c8762be 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoListenerException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoListenerException.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/NoUpdateException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoUpdateException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoUpdateException.java index 5e972dd..e73f9bd 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoUpdateException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NoUpdateException.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/NotOwnerException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NotOwnerException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NotOwnerException.java index 29e00b7..67de956 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NotOwnerException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/NotOwnerException.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/OverloadedException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/OverloadedException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/OverloadedException.java index bd34659..15ac4bd 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/OverloadedException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/OverloadedException.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/UnknownRunException.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/UnknownRunException.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/UnknownRunException.java index af717ab..fe24079 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/UnknownRunException.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/UnknownRunException.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/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/package-info.java index b2284ee..5070efa 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/exceptions/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.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 @@ -30,12 +30,12 @@ package org.taverna.server.master.exceptions; */ 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/facade/Facade.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/facade/Facade.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/facade/Facade.java index 3031520..10c92e8 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/facade/Facade.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/facade/Facade.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.facade; +package org.apache.taverna.server.master.facade; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -35,7 +35,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.utils.Contextualizer; +import org.apache.taverna.server.master.utils.Contextualizer; /** * This is a simple class that is used to serve up a file (with a simple http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/facade/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/facade/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/facade/package-info.java index 2d8f4ef..b26ef30 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/facade/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/facade/package-info.java @@ -4,7 +4,7 @@ * Simple facade used at the top level of the Taverna Server in order to * provide an entry splash page. */ -package org.taverna.server.master.facade; +package org.apache.taverna.server.master.facade; /* * 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/factories/ConfigurableRunFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/ConfigurableRunFactory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/ConfigurableRunFactory.java index 7a4124d..3e5e67b 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/ConfigurableRunFactory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/ConfigurableRunFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.factories; +package org.apache.taverna.server.master.factories; /* * 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/factories/ListenerFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/ListenerFactory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/ListenerFactory.java index bb83401..90f0daa 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/ListenerFactory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/ListenerFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.factories; +package org.apache.taverna.server.master.factories; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,9 +20,9 @@ package org.taverna.server.master.factories; import java.util.List; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.TavernaRun; /** * How to make event listeners of various types that are attached to a workflow http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/RunFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/RunFactory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/RunFactory.java index d048f70..23b9d96 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/RunFactory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/RunFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.factories; +package org.apache.taverna.server.master.factories; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,10 +18,10 @@ package org.taverna.server.master.factories; * limitations under the License. */ -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.exceptions.NoCreateException; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * How to construct a Taverna Server 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/factories/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/package-info.java index 56ba1e2..e6fed2d 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/factories/package-info.java @@ -4,7 +4,7 @@ * These interfaces define the principal way for the <i>factories</i> of * worker classes to be invoked. */ -package org.taverna.server.master.factories; +package org.apache.taverna.server.master.factories; /* * 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/identity/AuthorityDerivedIDMapper.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/AuthorityDerivedIDMapper.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/AuthorityDerivedIDMapper.java index 4fd5312..e3d4200 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/AuthorityDerivedIDMapper.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/AuthorityDerivedIDMapper.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.identity; +package org.apache.taverna.server.master.identity; /* * 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.identity; * limitations under the License. */ -import static org.taverna.server.master.defaults.Default.AUTHORITY_PREFIX; +import static org.apache.taverna.server.master.defaults.Default.AUTHORITY_PREFIX; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; -import org.taverna.server.master.interfaces.LocalIdentityMapper; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.interfaces.LocalIdentityMapper; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * Extracts the local user id from the set of Spring Security authorities http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/CompositeIDMapper.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/CompositeIDMapper.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/CompositeIDMapper.java index f0a6f4c..ca3e37a 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/CompositeIDMapper.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/CompositeIDMapper.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.identity; +package org.apache.taverna.server.master.identity; /* * 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 org.apache.commons.logging.Log; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.taverna.server.master.interfaces.LocalIdentityMapper; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.interfaces.LocalIdentityMapper; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * An identity mapper that composes the results from other mappers, using 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/identity/ConstantIDMapper.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/ConstantIDMapper.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/ConstantIDMapper.java index bf48fc7..1481ef9 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/ConstantIDMapper.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/ConstantIDMapper.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.identity; +package org.apache.taverna.server.master.identity; /* * 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.identity; * limitations under the License. */ -import org.taverna.server.master.interfaces.LocalIdentityMapper; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.interfaces.LocalIdentityMapper; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * A trivial principal to user mapper that always uses the same ID. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/NameIDMapper.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/NameIDMapper.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/NameIDMapper.java index 9d11cfd..dbead86 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/NameIDMapper.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/NameIDMapper.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.identity; +package org.apache.taverna.server.master.identity; /* * 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 java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.taverna.server.master.interfaces.LocalIdentityMapper; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.interfaces.LocalIdentityMapper; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * A trivial identity mapper that just uses the name out 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/identity/StrippedDownAuthProvider.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/StrippedDownAuthProvider.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/StrippedDownAuthProvider.java index dc489ae..39c1435 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/StrippedDownAuthProvider.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/StrippedDownAuthProvider.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.identity; +package org.apache.taverna.server.master.identity; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -38,7 +38,7 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.crypto.password.PasswordEncoder; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged; /** * A stripped down version 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/identity/User.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/User.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/User.java index 1fdf2bf..dafdf13 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/User.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/User.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.identity; +package org.apache.taverna.server.master.identity; /* * 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.identity; * limitations under the License. */ -import static org.taverna.server.master.common.Roles.ADMIN; -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.defaults.Default.AUTHORITY_PREFIX; +import static org.apache.taverna.server.master.common.Roles.ADMIN; +import static org.apache.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.defaults.Default.AUTHORITY_PREFIX; import java.util.ArrayList; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/UserStore.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/UserStore.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/UserStore.java index 3177d5c..3c70ea6 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/UserStore.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/UserStore.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.identity; +package org.apache.taverna.server.master.identity; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,10 +19,10 @@ package org.taverna.server.master.identity; */ import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.TavernaServer.JMX_ROOT; -import static org.taverna.server.master.common.Roles.ADMIN; -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.defaults.Default.AUTHORITY_PREFIX; +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.common.Roles.USER; +import static org.apache.taverna.server.master.defaults.Default.AUTHORITY_PREFIX; import java.util.ArrayList; import java.util.Collection; @@ -50,8 +50,8 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.core.userdetails.memory.UserAttribute; import org.springframework.security.core.userdetails.memory.UserAttributeEditor; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.JDOSupport; +import org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.JDOSupport; /** * The bean class that is responsible for managing the users in the database. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/UserStoreAPI.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/UserStoreAPI.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/UserStoreAPI.java index c4caf3c..aff3fa5 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/UserStoreAPI.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/UserStoreAPI.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.identity; +package org.apache.taverna.server.master.identity; /* * 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/identity/WorkflowInternalAuthProvider.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/WorkflowInternalAuthProvider.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/WorkflowInternalAuthProvider.java index c733d89..2a184ae 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/WorkflowInternalAuthProvider.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/WorkflowInternalAuthProvider.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.identity; +package org.apache.taverna.server.master.identity; /* * 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.identity; import static java.util.Collections.synchronizedMap; import static org.springframework.web.context.request.RequestContextHolder.currentRequestAttributes; -import static org.taverna.server.master.common.Roles.SELF; +import static org.apache.taverna.server.master.common.Roles.SELF; import java.net.InetAddress; import java.net.UnknownHostException; @@ -51,12 +51,12 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.security.web.authentication.WebAuthenticationDetails; import org.springframework.web.context.request.ServletRequestAttributes; -import org.taverna.server.master.exceptions.UnknownRunException; -import org.taverna.server.master.interfaces.LocalIdentityMapper; -import org.taverna.server.master.interfaces.RunStore; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.UsernamePrincipal; -import org.taverna.server.master.worker.RunDatabaseDAO; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.interfaces.LocalIdentityMapper; +import org.apache.taverna.server.master.interfaces.RunStore; +import org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.worker.RunDatabaseDAO; /** * A special authentication provider that allows a workflow to authenticate to http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/package-info.java index 14ad7db..17c525e 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/identity/package-info.java @@ -4,7 +4,7 @@ * Implementations of beans that map global user identities to local * usernames. */ -package org.taverna.server.master.identity; +package org.apache.taverna.server.master.identity; /* * 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/interaction/InteractionFeedSupport.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interaction/InteractionFeedSupport.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interaction/InteractionFeedSupport.java index 4b297dc..7ec09ba 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interaction/InteractionFeedSupport.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interaction/InteractionFeedSupport.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interaction; +package org.apache.taverna.server.master.interaction; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -52,16 +52,16 @@ import org.apache.abdera.model.Feed; import org.apache.abdera.parser.Parser; import org.apache.abdera.writer.Writer; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.TavernaServerSupport; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.NoDirectoryEntryException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.interfaces.Directory; -import org.taverna.server.master.interfaces.DirectoryEntry; -import org.taverna.server.master.interfaces.File; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.UriBuilderFactory; -import org.taverna.server.master.utils.FilenameUtils; +import org.apache.taverna.server.master.TavernaServerSupport; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.NoDirectoryEntryException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.interfaces.Directory; +import org.apache.taverna.server.master.interfaces.DirectoryEntry; +import org.apache.taverna.server.master.interfaces.File; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.UriBuilderFactory; +import org.apache.taverna.server.master.utils.FilenameUtils; /** * Bean that supports interaction feeds. This glues together the Abdera http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interaction/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interaction/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interaction/package-info.java index 54ec630..8870b56 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interaction/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interaction/package-info.java @@ -4,7 +4,7 @@ * This package contains the Atom feed implementation for interactions for a particular workflow run. * @author Donal Fellows */ -package org.taverna.server.master.interaction; +package org.apache.taverna.server.master.interaction; /* * 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/interfaces/Directory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Directory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Directory.java index bb74f5a..17ed631 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Directory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Directory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * 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 java.io.PipedInputStream; import java.security.Principal; import java.util.Collection; -import org.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; /** * Represents a directory that is the working directory of a workflow run, or 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/interfaces/DirectoryEntry.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/DirectoryEntry.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/DirectoryEntry.java index e1a0865..f3f10c6 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/DirectoryEntry.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/DirectoryEntry.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * 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.interfaces; import java.util.Date; -import org.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; /** * An entry in a {@link Directory} representing a file or sub-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/interfaces/File.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/File.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/File.java index 97510e4..baef235 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/File.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/File.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * 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.interfaces; * limitations under the License. */ -import org.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; /** * Represents a file in the working directory of a workflow instance run, or in http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Input.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Input.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Input.java index 5d92f67..1a797b4 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Input.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Input.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * 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.interfaces; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.taverna.server.master.common.Status; -import org.taverna.server.master.exceptions.BadStateChangeException; -import org.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.common.Status; +import org.apache.taverna.server.master.exceptions.BadStateChangeException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; /** * This represents the assignment of inputs to input ports of the workflow. Note http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Listener.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Listener.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Listener.java index 5fee6cc..e58d630 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Listener.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Listener.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * 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.interfaces; * limitations under the License. */ -import org.taverna.server.master.exceptions.BadPropertyValueException; -import org.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.exceptions.BadPropertyValueException; +import org.apache.taverna.server.master.exceptions.NoListenerException; /** * An event listener that can be attached to a {@link 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/interfaces/LocalIdentityMapper.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/LocalIdentityMapper.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/LocalIdentityMapper.java index becc55c..6e8bdef 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/LocalIdentityMapper.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/LocalIdentityMapper.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * 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.interfaces; * limitations under the License. */ -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * This interface describes how to map from the identity understood by 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/interfaces/MessageDispatcher.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/MessageDispatcher.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/MessageDispatcher.java index b3e0260..8062c62 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/MessageDispatcher.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/MessageDispatcher.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * 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/interfaces/Policy.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Policy.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Policy.java index b09e0bd..295b38e 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Policy.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/Policy.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,12 +21,12 @@ package org.taverna.server.master.interfaces; import java.net.URI; import java.util.List; -import org.taverna.server.master.common.Status; -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.utils.UsernamePrincipal; +import org.apache.taverna.server.master.common.Status; +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.utils.UsernamePrincipal; /** * Simple policy interface. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/RunStore.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/RunStore.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/RunStore.java index b0d817a..ded55e4 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/RunStore.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/RunStore.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,8 +20,8 @@ package org.taverna.server.master.interfaces; import java.util.Map; -import org.taverna.server.master.exceptions.UnknownRunException; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * Interface to the mechanism that looks after the mapping of names to 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/interfaces/SecurityContextFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/SecurityContextFactory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/SecurityContextFactory.java index a0cac79..0f0b702 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/SecurityContextFactory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/SecurityContextFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * 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.interfaces; import java.io.Serializable; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * How to create instances 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/interfaces/TavernaRun.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/TavernaRun.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/TavernaRun.java index 8d9a7f8..cf2094e 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/TavernaRun.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/TavernaRun.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,12 +22,12 @@ import java.io.Serializable; import java.util.Date; import java.util.List; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.common.Status; -import org.taverna.server.master.exceptions.BadStateChangeException; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.NoDestroyException; -import org.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.common.Status; +import org.apache.taverna.server.master.exceptions.BadStateChangeException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.NoDestroyException; +import org.apache.taverna.server.master.exceptions.UnknownRunException; /** * The interface to a taverna workflow run, or "run" for short. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/TavernaSecurityContext.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/TavernaSecurityContext.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/TavernaSecurityContext.java index 3f993df..9af5593 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/TavernaSecurityContext.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/TavernaSecurityContext.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,11 +27,11 @@ import javax.ws.rs.core.HttpHeaders; import javax.xml.ws.handler.MessageContext; import org.springframework.security.core.context.SecurityContext; -import org.taverna.server.localworker.remote.ImplementationException; -import org.taverna.server.master.common.Credential; -import org.taverna.server.master.common.Trust; -import org.taverna.server.master.exceptions.InvalidCredentialException; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.localworker.remote.ImplementationException; +import org.apache.taverna.server.master.common.Credential; +import org.apache.taverna.server.master.common.Trust; +import org.apache.taverna.server.master.exceptions.InvalidCredentialException; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * Security context for 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/interfaces/UriBuilderFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/UriBuilderFactory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/UriBuilderFactory.java index c4d0fb5..eda2f7d 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/UriBuilderFactory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/UriBuilderFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * 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/interfaces/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/package-info.java index 9c9b5b8..4e3b0d4 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/interfaces/package-info.java @@ -4,7 +4,7 @@ * Interfaces to the main worker classes that provide the magical power * that drives the webapp front-end. */ -package org.taverna.server.master.interfaces; +package org.apache.taverna.server.master.interfaces; /* * 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/localworker/AbstractRemoteRunFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/AbstractRemoteRunFactory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/AbstractRemoteRunFactory.java index 72004b4..06f4dff 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/AbstractRemoteRunFactory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/AbstractRemoteRunFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.localworker; +package org.apache.taverna.server.master.localworker; /* * 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.rmi.registry.LocateRegistry.createRegistry; import static java.rmi.registry.LocateRegistry.getRegistry; import static java.rmi.registry.Registry.REGISTRY_PORT; import static java.util.UUID.randomUUID; -import static org.taverna.server.master.TavernaServer.JMX_ROOT; -import static org.taverna.server.master.rest.TavernaServerRunREST.PathNames.DIR; +import static org.apache.taverna.server.master.TavernaServer.JMX_ROOT; +import static org.apache.taverna.server.master.rest.TavernaServerRunREST.PathNames.DIR; import java.io.IOException; import java.io.ObjectInputStream; @@ -51,25 +51,25 @@ import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.jmx.export.annotation.ManagedResource; -import org.taverna.server.localworker.remote.RemoteRunFactory; -import org.taverna.server.localworker.remote.RemoteSingleRun; -import org.taverna.server.localworker.server.UsageRecordReceiver; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.exceptions.NoCreateException; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.factories.ListenerFactory; -import org.taverna.server.master.factories.RunFactory; -import org.taverna.server.master.interaction.InteractionFeedSupport; -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.UriBuilderFactory; -import org.taverna.server.master.notification.atom.EventDAO; -import org.taverna.server.master.usage.UsageRecordRecorder; -import org.taverna.server.master.utils.UsernamePrincipal; -import org.taverna.server.master.worker.FactoryBean; -import org.taverna.server.master.worker.RemoteRunDelegate; -import org.taverna.server.master.worker.RunFactoryConfiguration; +import org.apache.taverna.server.localworker.remote.RemoteRunFactory; +import org.apache.taverna.server.localworker.remote.RemoteSingleRun; +import org.apache.taverna.server.localworker.server.UsageRecordReceiver; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.factories.ListenerFactory; +import org.apache.taverna.server.master.factories.RunFactory; +import org.apache.taverna.server.master.interaction.InteractionFeedSupport; +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.UriBuilderFactory; +import org.apache.taverna.server.master.notification.atom.EventDAO; +import org.apache.taverna.server.master.usage.UsageRecordRecorder; +import org.apache.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.worker.FactoryBean; +import org.apache.taverna.server.master.worker.RemoteRunDelegate; +import org.apache.taverna.server.master.worker.RunFactoryConfiguration; import org.apache.taverna.scufl2.api.io.WriterException; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/ForkRunFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/ForkRunFactory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/ForkRunFactory.java index 3f48644..9c2031f 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/ForkRunFactory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/ForkRunFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.localworker; +package org.apache.taverna.server.master.localworker; /* * 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.Thread.sleep; import static java.util.Arrays.asList; import static java.util.Calendar.SECOND; import static java.util.UUID.randomUUID; -import static org.taverna.server.master.TavernaServer.JMX_ROOT; +import static org.apache.taverna.server.master.TavernaServer.JMX_ROOT; import java.io.File; import java.rmi.ConnectException; @@ -40,12 +40,12 @@ import javax.xml.bind.JAXBException; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedResource; -import org.taverna.server.localworker.remote.RemoteRunFactory; -import org.taverna.server.localworker.remote.RemoteSingleRun; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.exceptions.NoCreateException; -import org.taverna.server.master.factories.ConfigurableRunFactory; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.localworker.remote.RemoteRunFactory; +import org.apache.taverna.server.localworker.remote.RemoteSingleRun; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.factories.ConfigurableRunFactory; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * A simple factory for workflow runs that forks runs from a subprocess. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/IdAwareForkRunFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/IdAwareForkRunFactory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/IdAwareForkRunFactory.java index a2e5ff7..ca6ed3a 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/IdAwareForkRunFactory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/IdAwareForkRunFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.localworker; +package org.apache.taverna.server.master.localworker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,8 +23,8 @@ import static java.lang.Thread.sleep; import static java.util.Arrays.asList; import static java.util.Calendar.SECOND; import static java.util.UUID.randomUUID; -import static org.taverna.server.master.TavernaServer.JMX_ROOT; -import static org.taverna.server.master.localworker.AbstractRemoteRunFactory.launchSubprocess; +import static org.apache.taverna.server.master.TavernaServer.JMX_ROOT; +import static org.apache.taverna.server.master.localworker.AbstractRemoteRunFactory.launchSubprocess; import java.io.BufferedWriter; import java.io.File; @@ -55,13 +55,13 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.core.annotation.Order; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedResource; -import org.taverna.server.localworker.remote.RemoteRunFactory; -import org.taverna.server.localworker.remote.RemoteSingleRun; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.exceptions.NoCreateException; -import org.taverna.server.master.factories.ConfigurableRunFactory; -import org.taverna.server.master.interfaces.LocalIdentityMapper; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.localworker.remote.RemoteRunFactory; +import org.apache.taverna.server.localworker.remote.RemoteSingleRun; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.factories.ConfigurableRunFactory; +import org.apache.taverna.server.master.interfaces.LocalIdentityMapper; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * A simple factory for workflow runs that forks runs from a subprocess. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/LocalWorkerFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/LocalWorkerFactory.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/LocalWorkerFactory.java index 803c201..8509b0a 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/LocalWorkerFactory.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/LocalWorkerFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.localworker; +package org.apache.taverna.server.master.localworker; /* * 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/localworker/LocalWorkerState.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/LocalWorkerState.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/LocalWorkerState.java index e32dcca..7df1e3b 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/LocalWorkerState.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/LocalWorkerState.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.localworker; +package org.apache.taverna.server.master.localworker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,18 +24,18 @@ import static java.rmi.registry.Registry.REGISTRY_PORT; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.unmodifiableList; -import static org.taverna.server.master.defaults.Default.EXTRA_ARGUMENTS; -import static org.taverna.server.master.defaults.Default.PASSWORD_FILE; -import static org.taverna.server.master.defaults.Default.REGISTRY_JAR; -import static org.taverna.server.master.defaults.Default.RMI_PREFIX; -import static org.taverna.server.master.defaults.Default.RUN_LIFE_MINUTES; -import static org.taverna.server.master.defaults.Default.RUN_OPERATING_LIMIT; -import static org.taverna.server.master.defaults.Default.SECURE_FORK_IMPLEMENTATION_JAR; -import static org.taverna.server.master.defaults.Default.SERVER_WORKER_IMPLEMENTATION_JAR; -import static org.taverna.server.master.defaults.Default.SUBPROCESS_START_POLL_SLEEP; -import static org.taverna.server.master.defaults.Default.SUBPROCESS_START_WAIT; -import static org.taverna.server.master.localworker.PersistedState.KEY; -import static org.taverna.server.master.localworker.PersistedState.makeInstance; +import static org.apache.taverna.server.master.defaults.Default.EXTRA_ARGUMENTS; +import static org.apache.taverna.server.master.defaults.Default.PASSWORD_FILE; +import static org.apache.taverna.server.master.defaults.Default.REGISTRY_JAR; +import static org.apache.taverna.server.master.defaults.Default.RMI_PREFIX; +import static org.apache.taverna.server.master.defaults.Default.RUN_LIFE_MINUTES; +import static org.apache.taverna.server.master.defaults.Default.RUN_OPERATING_LIMIT; +import static org.apache.taverna.server.master.defaults.Default.SECURE_FORK_IMPLEMENTATION_JAR; +import static org.apache.taverna.server.master.defaults.Default.SERVER_WORKER_IMPLEMENTATION_JAR; +import static org.apache.taverna.server.master.defaults.Default.SUBPROCESS_START_POLL_SLEEP; +import static org.apache.taverna.server.master.defaults.Default.SUBPROCESS_START_WAIT; +import static org.apache.taverna.server.master.localworker.PersistedState.KEY; +import static org.apache.taverna.server.master.localworker.PersistedState.makeInstance; import java.io.File; import java.io.FilenameFilter; @@ -46,10 +46,10 @@ import javax.annotation.PostConstruct; import javax.jdo.annotations.PersistenceAware; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.common.Status; -import org.taverna.server.master.defaults.Default; -import org.taverna.server.master.utils.JDOSupport; -import org.taverna.server.master.worker.WorkerModel; +import org.apache.taverna.server.master.common.Status; +import org.apache.taverna.server.master.defaults.Default; +import org.apache.taverna.server.master.utils.JDOSupport; +import org.apache.taverna.server.master.worker.WorkerModel; /** * The persistent state of a local worker 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/localworker/PersistedState.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/PersistedState.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/PersistedState.java index 3ed4c51..b36e4ca 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/PersistedState.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/PersistedState.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.localworker; +package org.apache.taverna.server.master.localworker; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,7 +27,7 @@ import javax.jdo.annotations.PersistenceCapable; import javax.jdo.annotations.Persistent; import javax.jdo.annotations.PrimaryKey; -import org.taverna.server.master.worker.WorkerModel; +import org.apache.taverna.server.master.worker.WorkerModel; /** * The actual database connector for persisted local worker state. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/StreamLogger.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/StreamLogger.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/StreamLogger.java index e563965..c34764e 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/StreamLogger.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/StreamLogger.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.localworker; +package org.apache.taverna.server.master.localworker; /* * 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/localworker/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/package-info.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/package-info.java index 031ce34..34c22c5 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/package-info.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/localworker/package-info.java @@ -4,7 +4,7 @@ * Implementation of a Taverna Server back-end that works by forking off * workflow executors on the local system. */ -package org.taverna.server.master.localworker; +package org.apache.taverna.server.master.localworker; /* * 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/notification/EmailDispatcher.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/EmailDispatcher.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/EmailDispatcher.java index 2a51496..6ea2ba6 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/EmailDispatcher.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/EmailDispatcher.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.notification; +package org.apache.taverna.server.master.notification; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/JabberDispatcher.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/JabberDispatcher.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/JabberDispatcher.java index 711f4e6..f08aebe 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/JabberDispatcher.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/JabberDispatcher.java @@ -1,7 +1,7 @@ /* */ -package org.taverna.server.master.notification; +package org.apache.taverna.server.master.notification; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -29,8 +29,8 @@ import org.jivesoftware.smack.ConnectionConfiguration; import org.jivesoftware.smack.MessageListener; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.Message; -import org.taverna.server.master.interfaces.MessageDispatcher; -import org.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.MessageDispatcher; +import org.apache.taverna.server.master.interfaces.TavernaRun; /** * Send notifications by Jabber/XMPP. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/NotificationEngine.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/NotificationEngine.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/NotificationEngine.java index 067d154..8017524 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/NotificationEngine.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/NotificationEngine.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.notification; +package org.apache.taverna.server.master.notification; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -28,8 +28,8 @@ import java.util.Map; 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.MessageDispatcher; -import org.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.MessageDispatcher; +import org.apache.taverna.server.master.interfaces.TavernaRun; /** * A common object for handling dispatch of event-driven messages. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/RateLimitedDispatcher.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/RateLimitedDispatcher.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/RateLimitedDispatcher.java index a41e23b..6a2a585 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/RateLimitedDispatcher.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/RateLimitedDispatcher.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.notification; +package org.apache.taverna.server.master.notification; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; -import org.taverna.server.master.interfaces.MessageDispatcher; -import org.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.MessageDispatcher; +import org.apache.taverna.server.master.interfaces.TavernaRun; /** * Rate-limiting support. Some message fabrics simply should not be used to send http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/SMSDispatcher.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/SMSDispatcher.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/SMSDispatcher.java index 559f111..f121619 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/SMSDispatcher.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/SMSDispatcher.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.notification; +package org.apache.taverna.server.master.notification; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,7 +18,7 @@ package org.taverna.server.master.notification; * limitations under the License. */ -import static org.taverna.server.master.defaults.Default.SMS_GATEWAY_URL; +import static org.apache.taverna.server.master.defaults.Default.SMS_GATEWAY_URL; import java.io.BufferedReader; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/TwitterDispatcher.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/TwitterDispatcher.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/TwitterDispatcher.java index a0269a5..2bdd246 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/TwitterDispatcher.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/TwitterDispatcher.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.notification; +package org.apache.taverna.server.master.notification; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/AtomFeed.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/AtomFeed.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/AtomFeed.java index eda6d9d..3d78cae 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/AtomFeed.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/AtomFeed.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.notification.atom; +package org.apache.taverna.server.master.notification.atom; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,8 +21,8 @@ package org.taverna.server.master.notification.atom; import static java.lang.String.format; import static java.util.UUID.randomUUID; import static javax.ws.rs.core.UriBuilder.fromUri; -import static org.taverna.server.master.common.Roles.USER; -import static org.taverna.server.master.common.Uri.secure; +import static org.apache.taverna.server.master.common.Roles.USER; +import static org.apache.taverna.server.master.common.Uri.secure; import java.net.URI; import java.util.Date; @@ -37,11 +37,11 @@ import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; import org.springframework.beans.factory.annotation.Required; import org.springframework.web.context.ServletContextAware; -import org.taverna.server.master.TavernaServerSupport; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.UriBuilderFactory; -import org.taverna.server.master.rest.TavernaServerREST.EventFeed; -import org.taverna.server.master.utils.InvocationCounter.CallCounted; +import org.apache.taverna.server.master.TavernaServerSupport; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.UriBuilderFactory; +import org.apache.taverna.server.master.rest.TavernaServerREST.EventFeed; +import org.apache.taverna.server.master.utils.InvocationCounter.CallCounted; /** * Simple REST handler that allows an Atom feed to be served up of events http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/Event.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/Event.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/Event.java index f1a9d62..45e6767 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/Event.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/Event.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.notification.atom; +package org.apache.taverna.server.master.notification.atom; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -34,7 +34,7 @@ import javax.jdo.annotations.Query; import org.apache.abdera.Abdera; import org.apache.abdera.model.Entry; import org.joda.time.DateTime; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * Parent class of all events that may appear on the feed for 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/notification/atom/EventDAO.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/EventDAO.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/EventDAO.java index 8bec456..dd49c91 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/EventDAO.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/notification/atom/EventDAO.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.notification.atom; +package org.apache.taverna.server.master.notification.atom; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -37,11 +37,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.interfaces.MessageDispatcher; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.UriBuilderFactory; -import org.taverna.server.master.utils.JDOSupport; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.interfaces.MessageDispatcher; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.UriBuilderFactory; +import org.apache.taverna.server.master.utils.JDOSupport; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * The database interface that supports the event feed.
