← Back to branch summary

~donal-k-fellows/taverna-server/2.5-branch

~donal-k-fellows/taverna-server/2.5-branch

Viewing all changes in revision 331.

Committer: dkf
Date: 2013-03-14 10:40:03 UTC
mfrom: (308.1.33)
Revision ID: git-v1:b1bea56a709a426e84a7928f6e8d123b3526b068

Merge branch '2.4.1i-branch' into taverna-3

files added:
README.md

server-runinterface/src/main/java/org/taverna/server/localworker/remote/StillWorkingOnItException.java

server-webapp/src/main/java/org/taverna/server/master/exceptions/OverloadedException.java

server-webapp/src/main/java/org/taverna/server/master/interaction

server-webapp/src/main/java/org/taverna/server/master/interaction/InteractionFeedSupport.java

server-webapp/src/main/java/org/taverna/server/master/interaction/package-info.java

server-webapp/src/main/java/org/taverna/server/master/rest/InteractionFeedREST.java

server-webapp/src/main/java/org/taverna/server/master/rest/handler/OverloadedHandler.java

server-webapp/src/main/java/org/taverna/server/master/utils/FlushThreadLocalCacheInterceptor.java

server-worker/src/main/java/org/taverna/server/localworker/impl/RunAccounting.java

server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerFactory.java

server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteRunFactory.java

server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteSingleRun.java

server-webapp/pom.xml

server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java

server-webapp/src/main/java/org/taverna/server/master/DirectoryREST.java

server-webapp/src/main/java/org/taverna/server/master/InputREST.java

server-webapp/src/main/java/org/taverna/server/master/RunREST.java

server-webapp/src/main/java/org/taverna/server/master/TavernaServerImpl.java

server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java

server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java

server-webapp/src/main/java/org/taverna/server/master/admin/AdminBean.java

server-webapp/src/main/java/org/taverna/server/master/factories/ConfigurableRunFactory.java

server-webapp/src/main/java/org/taverna/server/master/factories/RunFactory.java

server-webapp/src/main/java/org/taverna/server/master/interfaces/Directory.java

server-webapp/src/main/java/org/taverna/server/master/interfaces/DirectoryEntry.java

server-webapp/src/main/java/org/taverna/server/master/interfaces/Policy.java

server-webapp/src/main/java/org/taverna/server/master/interfaces/TavernaRun.java

server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java

server-webapp/src/main/java/org/taverna/server/master/localworker/ForkRunFactory.java

server-webapp/src/main/java/org/taverna/server/master/localworker/IdAwareForkRunFactory.java

server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerManagementState.java

server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java

server-webapp/src/main/java/org/taverna/server/master/localworker/PolicyImpl.java

server-webapp/src/main/java/org/taverna/server/master/localworker/RemoteRunDelegate.java

server-webapp/src/main/java/org/taverna/server/master/localworker/RunConnection.java

server-webapp/src/main/java/org/taverna/server/master/localworker/RunDBSupport.java

server-webapp/src/main/java/org/taverna/server/master/localworker/RunDatabase.java

server-webapp/src/main/java/org/taverna/server/master/localworker/RunDatabaseDAO.java

server-webapp/src/main/java/org/taverna/server/master/notification/atom/AtomFeed.java

server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerDirectoryREST.java

server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerREST.java

server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerRunREST.java

server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoCreateHandler.java

server-webapp/src/main/java/org/taverna/server/master/rest/handler/URIListHandler.java

server-webapp/src/main/resources/admin.html

server-webapp/src/main/resources/static/admin.js

server-webapp/src/main/webapp/WEB-INF/beans.xml

server-webapp/src/main/webapp/WEB-INF/providers.xml

server-webapp/src/main/webapp/WEB-INF/web.xml

server-webapp/src/main/webapp/WEB-INF/webappBeans.xml

server-webapp/src/test/java/org/taverna/server/master/mocks/ExampleRun.java

server-webapp/src/test/java/org/taverna/server/master/mocks/SimpleServerPolicy.java

server-worker/src/main/java/org/taverna/server/localworker/impl/DirectoryDelegate.java

server-worker/src/main/java/org/taverna/server/localworker/impl/FileDelegate.java

server-worker/src/main/java/org/taverna/server/localworker/impl/LocalWorker.java

server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java

server-worker/src/main/java/org/taverna/server/localworker/impl/Worker.java

server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java

server-worker/src/test/java/org/taverna/server/localworker/impl/LocalWorkerTest.java

Show diffs side-by-side

added added

removed removed

server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteDirectoryEntry.java

server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteRunFactory.java

server-runinterface/src/main/java/org/taverna/server/localworker/remote/RemoteSingleRun.java

