You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:29:19 UTC

[15/50] [abbrv] incubator-taverna-server git commit: Merge branch 'experimental/java7' into 2.5-branch

Merge branch 'experimental/java7' into 2.5-branch

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/fde99380
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/fde99380
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/fde99380

Branch: refs/heads/master
Commit: fde99380f1739730b4f531f4f1214a605b879c38
Parents: 1262673 6ce771d
Author: Donal Fellows <do...@manchester.ac.uk>
Authored: Mon Apr 14 12:03:12 2014 +0100
Committer: Donal Fellows <do...@manchester.ac.uk>
Committed: Mon Apr 14 12:03:12 2014 +0100

----------------------------------------------------------------------
 pom.xml                                         |   8 +-
 .../port_description/InputDescription.java      |   2 +-
 .../server/port_description/ListValue.java      |   2 +-
 .../port_description/OutputDescription.java     |   2 +-
 .../org/taverna/server/rmidaemon/Registry.java  |  32 ++--
 .../localworker/remote/RemoteDirectory.java     |  12 +-
 .../remote/RemoteDirectoryEntry.java            |   8 +-
 .../server/localworker/remote/RemoteFile.java   |  14 +-
 .../server/localworker/remote/RemoteInput.java  |  10 +-
 .../localworker/remote/RemoteListener.java      |  16 +-
 .../localworker/remote/RemoteRunFactory.java    |  14 +-
 .../remote/RemoteSecurityContext.java           |  17 +-
 .../localworker/remote/RemoteSingleRun.java     |  36 ++---
 .../org/taverna/server/unixforker/Forker.java   |  13 +-
 .../master/ContentsDescriptorBuilder.java       |  13 +-
 .../taverna/server/master/DirectoryREST.java    |   8 +-
 .../server/master/FileConcatenation.java        |   6 +-
 .../org/taverna/server/master/InputREST.java    |   2 +-
 .../taverna/server/master/ListenersREST.java    |   7 +-
 .../taverna/server/master/TavernaServer.java    |  40 ++---
 .../server/master/TavernaServerSupport.java     |  65 ++++----
 .../org/taverna/server/master/admin/Admin.java  |  71 ++++-----
 .../taverna/server/master/admin/AdminBean.java  |   2 +-
 .../server/master/api/TavernaServerBean.java    |  22 +--
 .../server/master/common/Credential.java        |   4 +-
 .../server/master/common/InputDescription.java  |   2 +-
 .../org/taverna/server/master/common/Uri.java   |  21 ++-
 .../server/master/common/VersionedElement.java  |  14 +-
 .../taverna/server/master/common/Workflow.java  |  17 +-
 .../identity/StrippedDownAuthProvider.java      |   2 +-
 .../taverna/server/master/identity/User.java    |   2 +-
 .../server/master/identity/UserStore.java       |   8 +-
 .../identity/WorkflowInternalAuthProvider.java  |  17 +-
 .../interaction/InteractionFeedSupport.java     |   4 +-
 .../taverna/server/master/interfaces/Input.java |   8 +-
 .../master/interfaces/MessageDispatcher.java    |   8 +-
 .../localworker/AbstractRemoteRunFactory.java   |  23 ++-
 .../master/localworker/ForkRunFactory.java      |  17 +-
 .../localworker/IdAwareForkRunFactory.java      |  24 ++-
 .../master/localworker/PersistedState.java      |   4 +-
 .../master/notification/NotificationEngine.java |   6 +-
 .../notification/RateLimitedDispatcher.java     |   2 +-
 .../master/notification/SMSDispatcher.java      |  12 +-
 .../master/notification/atom/EventDAO.java      |  19 ++-
 .../server/master/rest/DirectoryContents.java   |   4 +-
 .../master/rest/TavernaServerDirectoryREST.java |  27 ++--
 .../master/rest/TavernaServerInputREST.java     |  25 ++-
 .../master/rest/TavernaServerListenersREST.java |  47 +++---
 .../server/master/rest/TavernaServerREST.java   |  67 ++++----
 .../master/rest/TavernaServerRunREST.java       |  79 +++++----
 .../master/rest/TavernaServerSecurityREST.java  | 126 ++++++++-------
 .../master/rest/handler/EntryHandler.java       |  22 ++-
 .../master/rest/handler/URIListHandler.java     |   2 +-
 .../server/master/soap/FileContents.java        |   5 +-
 .../master/usage/UsageRecordRecorder.java       |   7 +-
 .../server/master/utils/CapabilityLister.java   |  11 +-
 .../master/utils/CertificateChainFetcher.java   |  10 +-
 .../taverna/server/master/utils/JDOSupport.java |  15 +-
 .../master/utils/WebappAwareDataSource.java     |   3 -
 .../taverna/server/master/utils/X500Utils.java  |   5 +-
 .../server/master/worker/PolicyImpl.java        |   3 -
 .../server/master/worker/RemoteRunDelegate.java |  36 ++---
 .../server/master/worker/RunConnection.java     |  23 ++-
 .../server/master/worker/RunDBSupport.java      |  10 +-
 .../server/master/worker/RunDatabase.java       |  16 +-
 .../server/master/worker/RunDatabaseDAO.java    |  46 +++---
 .../master/worker/RunFactoryConfiguration.java  |  23 ++-
 .../master/worker/SecurityContextDelegate.java  | 159 +++++++++----------
 .../master/worker/SecurityContextFactory.java   |   4 -
 .../server/master/TavernaServerImplTest.java    |   4 -
 .../master/WorkflowSerializationTest.java       |  15 +-
 .../taverna/server/master/mocks/ExampleRun.java |   9 +-
 .../taverna/server/master/mocks/MockPolicy.java |   5 +-
 .../master/mocks/SimpleListenerFactory.java     |   4 +-
 .../mocks/SimpleNonpersistentRunStore.java      |   9 +-
 .../localworker/impl/DirectoryDelegate.java     |  16 +-
 .../server/localworker/impl/FileDelegate.java   |  34 +---
 .../server/localworker/impl/LocalWorker.java    |  21 +--
 .../localworker/impl/TavernaRunManager.java     |  11 +-
 .../server/localworker/impl/WorkerCore.java     | 110 ++++++-------
 .../localworker/impl/utils/TimingOutTask.java   |   2 +-
 .../localworker/impl/LocalWorkerTest.java       |  12 +-
 82 files changed, 750 insertions(+), 913 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/fde99380/server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerInputREST.java
----------------------------------------------------------------------