package org.apache.taverna.server.*
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/46777e2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/46777e2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/46777e2c Branch: refs/heads/master Commit: 46777e2c6624c382edfd65949ab515cafd1c7e37 Parents: 00397ef Author: Stian Soiland-Reyes <[email protected]> Authored: Tue Jan 9 23:23:09 2018 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Tue Jan 9 23:23:58 2018 +0000 ---------------------------------------------------------------------- pom.xml | 36 ++--- .../server/port_description/AbsentValue.java | 2 +- .../server/port_description/AbstractPort.java | 4 +- .../AbstractPortDescription.java | 2 +- .../server/port_description/AbstractValue.java | 4 +- .../server/port_description/ErrorValue.java | 4 +- .../port_description/InputDescription.java | 4 +- .../server/port_description/LeafValue.java | 2 +- .../server/port_description/ListValue.java | 4 +- .../server/port_description/Namespaces.java | 2 +- .../port_description/OutputDescription.java | 2 +- .../server/port_description/package-info.java | 8 +- .../port_description/utils/IntAdapter.java | 2 +- .../server/port_description/JaxbSanityTest.java | 2 +- taverna-server-rmidaemon/pom.xml | 2 +- .../taverna/server/rmidaemon/Registry.java | 2 +- .../taverna/server/rmidaemon/package-info.java | 2 +- .../remote/IllegalStateTransitionException.java | 2 +- .../remote/ImplementationException.java | 2 +- .../localworker/remote/RemoteDirectory.java | 2 +- .../remote/RemoteDirectoryEntry.java | 2 +- .../server/localworker/remote/RemoteFile.java | 2 +- .../server/localworker/remote/RemoteInput.java | 2 +- .../localworker/remote/RemoteListener.java | 2 +- .../localworker/remote/RemoteRunFactory.java | 4 +- .../remote/RemoteSecurityContext.java | 2 +- .../localworker/remote/RemoteSingleRun.java | 2 +- .../server/localworker/remote/RemoteStatus.java | 2 +- .../remote/StillWorkingOnItException.java | 2 +- .../server/localworker/remote/package-info.java | 2 +- .../localworker/server/UsageRecordReceiver.java | 2 +- .../server/localworker/server/package-info.java | 2 +- taverna-server-unix-forker/pom.xml | 2 +- .../taverna/server/unixforker/Forker.java | 2 +- taverna-server-webapp/pom.xml | 12 +- .../master/ContentsDescriptorBuilder.java | 40 +++--- .../taverna/server/master/DirectoryREST.java | 48 +++---- .../server/master/FileConcatenation.java | 6 +- .../apache/taverna/server/master/InputREST.java | 44 +++---- .../taverna/server/master/InteractionFeed.java | 26 ++-- .../server/master/ListenerPropertyREST.java | 20 +-- .../taverna/server/master/ListenersREST.java | 24 ++-- .../taverna/server/master/ManagementState.java | 6 +- .../apache/taverna/server/master/RunREST.java | 56 ++++---- .../taverna/server/master/RunSecurityREST.java | 32 ++--- .../server/master/SingleListenerREST.java | 24 ++-- .../taverna/server/master/TavernaServer.java | 132 +++++++++---------- .../server/master/TavernaServerSupport.java | 70 +++++----- .../taverna/server/master/admin/Admin.java | 74 +++++------ .../taverna/server/master/admin/AdminBean.java | 26 ++-- .../server/master/admin/package-info.java | 18 +-- .../taverna/server/master/api/ContentTypes.java | 2 +- .../server/master/api/DirectoryBean.java | 8 +- .../taverna/server/master/api/FeedBean.java | 6 +- .../taverna/server/master/api/InputBean.java | 12 +- .../server/master/api/ListenerPropertyBean.java | 8 +- .../server/master/api/ListenersBean.java | 6 +- .../server/master/api/ManagementModel.java | 2 +- .../server/master/api/OneListenerBean.java | 8 +- .../taverna/server/master/api/RunBean.java | 8 +- .../taverna/server/master/api/SecurityBean.java | 8 +- .../taverna/server/master/api/SupportAware.java | 4 +- .../server/master/api/TavernaServerBean.java | 24 ++-- .../taverna/server/master/api/package-info.java | 2 +- .../server/master/common/Capability.java | 2 +- .../server/master/common/Credential.java | 4 +- .../server/master/common/DirEntryReference.java | 8 +- .../server/master/common/InputDescription.java | 6 +- .../server/master/common/Namespaces.java | 2 +- .../server/master/common/Permission.java | 4 +- .../server/master/common/ProfileList.java | 2 +- .../taverna/server/master/common/Roles.java | 2 +- .../server/master/common/RunReference.java | 10 +- .../taverna/server/master/common/Status.java | 2 +- .../taverna/server/master/common/Trust.java | 4 +- .../taverna/server/master/common/Uri.java | 4 +- .../server/master/common/VersionedElement.java | 4 +- .../taverna/server/master/common/Workflow.java | 14 +- .../server/master/common/package-info.java | 14 +- .../server/master/common/version/Version.java | 6 +- .../taverna/server/master/defaults/Default.java | 6 +- .../server/master/defaults/package-info.java | 2 +- .../exceptions/BadInputPortNameException.java | 2 +- .../exceptions/BadPropertyValueException.java | 2 +- .../exceptions/BadStateChangeException.java | 2 +- .../exceptions/FilesystemAccessException.java | 2 +- .../exceptions/GeneralFailureException.java | 4 +- .../exceptions/InvalidCredentialException.java | 2 +- .../master/exceptions/NoCreateException.java | 2 +- .../exceptions/NoCredentialException.java | 2 +- .../master/exceptions/NoDestroyException.java | 2 +- .../exceptions/NoDirectoryEntryException.java | 2 +- .../master/exceptions/NoListenerException.java | 2 +- .../master/exceptions/NoUpdateException.java | 2 +- .../master/exceptions/NotOwnerException.java | 2 +- .../master/exceptions/OverloadedException.java | 2 +- .../master/exceptions/UnknownRunException.java | 2 +- .../server/master/exceptions/package-info.java | 14 +- .../taverna/server/master/facade/Facade.java | 4 +- .../server/master/facade/package-info.java | 2 +- .../factories/ConfigurableRunFactory.java | 2 +- .../master/factories/ListenerFactory.java | 8 +- .../server/master/factories/RunFactory.java | 10 +- .../server/master/factories/package-info.java | 2 +- .../identity/AuthorityDerivedIDMapper.java | 8 +- .../master/identity/CompositeIDMapper.java | 6 +- .../master/identity/ConstantIDMapper.java | 6 +- .../server/master/identity/NameIDMapper.java | 6 +- .../identity/StrippedDownAuthProvider.java | 4 +- .../taverna/server/master/identity/User.java | 8 +- .../server/master/identity/UserStore.java | 14 +- .../server/master/identity/UserStoreAPI.java | 2 +- .../identity/WorkflowInternalAuthProvider.java | 16 +-- .../server/master/identity/package-info.java | 2 +- .../interaction/InteractionFeedSupport.java | 22 ++-- .../server/master/interaction/package-info.java | 2 +- .../server/master/interfaces/Directory.java | 4 +- .../master/interfaces/DirectoryEntry.java | 4 +- .../taverna/server/master/interfaces/File.java | 4 +- .../taverna/server/master/interfaces/Input.java | 8 +- .../server/master/interfaces/Listener.java | 6 +- .../master/interfaces/LocalIdentityMapper.java | 4 +- .../master/interfaces/MessageDispatcher.java | 2 +- .../server/master/interfaces/Policy.java | 14 +- .../server/master/interfaces/RunStore.java | 6 +- .../interfaces/SecurityContextFactory.java | 4 +- .../server/master/interfaces/TavernaRun.java | 14 +- .../interfaces/TavernaSecurityContext.java | 12 +- .../master/interfaces/UriBuilderFactory.java | 2 +- .../server/master/interfaces/package-info.java | 2 +- .../localworker/AbstractRemoteRunFactory.java | 44 +++---- .../master/localworker/ForkRunFactory.java | 16 +-- .../localworker/IdAwareForkRunFactory.java | 20 +-- .../master/localworker/LocalWorkerFactory.java | 2 +- .../master/localworker/LocalWorkerState.java | 34 ++--- .../master/localworker/PersistedState.java | 4 +- .../server/master/localworker/StreamLogger.java | 2 +- .../server/master/localworker/package-info.java | 2 +- .../master/notification/EmailDispatcher.java | 2 +- .../master/notification/JabberDispatcher.java | 6 +- .../master/notification/NotificationEngine.java | 6 +- .../notification/RateLimitedDispatcher.java | 6 +- .../master/notification/SMSDispatcher.java | 4 +- .../master/notification/TwitterDispatcher.java | 2 +- .../master/notification/atom/AtomFeed.java | 16 +-- .../server/master/notification/atom/Event.java | 4 +- .../master/notification/atom/EventDAO.java | 12 +- .../master/notification/atom/package-info.java | 14 +- .../master/notification/package-info.java | 2 +- .../taverna/server/master/package-info.java | 2 +- .../server/master/rest/ContentTypes.java | 2 +- .../server/master/rest/DirectoryContents.java | 8 +- .../taverna/server/master/rest/FileSegment.java | 6 +- .../server/master/rest/InteractionFeedREST.java | 10 +- .../server/master/rest/ListenerDefinition.java | 2 +- .../master/rest/MakeOrUpdateDirEntry.java | 2 +- .../master/rest/TavernaServerDirectoryREST.java | 24 ++-- .../master/rest/TavernaServerInputREST.java | 36 ++--- .../master/rest/TavernaServerListenersREST.java | 22 ++-- .../server/master/rest/TavernaServerREST.java | 58 ++++---- .../master/rest/TavernaServerRunREST.java | 88 ++++++------- .../master/rest/TavernaServerSecurityREST.java | 46 +++---- .../rest/handler/AccessDeniedHandler.java | 2 +- .../rest/handler/BadInputPortNameHandler.java | 4 +- .../rest/handler/BadPropertyValueHandler.java | 4 +- .../rest/handler/BadStateChangeHandler.java | 4 +- .../master/rest/handler/EntryHandler.java | 2 +- .../server/master/rest/handler/FeedHandler.java | 2 +- .../rest/handler/FileConcatenationHandler.java | 8 +- .../master/rest/handler/FileMessageHandler.java | 6 +- .../master/rest/handler/FileSegmentHandler.java | 6 +- .../rest/handler/FilesystemAccessHandler.java | 4 +- .../rest/handler/GeneralFailureHandler.java | 4 +- .../server/master/rest/handler/HandlerCore.java | 4 +- .../rest/handler/IllegalArgumentHandler.java | 2 +- .../handler/ImplementationProblemHandler.java | 4 +- .../rest/handler/InputStreamMessageHandler.java | 2 +- .../rest/handler/InvalidCredentialHandler.java | 4 +- .../rest/handler/JAXBExceptionHandler.java | 2 +- .../rest/handler/NegotiationFailedHandler.java | 4 +- .../master/rest/handler/NoCreateHandler.java | 4 +- .../rest/handler/NoCredentialHandler.java | 4 +- .../master/rest/handler/NoDestroyHandler.java | 4 +- .../rest/handler/NoDirectoryEntryHandler.java | 4 +- .../master/rest/handler/NoListenerHandler.java | 4 +- .../master/rest/handler/NoUpdateHandler.java | 4 +- .../master/rest/handler/NotOwnerHandler.java | 4 +- .../master/rest/handler/OverloadedHandler.java | 4 +- .../master/rest/handler/PermissionHandler.java | 4 +- .../rest/handler/Scufl2DocumentHandler.java | 4 +- .../rest/handler/T2FlowDocumentHandler.java | 4 +- .../master/rest/handler/URIListHandler.java | 4 +- .../master/rest/handler/UnknownRunHandler.java | 4 +- .../master/rest/handler/ZipStreamHandler.java | 6 +- .../master/rest/handler/package-info.java | 16 +-- .../server/master/rest/package-info.java | 16 +-- .../taverna/server/master/soap/DirEntry.java | 6 +- .../server/master/soap/FileContents.java | 6 +- .../server/master/soap/PermissionList.java | 4 +- .../server/master/soap/TavernaServerSOAP.java | 56 ++++---- .../server/master/soap/WrappedWorkflow.java | 4 +- .../server/master/soap/ZippedDirectory.java | 8 +- .../server/master/soap/package-info.java | 16 +-- .../server/master/usage/UsageRecord.java | 2 +- .../master/usage/UsageRecordRecorder.java | 8 +- .../server/master/usage/package-info.java | 2 +- .../server/master/utils/CallTimeLogger.java | 8 +- .../server/master/utils/CallTimingFilter.java | 2 +- .../server/master/utils/CapabilityLister.java | 4 +- .../master/utils/CertificateChainFetcher.java | 2 +- .../server/master/utils/Contextualizer.java | 4 +- .../taverna/server/master/utils/DerbyUtils.java | 2 +- .../server/master/utils/FilenameUtils.java | 16 +-- .../utils/FlushThreadLocalCacheInterceptor.java | 2 +- .../server/master/utils/InvocationCounter.java | 4 +- .../taverna/server/master/utils/JCECheck.java | 2 +- .../taverna/server/master/utils/JDOSupport.java | 4 +- .../master/utils/LoggingDerbyAdapter.java | 2 +- .../server/master/utils/OneShotThread.java | 2 +- .../taverna/server/master/utils/RestUtils.java | 2 +- .../master/utils/RuntimeExceptionWrapper.java | 6 +- .../server/master/utils/UsernamePrincipal.java | 2 +- .../utils/WSDLHeadOptionsInterceptor.java | 2 +- .../master/utils/WebappAwareDataSource.java | 4 +- .../taverna/server/master/utils/X500Utils.java | 2 +- .../server/master/utils/package-info.java | 2 +- .../master/worker/CompletionNotifier.java | 2 +- .../server/master/worker/FactoryBean.java | 4 +- .../server/master/worker/PasswordIssuer.java | 2 +- .../server/master/worker/PolicyImpl.java | 22 ++-- .../server/master/worker/PolicyLimits.java | 4 +- .../server/master/worker/RemoteRunDelegate.java | 60 ++++----- .../server/master/worker/RunConnection.java | 28 ++-- .../server/master/worker/RunDBSupport.java | 4 +- .../server/master/worker/RunDatabase.java | 20 +-- .../server/master/worker/RunDatabaseDAO.java | 14 +- .../master/worker/RunFactoryConfiguration.java | 10 +- .../master/worker/SecurityContextDelegate.java | 30 ++--- .../worker/SecurityContextDelegateImpl.java | 12 +- .../master/worker/SecurityContextFactory.java | 16 +-- .../SimpleFormattedCompletionNotifier.java | 4 +- .../worker/VelocityCompletionNotifier.java | 10 +- .../server/master/worker/WorkerModel.java | 4 +- .../server/master/worker/package-info.java | 2 +- .../src/main/webapp/META-INF/persistence.xml | 12 +- .../src/main/webapp/WEB-INF/beans.xml | 120 ++++++++--------- .../src/main/webapp/WEB-INF/insecure.xml | 2 +- .../src/main/webapp/WEB-INF/partsecure.xml | 2 +- .../src/main/webapp/WEB-INF/providers.xml | 60 ++++----- .../src/main/webapp/WEB-INF/webappBeans.xml | 10 +- .../taverna/server/master/JaxbSanityTest.java | 72 +++++----- .../server/master/TavernaServerImplTest.java | 26 ++-- .../master/WorkflowSerializationTest.java | 8 +- .../taverna/server/master/mocks/ExampleRun.java | 38 +++--- .../taverna/server/master/mocks/MockPolicy.java | 14 +- .../master/mocks/SimpleListenerFactory.java | 10 +- .../mocks/SimpleNonpersistentRunStore.java | 14 +- .../server/master/mocks/SimpleServerPolicy.java | 16 +-- .../src/test/resources/example.xml | 12 +- taverna-server-worker/pom.xml | 2 +- .../server/localworker/api/Constants.java | 2 +- .../server/localworker/api/RunAccounting.java | 2 +- .../taverna/server/localworker/api/Worker.java | 12 +- .../server/localworker/api/WorkerFactory.java | 2 +- .../localworker/impl/DirectoryDelegate.java | 10 +- .../server/localworker/impl/FileDelegate.java | 6 +- .../server/localworker/impl/LocalWorker.java | 52 ++++---- .../localworker/impl/TavernaRunManager.java | 26 ++-- .../server/localworker/impl/WorkerCore.java | 60 ++++----- .../impl/utils/FilenameVerifier.java | 2 +- .../localworker/impl/utils/TimingOutTask.java | 2 +- .../localworker/impl/LocalWorkerTest.java | 22 ++-- 272 files changed, 1470 insertions(+), 1470 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8aa2d4c..dd76635 100644 --- a/pom.xml +++ b/pom.xml @@ -319,39 +319,39 @@ executing.</description> <groups> <group> <title>Server Core WebService</title> - <packages>org.taverna.server.master:org.taverna.server.master.common:org.taverna.server.master.facade:org.taverna.server.master.rest:org.taverna.server.master.rest.handler:org.taverna.server.master.soap</packages> + <packages>org.apache.taverna.server.master:org.apache.taverna.server.master.common:org.apache.taverna.server.master.facade:org.apache.taverna.server.master.rest:org.apache.taverna.server.master.rest.handler:org.apache.taverna.server.master.soap</packages> </group> <group> <title>Default Values and Administration</title> - <packages>org.taverna.server.master.admin:org.taverna.server.master.defaults</packages> + <packages>org.apache.taverna.server.master.admin:org.apache.taverna.server.master.defaults</packages> </group> <group> <title>Server SPI</title> - <packages>org.taverna.server.master.exceptions:org.taverna.server.master.factories:org.taverna.server.master.interfaces</packages> + <packages>org.apache.taverna.server.master.exceptions:org.apache.taverna.server.master.factories:org.apache.taverna.server.master.interfaces</packages> </group> <group> <title>Notification and Accounting</title> - <packages>org.taverna.server.master.interaction:org.taverna.server.master.notification:org.taverna.server.master.notification.atom:org.taverna.server.master.usage</packages> + <packages>org.apache.taverna.server.master.interaction:org.apache.taverna.server.master.notification:org.apache.taverna.server.master.notification.atom:org.apache.taverna.server.master.usage</packages> </group> <group> <title>Server Coupling to RMI Back End</title> - <packages>org.taverna.server.master.identity:org.taverna.server.master.localworker:org.taverna.server.master.worker</packages> + <packages>org.apache.taverna.server.master.identity:org.apache.taverna.server.master.localworker:org.apache.taverna.server.master.worker</packages> </group> <group> <title>Server RMI Interface to Back End</title> - <packages>org.taverna.server.localworker.remote:org.taverna.server.localworker.server</packages> + <packages>org.apache.taverna.server.localworker.remote:org.apache.taverna.server.localworker.server</packages> </group> <group> <title>Externally-Defined Document Formats</title> - <packages>org.taverna.server.port_description:org.apache.taverna.server.usagerecord:org.apache.taverna.server.usagerecord.xml.urf:org.apache.taverna.server.usagerecord.xml.dsig</packages> + <packages>org.apache.taverna.server.port_description:org.apache.taverna.server.usagerecord:org.apache.taverna.server.usagerecord.xml.urf:org.apache.taverna.server.usagerecord.xml.dsig</packages> </group> <group> <title>Server Back End Factory Coupling to Command Line Executor</title> - <packages>org.taverna.server.localworker.impl:org.taverna.server.unixforker:org.taverna.server.winforker</packages> + <packages>org.apache.taverna.server.localworker.impl:org.apache.taverna.server.unixforker:org.apache.taverna.server.winforker</packages> </group> <group> <title>Utilities</title> - <packages>org.taverna.server.master.utils:org.taverna.server.localworker.impl.utils</packages> + <packages>org.apache.taverna.server.master.utils:org.apache.taverna.server.localworker.impl.utils</packages> </group> </groups> <detectJavaApiLink>true</detectJavaApiLink> @@ -410,39 +410,39 @@ executing.</description> <groups> <group> <title>Server Core WebService</title> - <packages>org.taverna.server.master:org.taverna.server.master.common:org.taverna.server.master.facade:org.taverna.server.master.rest:org.taverna.server.master.rest.handler:org.taverna.server.master.soap</packages> + <packages>org.apache.taverna.server.master:org.apache.taverna.server.master.common:org.apache.taverna.server.master.facade:org.apache.taverna.server.master.rest:org.apache.taverna.server.master.rest.handler:org.apache.taverna.server.master.soap</packages> </group> <group> <title>Default Values and Administration</title> - <packages>org.taverna.server.master.admin:org.taverna.server.master.defaults</packages> + <packages>org.apache.taverna.server.master.admin:org.apache.taverna.server.master.defaults</packages> </group> <group> <title>Server SPI</title> - <packages>org.taverna.server.master.exceptions:org.taverna.server.master.factories:org.taverna.server.master.interfaces</packages> + <packages>org.apache.taverna.server.master.exceptions:org.apache.taverna.server.master.factories:org.apache.taverna.server.master.interfaces</packages> </group> <group> <title>Notification and Accounting</title> - <packages>org.taverna.server.master.interaction:org.taverna.server.master.notification:org.taverna.server.master.notification.atom:org.taverna.server.master.usage</packages> + <packages>org.apache.taverna.server.master.interaction:org.apache.taverna.server.master.notification:org.apache.taverna.server.master.notification.atom:org.apache.taverna.server.master.usage</packages> </group> <group> <title>Server Coupling to RMI Back End</title> - <packages>org.taverna.server.master.identity:org.taverna.server.master.localworker:org.taverna.server.master.worker</packages> + <packages>org.apache.taverna.server.master.identity:org.apache.taverna.server.master.localworker:org.apache.taverna.server.master.worker</packages> </group> <group> <title>Server RMI Interface to Back End</title> - <packages>org.taverna.server.localworker.remote:org.taverna.server.localworker.server</packages> + <packages>org.apache.taverna.server.localworker.remote:org.apache.taverna.server.localworker.server</packages> </group> <group> <title>Externally-Defined Document Formats</title> - <packages>org.taverna.server.port_description:org.apache.taverna.server.usagerecord:org.apache.taverna.server.usagerecord.xml.urf:org.apache.taverna.server.usagerecord.xml.dsig</packages> + <packages>org.apache.taverna.server.port_description:org.apache.taverna.server.usagerecord:org.apache.taverna.server.usagerecord.xml.urf:org.apache.taverna.server.usagerecord.xml.dsig</packages> </group> <group> <title>Server Back End Factory Coupling to Command Line Executor</title> - <packages>org.taverna.server.localworker.impl:org.taverna.server.unixforker:org.taverna.server.winforker</packages> + <packages>org.apache.taverna.server.localworker.impl:org.apache.taverna.server.unixforker:org.apache.taverna.server.winforker</packages> </group> <group> <title>Utilities</title> - <packages>org.taverna.server.master.utils:org.taverna.server.localworker.impl.utils</packages> + <packages>org.apache.taverna.server.master.utils:org.apache.taverna.server.localworker.impl.utils</packages> </group> </groups> <detectJavaApiLink>true</detectJavaApiLink> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbsentValue.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbsentValue.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbsentValue.java index 140d6a5..11d194c 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbsentValue.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbsentValue.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * 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-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractPort.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractPort.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractPort.java index 5ed8d70..83374ea 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractPort.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractPort.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.taverna.server.port_description.utils.IntAdapter; +import org.apache.taverna.server.port_description.utils.IntAdapter; @XmlType(name = "Port") public class AbstractPort { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractPortDescription.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractPortDescription.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractPortDescription.java index 721e8c8..f70d709 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractPortDescription.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractPortDescription.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * 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-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractValue.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractValue.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractValue.java index 1ded5c7..8a593d0 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractValue.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/AbstractValue.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * 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.port_description; * limitations under the License. */ -import static org.taverna.server.port_description.Namespaces.XLINK; +import static org.apache.taverna.server.port_description.Namespaces.XLINK; import java.net.URI; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/ErrorValue.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/ErrorValue.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/ErrorValue.java index 641c380..81a3f8d 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/ErrorValue.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/ErrorValue.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.taverna.server.port_description.utils.IntAdapter; +import org.apache.taverna.server.port_description.utils.IntAdapter; @XmlType(name = "ErrorValue") public class ErrorValue extends AbstractValue { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/InputDescription.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/InputDescription.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/InputDescription.java index c11baa1..58184bf 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/InputDescription.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/InputDescription.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * 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.port_description; * limitations under the License. */ -import static org.taverna.server.port_description.Namespaces.XLINK; +import static org.apache.taverna.server.port_description.Namespaces.XLINK; import java.net.URI; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/LeafValue.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/LeafValue.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/LeafValue.java index 95658bc..995aa1a 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/LeafValue.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/LeafValue.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * 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-port-description/src/main/java/org/apache/taverna/server/port_description/ListValue.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/ListValue.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/ListValue.java index f3e8ff1..a4077dd 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/ListValue.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/ListValue.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.taverna.server.port_description.utils.IntAdapter; +import org.apache.taverna.server.port_description.utils.IntAdapter; @XmlType(name = "ListValue") public class ListValue extends AbstractValue { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/Namespaces.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/Namespaces.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/Namespaces.java index f60e6c4..11ab63d 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/Namespaces.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/Namespaces.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * 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-port-description/src/main/java/org/apache/taverna/server/port_description/OutputDescription.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/OutputDescription.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/OutputDescription.java index 2f402d1..0c13db8 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/OutputDescription.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/OutputDescription.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * 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-port-description/src/main/java/org/apache/taverna/server/port_description/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/package-info.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/package-info.java index 76228db..2df4403 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/package-info.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/package-info.java @@ -4,7 +4,7 @@ @XmlNs(prefix = "port", namespaceURI = DATA), @XmlNs(prefix = "xlink", namespaceURI = XLINK), @XmlNs(prefix = "run", namespaceURI = RUN) }) -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,9 +23,9 @@ package org.taverna.server.port_description; */ import static javax.xml.bind.annotation.XmlNsForm.QUALIFIED; -import static org.taverna.server.port_description.Namespaces.DATA; -import static org.taverna.server.port_description.Namespaces.RUN; -import static org.taverna.server.port_description.Namespaces.XLINK; +import static org.apache.taverna.server.port_description.Namespaces.DATA; +import static org.apache.taverna.server.port_description.Namespaces.RUN; +import static org.apache.taverna.server.port_description.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-port-description/src/main/java/org/apache/taverna/server/port_description/utils/IntAdapter.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/utils/IntAdapter.java b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/utils/IntAdapter.java index de9a3a8..1e3bddc 100644 --- a/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/utils/IntAdapter.java +++ b/taverna-server-port-description/src/main/java/org/apache/taverna/server/port_description/utils/IntAdapter.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.port_description.utils; +package org.apache.taverna.server.port_description.utils; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-port-description/src/test/java/org/apache/taverna/server/port_description/JaxbSanityTest.java ---------------------------------------------------------------------- diff --git a/taverna-server-port-description/src/test/java/org/apache/taverna/server/port_description/JaxbSanityTest.java b/taverna-server-port-description/src/test/java/org/apache/taverna/server/port_description/JaxbSanityTest.java index de15cfa..122956f 100644 --- a/taverna-server-port-description/src/test/java/org/apache/taverna/server/port_description/JaxbSanityTest.java +++ b/taverna-server-port-description/src/test/java/org/apache/taverna/server/port_description/JaxbSanityTest.java @@ -1,4 +1,4 @@ -package org.taverna.server.port_description; +package org.apache.taverna.server.port_description; /* * 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-rmidaemon/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-rmidaemon/pom.xml b/taverna-server-rmidaemon/pom.xml index 8058497..35784c8 100644 --- a/taverna-server-rmidaemon/pom.xml +++ b/taverna-server-rmidaemon/pom.xml @@ -29,7 +29,7 @@ limitations under the License. <properties> <project.build.sourceEncoding>US-ASCII</project.build.sourceEncoding> - <mainClass>org.taverna.server.rmidaemon.Registry</mainClass> + <mainClass>org.apache.taverna.server.rmidaemon.Registry</mainClass> </properties> <build> <plugins> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-rmidaemon/src/main/java/org/apache/taverna/server/rmidaemon/Registry.java ---------------------------------------------------------------------- diff --git a/taverna-server-rmidaemon/src/main/java/org/apache/taverna/server/rmidaemon/Registry.java b/taverna-server-rmidaemon/src/main/java/org/apache/taverna/server/rmidaemon/Registry.java index 333153f..6e804d0 100644 --- a/taverna-server-rmidaemon/src/main/java/org/apache/taverna/server/rmidaemon/Registry.java +++ b/taverna-server-rmidaemon/src/main/java/org/apache/taverna/server/rmidaemon/Registry.java @@ -1,4 +1,4 @@ -package org.taverna.server.rmidaemon; +package org.apache.taverna.server.rmidaemon; /* * 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-rmidaemon/src/main/java/org/apache/taverna/server/rmidaemon/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-rmidaemon/src/main/java/org/apache/taverna/server/rmidaemon/package-info.java b/taverna-server-rmidaemon/src/main/java/org/apache/taverna/server/rmidaemon/package-info.java index 520b928..a7db743 100644 --- a/taverna-server-rmidaemon/src/main/java/org/apache/taverna/server/rmidaemon/package-info.java +++ b/taverna-server-rmidaemon/src/main/java/org/apache/taverna/server/rmidaemon/package-info.java @@ -2,7 +2,7 @@ * RMI daemon implementation. A variation of an RMI registry. * @author Donal Fellows */ -package org.taverna.server.rmidaemon; +package org.apache.taverna.server.rmidaemon; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/IllegalStateTransitionException.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/IllegalStateTransitionException.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/IllegalStateTransitionException.java index cb0cc0a..d2cb2a0 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/IllegalStateTransitionException.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/IllegalStateTransitionException.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/ImplementationException.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/ImplementationException.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/ImplementationException.java index 3e33fc7..056b87e 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/ImplementationException.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/ImplementationException.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteDirectory.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteDirectory.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteDirectory.java index 229d0b7..c0bb15f 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteDirectory.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteDirectory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteDirectoryEntry.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteDirectoryEntry.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteDirectoryEntry.java index 9b77e79..11f096e 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteDirectoryEntry.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteDirectoryEntry.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteFile.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteFile.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteFile.java index 63778db..8632306 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteFile.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteFile.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteInput.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteInput.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteInput.java index b4fda9e..94accde 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteInput.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteInput.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteListener.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteListener.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteListener.java index 2539f0d..11b6867 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteListener.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteListener.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteRunFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteRunFactory.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteRunFactory.java index bc91f0e..75ad94f 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteRunFactory.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteRunFactory.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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.rmi.Remote; import java.rmi.RemoteException; import java.util.UUID; -import org.taverna.server.localworker.server.UsageRecordReceiver; +import org.apache.taverna.server.localworker.server.UsageRecordReceiver; import javax.annotation.Nonnull; import javax.annotation.Nullable; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteSecurityContext.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteSecurityContext.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteSecurityContext.java index fc4baff..149ae66 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteSecurityContext.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteSecurityContext.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteSingleRun.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteSingleRun.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteSingleRun.java index e2519f8..62e7b3f 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteSingleRun.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteSingleRun.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteStatus.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteStatus.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteStatus.java index 89a7cff..88b4e7a 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteStatus.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/RemoteStatus.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/StillWorkingOnItException.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/StillWorkingOnItException.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/StillWorkingOnItException.java index a7af96b..a53ff3a 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/StillWorkingOnItException.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/StillWorkingOnItException.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/package-info.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/package-info.java index 6466e2f..870d6cc 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/package-info.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/remote/package-info.java @@ -3,7 +3,7 @@ /** * Interfaces exported by worker classes to the server. */ -package org.taverna.server.localworker.remote; +package org.apache.taverna.server.localworker.remote; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/server/UsageRecordReceiver.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/server/UsageRecordReceiver.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/server/UsageRecordReceiver.java index cc0127e..42d9089 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/server/UsageRecordReceiver.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/server/UsageRecordReceiver.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.server; +package org.apache.taverna.server.localworker.server; /* * 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-runinterface/src/main/java/org/apache/taverna/server/localworker/server/package-info.java ---------------------------------------------------------------------- diff --git a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/server/package-info.java b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/server/package-info.java index 584f1ed..ef14688 100644 --- a/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/server/package-info.java +++ b/taverna-server-runinterface/src/main/java/org/apache/taverna/server/localworker/server/package-info.java @@ -3,7 +3,7 @@ /** * Interfaces exported by the server to worker classes. */ -package org.taverna.server.localworker.server; +package org.apache.taverna.server.localworker.server; /* * 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-unix-forker/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-unix-forker/pom.xml b/taverna-server-unix-forker/pom.xml index f7f61ef..7f0e113 100644 --- a/taverna-server-unix-forker/pom.xml +++ b/taverna-server-unix-forker/pom.xml @@ -28,7 +28,7 @@ limitations under the License. <properties> <project.build.sourceEncoding>US-ASCII</project.build.sourceEncoding> - <forkerMainClass>org.taverna.server.unixforker.Forker</forkerMainClass> + <forkerMainClass>org.apache.taverna.server.unixforker.Forker</forkerMainClass> </properties> <build> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-unix-forker/src/main/java/org/apache/taverna/server/unixforker/Forker.java ---------------------------------------------------------------------- diff --git a/taverna-server-unix-forker/src/main/java/org/apache/taverna/server/unixforker/Forker.java b/taverna-server-unix-forker/src/main/java/org/apache/taverna/server/unixforker/Forker.java index ebe73f4..6502078 100644 --- a/taverna-server-unix-forker/src/main/java/org/apache/taverna/server/unixforker/Forker.java +++ b/taverna-server-unix-forker/src/main/java/org/apache/taverna/server/unixforker/Forker.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.unixforker; +package org.apache.taverna.server.unixforker; /* * 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/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/pom.xml b/taverna-server-webapp/pom.xml index 2b804df..e8ed5d7 100644 --- a/taverna-server-webapp/pom.xml +++ b/taverna-server-webapp/pom.xml @@ -539,12 +539,12 @@ limitations under the License. <configuration> <fork>false</fork> <metadataIncludes> - org/taverna/server/master/*.class, - org/taverna/server/master/identity/*.class, - org/taverna/server/master/localworker/*.class, - org/taverna/server/master/notification/atom/*.class, - org/taverna/server/master/usage/*.class, - org/taverna/server/master/worker/*.class + org.apache.taverna/server/master/*.class, + org.apache.taverna/server/master/identity/*.class, + org.apache.taverna/server/master/localworker/*.class, + org.apache.taverna/server/master/notification/atom/*.class, + org.apache.taverna/server/master/usage/*.class, + org.apache.taverna/server/master/worker/*.class </metadataIncludes> </configuration> <executions> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ContentsDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ContentsDescriptorBuilder.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ContentsDescriptorBuilder.java index 051a037..c9beb9c 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ContentsDescriptorBuilder.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ContentsDescriptorBuilder.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 @@ -22,7 +22,7 @@ import static eu.medsea.util.MimeUtil.getMimeType; import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM_TYPE; import static javax.ws.rs.core.UriBuilder.fromUri; import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.common.Uri.secure; +import static org.apache.taverna.server.master.common.Uri.secure; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -36,24 +36,24 @@ import javax.ws.rs.core.UriInfo; import org.apache.commons.logging.Log; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.NoDirectoryEntryException; -import org.taverna.server.master.interfaces.Directory; -import org.taverna.server.master.interfaces.DirectoryEntry; -import org.taverna.server.master.interfaces.File; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.UriBuilderFactory; -import org.taverna.server.master.utils.FilenameUtils; -import org.taverna.server.port_description.AbsentValue; -import org.taverna.server.port_description.AbstractPortDescription; -import org.taverna.server.port_description.AbstractValue; -import org.taverna.server.port_description.ErrorValue; -import org.taverna.server.port_description.InputDescription; -import org.taverna.server.port_description.InputDescription.InputPort; -import org.taverna.server.port_description.LeafValue; -import org.taverna.server.port_description.ListValue; -import org.taverna.server.port_description.OutputDescription; -import org.taverna.server.port_description.OutputDescription.OutputPort; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.NoDirectoryEntryException; +import org.apache.taverna.server.master.interfaces.Directory; +import org.apache.taverna.server.master.interfaces.DirectoryEntry; +import org.apache.taverna.server.master.interfaces.File; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.UriBuilderFactory; +import org.apache.taverna.server.master.utils.FilenameUtils; +import org.apache.taverna.server.port_description.AbsentValue; +import org.apache.taverna.server.port_description.AbstractPortDescription; +import org.apache.taverna.server.port_description.AbstractValue; +import org.apache.taverna.server.port_description.ErrorValue; +import org.apache.taverna.server.port_description.InputDescription; +import org.apache.taverna.server.port_description.InputDescription.InputPort; +import org.apache.taverna.server.port_description.LeafValue; +import org.apache.taverna.server.port_description.ListValue; +import org.apache.taverna.server.port_description.OutputDescription; +import org.apache.taverna.server.port_description.OutputDescription.OutputPort; import org.apache.taverna.scufl2.api.container.WorkflowBundle; import org.apache.taverna.scufl2.api.core.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/DirectoryREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/DirectoryREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/DirectoryREST.java index b800c1c..f34c042 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/DirectoryREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/DirectoryREST.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,13 +25,13 @@ import static javax.ws.rs.core.Response.ok; import static javax.ws.rs.core.Response.seeOther; import static javax.ws.rs.core.Response.status; import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.api.ContentTypes.APPLICATION_ZIP_TYPE; -import static org.taverna.server.master.api.ContentTypes.DIRECTORY_VARIANTS; -import static org.taverna.server.master.api.ContentTypes.INITIAL_FILE_VARIANTS; -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.Uri.secure; -import static org.taverna.server.master.utils.RestUtils.opt; +import static org.apache.taverna.server.master.api.ContentTypes.APPLICATION_ZIP_TYPE; +import static org.apache.taverna.server.master.api.ContentTypes.DIRECTORY_VARIANTS; +import static org.apache.taverna.server.master.api.ContentTypes.INITIAL_FILE_VARIANTS; +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.Uri.secure; +import static org.apache.taverna.server.master.utils.RestUtils.opt; import java.io.IOException; import java.io.InputStream; @@ -52,22 +52,22 @@ import javax.xml.ws.Holder; import org.apache.commons.logging.Log; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.api.DirectoryBean; -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.rest.DirectoryContents; -import org.taverna.server.master.rest.FileSegment; -import org.taverna.server.master.rest.MakeOrUpdateDirEntry; -import org.taverna.server.master.rest.MakeOrUpdateDirEntry.MakeDirectory; -import org.taverna.server.master.rest.TavernaServerDirectoryREST; -import org.taverna.server.master.utils.FilenameUtils; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.InvocationCounter.CallCounted; +import org.apache.taverna.server.master.api.DirectoryBean; +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.rest.DirectoryContents; +import org.apache.taverna.server.master.rest.FileSegment; +import org.apache.taverna.server.master.rest.MakeOrUpdateDirEntry; +import org.apache.taverna.server.master.rest.MakeOrUpdateDirEntry.MakeDirectory; +import org.apache.taverna.server.master.rest.TavernaServerDirectoryREST; +import org.apache.taverna.server.master.utils.FilenameUtils; +import org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.InvocationCounter.CallCounted; /** * RESTful access to the filesystem. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/FileConcatenation.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/FileConcatenation.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/FileConcatenation.java index 4ccb033..512adc1 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/FileConcatenation.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/FileConcatenation.java @@ -1,4 +1,4 @@ -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 @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.interfaces.File; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.interfaces.File; /** * Simple concatenation of files. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/InputREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/InputREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/InputREST.java index b9c8f55..76e21d9 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/InputREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/InputREST.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,7 +19,7 @@ package org.taverna.server.master; */ import static java.util.UUID.randomUUID; -import static org.taverna.server.master.utils.RestUtils.opt; +import static org.apache.taverna.server.master.utils.RestUtils.opt; import java.util.Date; @@ -31,26 +31,26 @@ import javax.ws.rs.core.UriInfo; import org.apache.cxf.jaxrs.impl.MetadataMap; import org.apache.cxf.jaxrs.model.URITemplate; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.api.InputBean; -import org.taverna.server.master.common.DirEntryReference; -import org.taverna.server.master.exceptions.BadInputPortNameException; -import org.taverna.server.master.exceptions.BadPropertyValueException; -import org.taverna.server.master.exceptions.BadStateChangeException; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.NoDirectoryEntryException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.exceptions.UnknownRunException; -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.TavernaRun; -import org.taverna.server.master.rest.TavernaServerInputREST; -import org.taverna.server.master.rest.TavernaServerInputREST.InDesc.AbstractContents; -import org.taverna.server.master.rest.TavernaServerInputREST.InDesc.Reference; -import org.taverna.server.master.utils.FilenameUtils; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.InvocationCounter.CallCounted; -import org.taverna.server.port_description.InputDescription; +import org.apache.taverna.server.master.api.InputBean; +import org.apache.taverna.server.master.common.DirEntryReference; +import org.apache.taverna.server.master.exceptions.BadInputPortNameException; +import org.apache.taverna.server.master.exceptions.BadPropertyValueException; +import org.apache.taverna.server.master.exceptions.BadStateChangeException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.NoDirectoryEntryException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +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.TavernaRun; +import org.apache.taverna.server.master.rest.TavernaServerInputREST; +import org.apache.taverna.server.master.rest.TavernaServerInputREST.InDesc.AbstractContents; +import org.apache.taverna.server.master.rest.TavernaServerInputREST.InDesc.Reference; +import org.apache.taverna.server.master.utils.FilenameUtils; +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.InputDescription; /** * RESTful interface to the input descriptor of 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/InteractionFeed.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/InteractionFeed.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/InteractionFeed.java index 6dfa3e2..5ee0253 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/InteractionFeed.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/InteractionFeed.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 @@ -18,9 +18,9 @@ package org.taverna.server.master; * limitations under the License. */ -import static org.taverna.server.master.common.Roles.SELF; -import static org.taverna.server.master.common.Roles.USER; -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.utils.RestUtils.opt; import java.net.MalformedURLException; import java.net.URI; @@ -31,15 +31,15 @@ import javax.ws.rs.core.Response; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; -import org.taverna.server.master.api.FeedBean; -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.interaction.InteractionFeedSupport; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.rest.InteractionFeedREST; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.InvocationCounter.CallCounted; +import org.apache.taverna.server.master.api.FeedBean; +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.interaction.InteractionFeedSupport; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.rest.InteractionFeedREST; +import org.apache.taverna.server.master.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.InvocationCounter.CallCounted; /** * How to connect an interaction feed to the webapp. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ListenerPropertyREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ListenerPropertyREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ListenerPropertyREST.java index 26a8982..039325e 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ListenerPropertyREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ListenerPropertyREST.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,19 +19,19 @@ package org.taverna.server.master; */ import static org.apache.commons.logging.LogFactory.getLog; -import static org.taverna.server.master.utils.RestUtils.opt; +import static org.apache.taverna.server.master.utils.RestUtils.opt; import javax.ws.rs.core.Response; import org.apache.commons.logging.Log; -import org.taverna.server.master.api.ListenerPropertyBean; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.exceptions.NoUpdateException; -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.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.InvocationCounter.CallCounted; +import org.apache.taverna.server.master.api.ListenerPropertyBean; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +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.utils.CallTimeLogger.PerfLogged; +import org.apache.taverna.server.master.utils.InvocationCounter.CallCounted; /** * RESTful interface to a single property of 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/ListenersREST.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ListenersREST.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ListenersREST.java index 3cc0d73..2fabb8d 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ListenersREST.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ListenersREST.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 @@ -20,8 +20,8 @@ package org.taverna.server.master; import static javax.ws.rs.core.Response.created; import static javax.ws.rs.core.UriBuilder.fromUri; -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.ArrayList; import java.util.List; @@ -31,15 +31,15 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; -import org.taverna.server.master.api.ListenersBean; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.rest.ListenerDefinition; -import org.taverna.server.master.rest.TavernaServerListenersREST; -import org.taverna.server.master.utils.CallTimeLogger.PerfLogged; -import org.taverna.server.master.utils.InvocationCounter.CallCounted; +import org.apache.taverna.server.master.api.ListenersBean; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.rest.ListenerDefinition; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST; +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 event listeners. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ManagementState.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ManagementState.java b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ManagementState.java index c65a334..1a328f6 100644 --- a/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ManagementState.java +++ b/taverna-server-webapp/src/main/java/org/apache/taverna/server/master/ManagementState.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,8 +26,8 @@ import javax.jdo.annotations.Persistent; import javax.jdo.annotations.PrimaryKey; import org.springframework.beans.factory.annotation.Required; -import org.taverna.server.master.api.ManagementModel; -import org.taverna.server.master.utils.JDOSupport; +import org.apache.taverna.server.master.api.ManagementModel; +import org.apache.taverna.server.master.utils.JDOSupport; /** The persistent, manageable state of the Taverna Server web application. */ @PersistenceAware