server-runinterface/src/main/java/org/taverna/server/localworker/remote/StillWorkingOnItException.java

server-webapp/pom.xml

server-webapp/src/main/java/org/taverna/server/master/ContentsDescriptorBuilder.java

server-webapp/src/main/java/org/taverna/server/master/DirectoryREST.java

server-webapp/src/main/java/org/taverna/server/master/InputREST.java

server-webapp/src/main/java/org/taverna/server/master/RunREST.java

server-webapp/src/main/java/org/taverna/server/master/TavernaServerImpl.java

server-webapp/src/main/java/org/taverna/server/master/TavernaServerSupport.java

server-webapp/src/main/java/org/taverna/server/master/admin/Admin.java

server-webapp/src/main/java/org/taverna/server/master/admin/AdminBean.java

server-webapp/src/main/java/org/taverna/server/master/exceptions/OverloadedException.java

server-webapp/src/main/java/org/taverna/server/master/factories/ConfigurableRunFactory.java

server-webapp/src/main/java/org/taverna/server/master/factories/RunFactory.java

server-webapp/src/main/java/org/taverna/server/master/interaction/

server-webapp/src/main/java/org/taverna/server/master/interaction/InteractionFeedSupport.java

server-webapp/src/main/java/org/taverna/server/master/interaction/package-info.java

server-webapp/src/main/java/org/taverna/server/master/interfaces/Directory.java

server-webapp/src/main/java/org/taverna/server/master/interfaces/DirectoryEntry.java

server-webapp/src/main/java/org/taverna/server/master/interfaces/Policy.java

server-webapp/src/main/java/org/taverna/server/master/interfaces/TavernaRun.java

server-webapp/src/main/java/org/taverna/server/master/localworker/AbstractRemoteRunFactory.java

server-webapp/src/main/java/org/taverna/server/master/localworker/ForkRunFactory.java

server-webapp/src/main/java/org/taverna/server/master/localworker/IdAwareForkRunFactory.java

server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerManagementState.java

server-webapp/src/main/java/org/taverna/server/master/localworker/LocalWorkerState.java

server-webapp/src/main/java/org/taverna/server/master/localworker/PolicyImpl.java

server-webapp/src/main/java/org/taverna/server/master/localworker/RemoteRunDelegate.java

server-webapp/src/main/java/org/taverna/server/master/localworker/RunConnection.java

server-webapp/src/main/java/org/taverna/server/master/localworker/RunDBSupport.java

server-webapp/src/main/java/org/taverna/server/master/localworker/RunDatabase.java

server-webapp/src/main/java/org/taverna/server/master/localworker/RunDatabaseDAO.java

server-webapp/src/main/java/org/taverna/server/master/notification/atom/AtomFeed.java

server-webapp/src/main/java/org/taverna/server/master/rest/InteractionFeedREST.java

server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerDirectoryREST.java

server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerREST.java

server-webapp/src/main/java/org/taverna/server/master/rest/TavernaServerRunREST.java

server-webapp/src/main/java/org/taverna/server/master/rest/handler/NoCreateHandler.java

server-webapp/src/main/java/org/taverna/server/master/rest/handler/OverloadedHandler.java

server-webapp/src/main/java/org/taverna/server/master/rest/handler/URIListHandler.java

server-webapp/src/main/java/org/taverna/server/master/utils/FlushThreadLocalCacheInterceptor.java

server-webapp/src/main/resources/admin.html

server-webapp/src/main/resources/static/admin.js

server-webapp/src/main/webapp/WEB-INF/beans.xml

server-webapp/src/main/webapp/WEB-INF/providers.xml

server-webapp/src/main/webapp/WEB-INF/web.xml

server-webapp/src/main/webapp/WEB-INF/webappBeans.xml

server-webapp/src/test/java/org/taverna/server/master/mocks/ExampleRun.java

server-webapp/src/test/java/org/taverna/server/master/mocks/SimpleServerPolicy.java

server-worker/src/main/java/org/taverna/server/localworker/impl/DirectoryDelegate.java

server-worker/src/main/java/org/taverna/server/localworker/impl/FileDelegate.java

server-worker/src/main/java/org/taverna/server/localworker/impl/LocalWorker.java

server-worker/src/main/java/org/taverna/server/localworker/impl/RunAccounting.java

server-worker/src/main/java/org/taverna/server/localworker/impl/TavernaRunManager.java

server-worker/src/main/java/org/taverna/server/localworker/impl/Worker.java

server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerCore.java

server-worker/src/main/java/org/taverna/server/localworker/impl/WorkerFactory.java

server-worker/src/test/java/org/taverna/server/localworker/impl/LocalWorkerTest.java

Older »