http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/webapp/WEB-INF/beans.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/beans.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/beans.xml index f0fc89c..4be9468 100644 --- a/taverna-server-webapp/src/main/webapp/WEB-INF/beans.xml +++ b/taverna-server-webapp/src/main/webapp/WEB-INF/beans.xml @@ -24,7 +24,7 @@ limitations under the License. http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd";> - <bean id="webapp" class="org.taverna.server.master.TavernaServer"> + <bean id="webapp" class="org.apache.taverna.server.master.TavernaServer"> <property name="policy" ref="worker.policy" /> <property name="runStore" ref="worker.rundb" /> <property name="fileUtils" ref="fileUtils" /> @@ -37,7 +37,7 @@ limitations under the License. <lookup-method name="getPolicyDescription" bean="webapp.policyView" /> </bean> - <bean id="webapp.support" class="org.taverna.server.master.TavernaServerSupport"> + <bean id="webapp.support" class="org.apache.taverna.server.master.TavernaServerSupport"> <property name="policy" ref="worker.policy" /> <property name="listenerFactory" ref="localworker.factory" /> <property name="runFactory" ref="localworker.factory" /> @@ -57,21 +57,21 @@ limitations under the License. <property name="capabilitySource" ref="capabilities" /> </bean> - <bean id="capabilities" class="org.taverna.server.master.utils.CapabilityLister" /> + <bean id="capabilities" class="org.apache.taverna.server.master.utils.CapabilityLister" /> - <bean id="webapp.policyView" class="org.taverna.server.master.PolicyREST"> + <bean id="webapp.policyView" class="org.apache.taverna.server.master.PolicyREST"> <property name="support" ref="webapp.support" /> <property name="policy" ref="worker.policy" /> <property name="listenerFactory" ref="localworker.factory" /> <property name="notificationEngine" ref="notificationFabric" /> </bean> - <bean id="contentsDescriptorBuilder" class="org.taverna.server.master.ContentsDescriptorBuilder"> + <bean id="contentsDescriptorBuilder" class="org.apache.taverna.server.master.ContentsDescriptorBuilder"> <property name="uriBuilderFactory" ref="webapp" /> <property name="fileUtils" ref="fileUtils" /> </bean> - <bean id="webapp.state" class="org.taverna.server.master.ManagementState"> + <bean id="webapp.state" class="org.apache.taverna.server.master.ManagementState"> <description>The initial state of the webapp.</description> <property name="logIncomingWorkflows" value="${default.logworkflows}" /> <property name="allowNewWorkflowRuns" value="${default.permitsubmit}" /> @@ -80,13 +80,13 @@ limitations under the License. <property name="self" ref="webapp.state" /> </bean> - <bean id="webapp.invocationCounter" class="org.taverna.server.master.utils.InvocationCounter" /> - <bean id="webapp.perfLogger" class="org.taverna.server.master.utils.CallTimeLogger"> + <bean id="webapp.invocationCounter" class="org.apache.taverna.server.master.utils.InvocationCounter" /> + <bean id="webapp.perfLogger" class="org.apache.taverna.server.master.utils.CallTimeLogger"> <property name="threshold" value="${calltime.logthreshold:4000000}" /> </bean> <bean id="run.coreView.prototype" scope="prototype" - class="org.taverna.server.master.RunREST"> + class="org.apache.taverna.server.master.RunREST"> <property name="support" ref="webapp.support" /> <property name="cdBuilder" ref="contentsDescriptorBuilder" /> <lookup-method name="makeSecurityInterface" bean="run.securityView.prototype" /> @@ -97,52 +97,52 @@ limitations under the License. </bean> <bean id="run.directoryView.prototype" scope="prototype" - class="org.taverna.server.master.DirectoryREST"> + class="org.apache.taverna.server.master.DirectoryREST"> <property name="support" ref="webapp.support" /> <property name="fileUtils" ref="fileUtils" /> </bean> <bean id="run.listenersView.prototype" scope="prototype" - class="org.taverna.server.master.ListenersREST"> + class="org.apache.taverna.server.master.ListenersREST"> <property name="support" ref="webapp.support" /> <lookup-method name="makeListenerInterface" bean="run.singleListenerView.prototype" /> </bean> <bean id="run.singleListenerView.prototype" scope="prototype" - class="org.taverna.server.master.SingleListenerREST"> + class="org.apache.taverna.server.master.SingleListenerREST"> <lookup-method name="makePropertyInterface" bean="run.propertyView.prototype" /> </bean> <bean id="run.propertyView.prototype" scope="prototype" - class="org.taverna.server.master.ListenerPropertyREST"> + class="org.apache.taverna.server.master.ListenerPropertyREST"> <property name="support" ref="webapp.support" /> </bean> <bean id="run.inputView.prototype" scope="prototype" - class="org.taverna.server.master.InputREST"> + class="org.apache.taverna.server.master.InputREST"> <property name="support" ref="webapp.support" /> <property name="cdBuilder" ref="contentsDescriptorBuilder" /> <property name="fileUtils" ref="fileUtils" /> </bean> <bean id="run.securityView.prototype" scope="prototype" - class="org.taverna.server.master.RunSecurityREST"> + class="org.apache.taverna.server.master.RunSecurityREST"> <property name="support" ref="webapp.support" /> </bean> <bean id="run.interactionFeed.prototype" scope="prototype" - class="org.taverna.server.master.InteractionFeed"> + class="org.apache.taverna.server.master.InteractionFeed"> <property name="interactionFeedSupport" ref="interactionFeed" /> </bean> - <bean id="feed" class="org.taverna.server.master.notification.atom.AtomFeed"> + <bean id="feed" class="org.apache.taverna.server.master.notification.atom.AtomFeed"> <property name="eventSource" ref="dispatch.atom" /> <property name="support" ref="webapp.support" /> <property name="feedLanguage" value="${atom.language}" /> <property name="abdera" ref="abdera" /> </bean> - <bean id="admin" class="org.taverna.server.master.admin.AdminBean"> + <bean id="admin" class="org.apache.taverna.server.master.admin.AdminBean"> <property name="adminHtmlFile" value="/admin.html" /> <property name="counter" ref="webapp.invocationCounter" /> <property name="factory" ref="localworker.factory" /> @@ -153,23 +153,23 @@ limitations under the License. <property name="userStore" ref="userStore" /> </bean> - <bean id="IdentityMapper" class="org.taverna.server.master.identity.CompositeIDMapper"> + <bean id="IdentityMapper" class="org.apache.taverna.server.master.identity.CompositeIDMapper"> <property name="identityMappers"> <list> <bean id="AuthorityBased" - class="org.taverna.server.master.identity.AuthorityDerivedIDMapper"> + class="org.apache.taverna.server.master.identity.AuthorityDerivedIDMapper"> <description>Derives the local user identity to use for execution from the LOCALUSER_* Spring Security authority. Thus, if the user has "LOCALUSER_foo", they will be executing as the local user id "foo".</description> </bean> <bean id="SelfAccess" - class="org.taverna.server.master.identity.WorkflowInternalAuthProvider.WorkflowSelfIDMapper"> + class="org.apache.taverna.server.master.identity.WorkflowInternalAuthProvider.WorkflowSelfIDMapper"> <description>Handles the case where a workflow is accessing itself for the purpose of publishing interactions.</description> <property name="runStore" ref="worker.rundb" /> </bean> - <bean id="Extracting" class="org.taverna.server.master.identity.NameIDMapper"> + <bean id="Extracting" class="org.apache.taverna.server.master.identity.NameIDMapper"> <description>An alternate mechanism for mapping users. This tries to use an RE to extract the user name from the principal name. </description> @@ -180,7 +180,7 @@ limitations under the License. </description> </property> </bean> - <bean id="Constant" class="org.taverna.server.master.identity.ConstantIDMapper"> + <bean id="Constant" class="org.apache.taverna.server.master.identity.ConstantIDMapper"> <description>How to map web principals to local users. This one maps everyone to the same user, "taverna". </description> @@ -192,7 +192,7 @@ limitations under the License. <bean id="passwordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" /> - <bean class="org.taverna.server.master.identity.UserStore" id="userStore"> + <bean class="org.apache.taverna.server.master.identity.UserStore" id="userStore"> <property name="persistenceManagerBuilder" ref="pmb" /> <property name="baselineUserProperties"> <util:properties location="/WEB-INF/security/users.properties" /> @@ -206,7 +206,7 @@ limitations under the License. <props> <prop key="hibernate.dialect">org.hibernate.dialect.DerbyDialect</prop> <prop key="hibernate.hbm2ddl.auto">create</prop> </props> </property> <property name="annotatedClasses"> <list> </list> </property> </bean> --> - <bean id="pmb" class="org.taverna.server.master.utils.JDOSupport.PersistenceManagerBuilder"> + <bean id="pmb" class="org.apache.taverna.server.master.utils.JDOSupport.PersistenceManagerBuilder"> <property name="persistenceManagerFactory"> <bean id="pmf" class="org.datanucleus.api.jdo.JDOPersistenceManagerFactory" destroy-method="close"> @@ -224,14 +224,14 @@ limitations under the License. <prop key="datanucleus.autoCreateSchema">true</prop> <prop key="datanucleus.PersistenceUnitName">TavernaServer</prop> <prop key="datanucleus.rdbms.datastoreAdapterClassName" - >org.taverna.server.master.utils.LoggingDerbyAdapter</prop> + >org.apache.taverna.server.master.utils.LoggingDerbyAdapter</prop> </props> </property> </bean> </property> </bean> <bean id="transactionAspect" - class="org.taverna.server.master.utils.JDOSupport.TransactionAspect" /> + class="org.apache.taverna.server.master.utils.JDOSupport.TransactionAspect" /> <bean id="systemPrereqs" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"> <description>http://stackoverflow.com/questions/3339736/set-system-property-with-spring-configuration-file</description> @@ -239,14 +239,14 @@ limitations under the License. <property name="targetMethod" value="putAll" /> <property name="arguments"> <util:properties> - <prop key="derby.stream.error.field">org.taverna.server.master.utils.DerbyUtils.TO_LOG</prop> + <prop key="derby.stream.error.field">org.apache.taverna.server.master.utils.DerbyUtils.TO_LOG</prop> <prop key="derby.stream.error.logSeverityLevel">30000</prop> </util:properties> </property> </bean> <!-- TODO: control the location of the database properly, or move to JNDI TODO: review whether what we are doing now is correct! --> - <bean id="dataSource" class="org.taverna.server.master.utils.WebappAwareDataSource"> + <bean id="dataSource" class="org.apache.taverna.server.master.utils.WebappAwareDataSource"> <property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" /> <property name="url" value="jdbc:derby:directory:%{WEBAPPROOT}tavernaserver;create=true" /> @@ -258,9 +258,9 @@ limitations under the License. <property name="contextualizer" ref="contextualizer" /> </bean> - <bean id="contextualizer" class="org.taverna.server.master.utils.Contextualizer" /> + <bean id="contextualizer" class="org.apache.taverna.server.master.utils.Contextualizer" /> - <bean id="usageRecordSink" class="org.taverna.server.master.usage.UsageRecordRecorder"> + <bean id="usageRecordSink" class="org.apache.taverna.server.master.usage.UsageRecordRecorder"> <property name="state" ref="webapp.state" /> <property name="contextualizer" ref="contextualizer" /> <property name="persistenceManagerBuilder" ref="pmb" /> @@ -272,10 +272,10 @@ limitations under the License. <context:property-placeholder ignore-unresolvable="true" order="2" properties-ref="default-factory-properties" /> <util:properties id="default-factory-properties"> - <prop key="backEndFactory">org.taverna.server.master.localworker.IdAwareForkRunFactory</prop> + <prop key="backEndFactory">org.apache.taverna.server.master.localworker.IdAwareForkRunFactory</prop> </util:properties> - <!-- This bean configuration replaced with org.taverna.server.master.localworker.LocalWorkerFactory --> + <!-- This bean configuration replaced with org.apache.taverna.server.master.localworker.LocalWorkerFactory --> <!-- <bean id="localworker.factory" scope="singleton" lazy-init="false" class="${backEndFactory}"> <description> The simple policy manager and factory for the baseline localworker case. </description> <property name="state" @@ -290,7 +290,7 @@ limitations under the License. <!-- <task:executor id="URThreads" pool-size="${pool.size}" /> --> <bean id="worker.securityContext" - class="org.taverna.server.master.worker.SecurityContextFactory"> + class="org.apache.taverna.server.master.worker.SecurityContextFactory"> <property name="runDatabase" ref="worker.rundb" /> <property name="filenameConverter" ref="fileUtils" /> <property name="x500Utils" ref="x500Utils" /> @@ -300,15 +300,15 @@ limitations under the License. <property name="passwordIssuer" ref="passwordIssuer" /> </bean> - <bean id="passwordIssuer" class="org.taverna.server.master.worker.PasswordIssuer"> + <bean id="passwordIssuer" class="org.apache.taverna.server.master.worker.PasswordIssuer"> <!-- <property name="length" value="8" /> --> </bean> - <bean id="certificateChainFetcher" class="org.taverna.server.master.utils.CertificateChainFetcher"> + <bean id="certificateChainFetcher" class="org.apache.taverna.server.master.utils.CertificateChainFetcher"> <property name="secure" value="${fetchCertificateChain}" /> </bean> - <bean id="localworker.state" class="org.taverna.server.master.localworker.LocalWorkerState" + <bean id="localworker.state" class="org.apache.taverna.server.master.localworker.LocalWorkerState" scope="singleton" lazy-init="false"> <description> The state of the simple factory for the identity-aware @@ -358,7 +358,7 @@ limitations under the License. <property name="defaultExecuteWorkflowScript" value="${executeWorkflowScript:NONE}" /> </bean> - <bean id="worker.policy" class="org.taverna.server.master.worker.PolicyImpl"> + <bean id="worker.policy" class="org.apache.taverna.server.master.worker.PolicyImpl"> <description> The implementation of the access control policy supported by the localworker run engine. @@ -366,7 +366,7 @@ limitations under the License. <property name="limits" ref="localworker.state" /> <property name="runDB" ref="worker.rundb" /> </bean> - <bean id="worker.rundb" class="org.taverna.server.master.worker.RunDatabase"> + <bean id="worker.rundb" class="org.apache.taverna.server.master.worker.RunDatabase"> <property name="notifier" ref="worker.notifier" /> <property name="typeNotifiers"> <list> @@ -380,28 +380,28 @@ limitations under the License. <property name="dao" ref="worker.runDAO" /> </bean> <bean id="cn.email" - class="org.taverna.server.master.worker.VelocityCompletionNotifier"> + class="org.apache.taverna.server.master.worker.VelocityCompletionNotifier"> <property name="name" value="email" /> <property name="subject" value="Workflow run finished executing" /> <property name="velocityEngine" ref="velocity" /> <property name="uriBuilderFactory" ref="webapp" /> </bean> <bean id="cn.sms" - class="org.taverna.server.master.worker.VelocityCompletionNotifier"> + class="org.apache.taverna.server.master.worker.VelocityCompletionNotifier"> <property name="name" value="sms" /> <property name="subject" value="Run finished" /> <property name="velocityEngine" ref="velocity" /> <property name="uriBuilderFactory" ref="webapp" /> </bean> <bean id="cn.twitter" - class="org.taverna.server.master.worker.VelocityCompletionNotifier"> + class="org.apache.taverna.server.master.worker.VelocityCompletionNotifier"> <property name="name" value="twitter" /> <property name="subject" value="Run finished" /> <property name="velocityEngine" ref="velocity" /> <property name="uriBuilderFactory" ref="webapp" /> </bean> - <bean id="worker.runDAO" class="org.taverna.server.master.worker.RunDatabaseDAO"> + <bean id="worker.runDAO" class="org.apache.taverna.server.master.worker.RunDatabaseDAO"> <description> The implementation of the catalog of workflow runs supported by the localworker run engine. @@ -419,7 +419,7 @@ limitations under the License. </task:scheduled-tasks> <bean id="notificationFabric" - class="org.taverna.server.master.notification.NotificationEngine"> + class="org.apache.taverna.server.master.notification.NotificationEngine"> <property name="dispatchers"> <list> <ref bean="dispatch.email" /> @@ -435,7 +435,7 @@ limitations under the License. </property> </bean> - <bean id="dispatch.email" class="org.taverna.server.master.notification.EmailDispatcher"> + <bean id="dispatch.email" class="org.apache.taverna.server.master.notification.EmailDispatcher"> <property name="from" value="${email.from}" /> <property name="messageContentType" value="${email.type}" /> <property name="cooldownSeconds" value="${message.cooldown}" /> @@ -448,18 +448,18 @@ limitations under the License. </property> </bean> <bean id="dispatch.twitter" - class="org.taverna.server.master.notification.TwitterDispatcher"> + class="org.apache.taverna.server.master.notification.TwitterDispatcher"> <property name="cooldownSeconds" value="${message.cooldown}" /> <property name="accessToken" value="${twitter.oauth.accessToken}" /> <property name="accessSecret" value="${twitter.oauth.accessTokenSecret}" /> </bean> - <bean id="dispatch.xmpp" class="org.taverna.server.master.notification.JabberDispatcher"> + <bean id="dispatch.xmpp" class="org.apache.taverna.server.master.notification.JabberDispatcher"> <property name="resource" value="${xmpp.resource}" /> <property name="host" value="${xmpp.service}" /> <property name="username" value="${xmpp.user}" /> <property name="password" value="${xmpp.password}" /> </bean> - <bean id="dispatch.sms" class="org.taverna.server.master.notification.SMSDispatcher"> + <bean id="dispatch.sms" class="org.apache.taverna.server.master.notification.SMSDispatcher"> <property name="usernameField" value="${sms.userfield}" /> <property name="passwordField" value="${sms.passfield}" /> <property name="destinationField" value="${sms.destfield}" /> @@ -467,7 +467,7 @@ limitations under the License. <property name="cooldownSeconds" value="${message.cooldown}" /> </bean> - <bean id="dispatch.atom" class="org.taverna.server.master.notification.atom.EventDAO"> + <bean id="dispatch.atom" class="org.apache.taverna.server.master.notification.atom.EventDAO"> <property name="expiryAgeDays" value="${atom.lifespan}" /> <property name="persistenceManagerBuilder" ref="pmb" /> <property name="uriBuilderFactory" ref="feed" /> @@ -475,42 +475,42 @@ limitations under the License. </bean> <bean id="worker.notifier" - class="org.taverna.server.master.worker.SimpleFormattedCompletionNotifier"> + class="org.apache.taverna.server.master.worker.SimpleFormattedCompletionNotifier"> <property name="subject" value="${message.termination.subject}" /> <property name="messageFormat" value="${message.termination.body}" /> <property name="name" value="fallback"/> </bean> - <bean id="fileUtils" class="org.taverna.server.master.utils.FilenameUtils" /> - <bean id="x500Utils" class="org.taverna.server.master.utils.X500Utils" /> + <bean id="fileUtils" class="org.apache.taverna.server.master.utils.FilenameUtils" /> + <bean id="x500Utils" class="org.apache.taverna.server.master.utils.X500Utils" /> <task:scheduler id="taskScheduler" pool-size="${pool.size}" /> - <bean class="org.taverna.server.master.utils.JCECheck" id="JCECheck" /> + <bean class="org.apache.taverna.server.master.utils.JCECheck" id="JCECheck" /> - <bean class="org.taverna.server.master.interaction.InteractionFeedSupport" + <bean class="org.apache.taverna.server.master.interaction.InteractionFeedSupport" id="interactionFeed" scope="singleton"> <property name="abdera" ref="abdera" /> <property name="support" ref="webapp.support" /> <property name="uriBuilder" ref="webapp" /> <property name="utils" ref="fileUtils" /> </bean> - <bean class="org.taverna.server.master.rest.handler.FeedHandler" id="atomFeedHandler"> + <bean class="org.apache.taverna.server.master.rest.handler.FeedHandler" id="atomFeedHandler"> <property name="abdera" ref="abdera" /> </bean> - <bean class="org.taverna.server.master.rest.handler.EntryHandler" id="atomEntryHandler"> + <bean class="org.apache.taverna.server.master.rest.handler.EntryHandler" id="atomEntryHandler"> <property name="abdera" ref="abdera" /> </bean> - <bean id="authProvider" class="org.taverna.server.master.identity.StrippedDownAuthProvider"> + <bean id="authProvider" class="org.apache.taverna.server.master.identity.StrippedDownAuthProvider"> <property name="passwordEncoder" ref="passwordEncoder" /> <property name="userDetailsService"> - <bean class="org.taverna.server.master.identity.UserStore.CachedUserStore"> + <bean class="org.apache.taverna.server.master.identity.UserStore.CachedUserStore"> <property name="realStore" ref="userStore" /> </bean> </property> </bean> <bean id="workflowInternalAuthProvder" - class="org.taverna.server.master.identity.WorkflowInternalAuthProvider"> + class="org.apache.taverna.server.master.identity.WorkflowInternalAuthProvider"> <property name="dao" ref="worker.runDAO" /> <property name="cacheBound" value="${default.runlimit}" /> </bean> @@ -521,7 +521,7 @@ limitations under the License. <prop key="input.encoding">UTF-8</prop> <prop key="output.encoding">UTF-8</prop> <prop key="runtime.log.logsystem.class">org.apache.velocity.runtime.log.Log4JLogChute</prop> - <prop key="runtime.log.logsystem.log4j.logger">org.taverna.server.master.worker.VelocityCompletionNotifier</prop> + <prop key="runtime.log.logsystem.log4j.logger">org.apache.taverna.server.master.worker.VelocityCompletionNotifier</prop> <prop key="resource.loader">class</prop> <prop key="class.resource.loader.description">Velocity Classpath Resource Loader</prop> <prop key="class.resource.loader.class">org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader</prop>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/webapp/WEB-INF/insecure.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/insecure.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/insecure.xml index b2b18d6..a643801 100644 --- a/taverna-server-webapp/src/main/webapp/WEB-INF/insecure.xml +++ b/taverna-server-webapp/src/main/webapp/WEB-INF/insecure.xml @@ -36,7 +36,7 @@ limitations under the License. <context:property-placeholder order="0" ignore-unresolvable="true" properties-ref="security.override.properties" /> <util:properties id="security.override.properties"> - <prop key="backEndFactory">org.taverna.server.master.localworker.ForkRunFactory</prop> + <prop key="backEndFactory">org.apache.taverna.server.master.localworker.ForkRunFactory</prop> <prop key="fetchCertificateChain">false</prop> <prop key="suppressRewriteEngine">true</prop> <prop key="requiredChannel">any</prop> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/webapp/WEB-INF/partsecure.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/partsecure.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/partsecure.xml index ceab286..7e1df05 100644 --- a/taverna-server-webapp/src/main/webapp/WEB-INF/partsecure.xml +++ b/taverna-server-webapp/src/main/webapp/WEB-INF/partsecure.xml @@ -36,7 +36,7 @@ limitations under the License. <context:property-placeholder order="0" ignore-unresolvable="true" properties-ref="security.override.properties" /> <util:properties id="security.override.properties"> - <prop key="backEndFactory">org.taverna.server.master.localworker.ForkRunFactory</prop> + <prop key="backEndFactory">org.apache.taverna.server.master.localworker.ForkRunFactory</prop> <prop key="fetchCertificateChain">true</prop> <prop key="suppressRewriteEngine">false</prop> <prop key="requiredChannel">https</prop> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/webapp/WEB-INF/providers.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/providers.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/providers.xml index ffcc053..5ba2a89 100644 --- a/taverna-server-webapp/src/main/webapp/WEB-INF/providers.xml +++ b/taverna-server-webapp/src/main/webapp/WEB-INF/providers.xml @@ -23,88 +23,88 @@ limitations under the License. <import resource="beans.xml" /> - <bean id="ExceptionProvider.BadInputPortName" class="org.taverna.server.master.rest.handler.BadInputPortNameHandler"> + <bean id="ExceptionProvider.BadInputPortName" class="org.apache.taverna.server.master.rest.handler.BadInputPortNameHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.BadPropertyValue" class="org.taverna.server.master.rest.handler.BadPropertyValueHandler"> + <bean id="ExceptionProvider.BadPropertyValue" class="org.apache.taverna.server.master.rest.handler.BadPropertyValueHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.BadStateChange" class="org.taverna.server.master.rest.handler.BadStateChangeHandler"> + <bean id="ExceptionProvider.BadStateChange" class="org.apache.taverna.server.master.rest.handler.BadStateChangeHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.FilesystemAccess" class="org.taverna.server.master.rest.handler.FilesystemAccessHandler"> + <bean id="ExceptionProvider.FilesystemAccess" class="org.apache.taverna.server.master.rest.handler.FilesystemAccessHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.GeneralFailure" class="org.taverna.server.master.rest.handler.GeneralFailureHandler"> + <bean id="ExceptionProvider.GeneralFailure" class="org.apache.taverna.server.master.rest.handler.GeneralFailureHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.IllegalArgument" class="org.taverna.server.master.rest.handler.IllegalArgumentHandler"> + <bean id="ExceptionProvider.IllegalArgument" class="org.apache.taverna.server.master.rest.handler.IllegalArgumentHandler"> <property name="managementModel" ref="webapp.state" /> </bean> <bean id="ExceptionProvider.ImplementationProblem" - class="org.taverna.server.master.rest.handler.ImplementationProblemHandler"> + class="org.apache.taverna.server.master.rest.handler.ImplementationProblemHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.InvalidCredential" class="org.taverna.server.master.rest.handler.InvalidCredentialHandler"> + <bean id="ExceptionProvider.InvalidCredential" class="org.apache.taverna.server.master.rest.handler.InvalidCredentialHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.NoCreate" class="org.taverna.server.master.rest.handler.NoCreateHandler"> + <bean id="ExceptionProvider.NoCreate" class="org.apache.taverna.server.master.rest.handler.NoCreateHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.Overloaded" class="org.taverna.server.master.rest.handler.OverloadedHandler"> + <bean id="ExceptionProvider.Overloaded" class="org.apache.taverna.server.master.rest.handler.OverloadedHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.NoCredential" class="org.taverna.server.master.rest.handler.NoCredentialHandler"> + <bean id="ExceptionProvider.NoCredential" class="org.apache.taverna.server.master.rest.handler.NoCredentialHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.NoDestroy" class="org.taverna.server.master.rest.handler.NoDestroyHandler"> + <bean id="ExceptionProvider.NoDestroy" class="org.apache.taverna.server.master.rest.handler.NoDestroyHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.NoDirectoryEntry" class="org.taverna.server.master.rest.handler.NoDirectoryEntryHandler"> + <bean id="ExceptionProvider.NoDirectoryEntry" class="org.apache.taverna.server.master.rest.handler.NoDirectoryEntryHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.NoListener" class="org.taverna.server.master.rest.handler.NoListenerHandler"> + <bean id="ExceptionProvider.NoListener" class="org.apache.taverna.server.master.rest.handler.NoListenerHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.NoUpdate" class="org.taverna.server.master.rest.handler.NoUpdateHandler"> + <bean id="ExceptionProvider.NoUpdate" class="org.apache.taverna.server.master.rest.handler.NoUpdateHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.NotOwner" class="org.taverna.server.master.rest.handler.NotOwnerHandler"> + <bean id="ExceptionProvider.NotOwner" class="org.apache.taverna.server.master.rest.handler.NotOwnerHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.UnknownRun" class="org.taverna.server.master.rest.handler.UnknownRunHandler"> + <bean id="ExceptionProvider.UnknownRun" class="org.apache.taverna.server.master.rest.handler.UnknownRunHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.JAXBException" class="org.taverna.server.master.rest.handler.JAXBExceptionHandler"> + <bean id="ExceptionProvider.JAXBException" class="org.apache.taverna.server.master.rest.handler.JAXBExceptionHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.AccessDenied" class="org.taverna.server.master.rest.handler.AccessDeniedHandler"> + <bean id="ExceptionProvider.AccessDenied" class="org.apache.taverna.server.master.rest.handler.AccessDeniedHandler"> <property name="managementModel" ref="webapp.state" /> </bean> - <bean id="ExceptionProvider.NegotiationFailed" class="org.taverna.server.master.rest.handler.NegotiationFailedHandler"> + <bean id="ExceptionProvider.NegotiationFailed" class="org.apache.taverna.server.master.rest.handler.NegotiationFailedHandler"> </bean> - <bean id="MessagingProvider.File" class="org.taverna.server.master.rest.handler.FileMessageHandler"> + <bean id="MessagingProvider.File" class="org.apache.taverna.server.master.rest.handler.FileMessageHandler"> <property name="maxChunkSize" value="${default.messageSize}" /> </bean> - <bean id="MessagingProvider.FileConcatenation" class="org.taverna.server.master.rest.handler.FileConcatenationHandler"> + <bean id="MessagingProvider.FileConcatenation" class="org.apache.taverna.server.master.rest.handler.FileConcatenationHandler"> <property name="maxChunkSize" value="${default.messageSize}" /> </bean> - <bean id="MessagingProvider.FileSegment" class="org.taverna.server.master.rest.handler.FileSegmentHandler"> + <bean id="MessagingProvider.FileSegment" class="org.apache.taverna.server.master.rest.handler.FileSegmentHandler"> <property name="maxChunkSize" value="${default.messageSize}" /> </bean> <bean id="MessagingProvider.InputStream" - class="org.taverna.server.master.rest.handler.InputStreamMessageHandler"> + class="org.apache.taverna.server.master.rest.handler.InputStreamMessageHandler"> </bean> - <bean id="MessagingProvider.T2flow" class="org.taverna.server.master.rest.handler.T2FlowDocumentHandler"> + <bean id="MessagingProvider.T2flow" class="org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler"> </bean> - <bean id="MessagingProvider.Permission" class="org.taverna.server.master.rest.handler.PermissionHandler"> + <bean id="MessagingProvider.Permission" class="org.apache.taverna.server.master.rest.handler.PermissionHandler"> </bean> - <bean id="Provider.RuntimeExceptionRemapping" class="org.taverna.server.master.utils.RuntimeExceptionWrapper" /> - <bean id="MessagingProvider.ZipStream" class="org.taverna.server.master.rest.handler.ZipStreamHandler" /> - <bean id="MessagingProvider.URIList" class="org.taverna.server.master.rest.handler.URIListHandler" /> + <bean id="Provider.RuntimeExceptionRemapping" class="org.apache.taverna.server.master.utils.RuntimeExceptionWrapper" /> + <bean id="MessagingProvider.ZipStream" class="org.apache.taverna.server.master.rest.handler.ZipStreamHandler" /> + <bean id="MessagingProvider.URIList" class="org.apache.taverna.server.master.rest.handler.URIListHandler" /> <bean id="Interceptor.FlushThreadLocalCache" - class="org.taverna.server.master.utils.FlushThreadLocalCacheInterceptor" + class="org.apache.taverna.server.master.utils.FlushThreadLocalCacheInterceptor" lazy-init="false"> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/main/webapp/WEB-INF/webappBeans.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/webappBeans.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/webappBeans.xml index 6e4237e..16a9867 100644 --- a/taverna-server-webapp/src/main/webapp/WEB-INF/webappBeans.xml +++ b/taverna-server-webapp/src/main/webapp/WEB-INF/webappBeans.xml @@ -42,7 +42,7 @@ limitations under the License. <import resource="providers.xml" /> <context:annotation-config /> - <context:component-scan base-package="org.taverna.server" /> + <context:component-scan base-package="org.apache.taverna.server" /> <bean id="servletContextPropertyConfigurer" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"> <property name="ignoreUnresolvablePlaceholders" value="true" /> @@ -52,7 +52,7 @@ limitations under the License. </bean> <jaxws:server id="master_SOAP" - serviceClass="org.taverna.server.master.TavernaServer" address="/soap"> + serviceClass="org.apache.taverna.server.master.TavernaServer" address="/soap"> <jaxws:serviceBean> <ref bean="webapp" /> </jaxws:serviceBean> @@ -161,12 +161,12 @@ limitations under the License. <entry key="http://ns.taverna.org.uk/2010/run/"; value="" /> </util:map> - <bean id="root_facade" class="org.taverna.server.master.facade.Facade"> + <bean id="root_facade" class="org.apache.taverna.server.master.facade.Facade"> <property name="file" value="/welcome.html" /> <property name="contextualizer" ref="contextualizer" /> </bean> - <bean class="org.taverna.server.master.common.Uri.Rewriter" + <bean class="org.apache.taverna.server.master.common.Uri.Rewriter" autowire="byType" id="URI-Rewriter-Thunk"> <property name="suppressSecurity" value="${suppressRewriteEngine}" /> <property name="rewriteTarget" value="${default.webapp}" /> @@ -177,7 +177,7 @@ limitations under the License. </security:authentication-manager> <bean id="WSDLHeadOptionsInterceptor" - class="org.taverna.server.master.utils.WSDLHeadOptionsInterceptor" /> + class="org.apache.taverna.server.master.utils.WSDLHeadOptionsInterceptor" /> <cxf:bus> <cxf:inInterceptors> <ref bean="WSDLHeadOptionsInterceptor" /> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/JaxbSanityTest.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/JaxbSanityTest.java b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/JaxbSanityTest.java index 79fc9bf..6a97de6 100644 --- a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/JaxbSanityTest.java +++ b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/JaxbSanityTest.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 @@ -33,41 +33,41 @@ import javax.xml.transform.stream.StreamResult; import org.junit.Before; import org.junit.Test; -import org.taverna.server.master.admin.Admin; -import org.taverna.server.master.common.Credential.KeyPair; -import org.taverna.server.master.common.Credential.Password; -import org.taverna.server.master.common.Capability; -import org.taverna.server.master.common.DirEntryReference; -import org.taverna.server.master.common.InputDescription; -import org.taverna.server.master.common.Permission; -import org.taverna.server.master.common.ProfileList; -import org.taverna.server.master.common.RunReference; -import org.taverna.server.master.common.Status; -import org.taverna.server.master.common.Trust; -import org.taverna.server.master.common.Uri; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.rest.DirectoryContents; -import org.taverna.server.master.rest.ListenerDefinition; -import org.taverna.server.master.rest.MakeOrUpdateDirEntry; -import org.taverna.server.master.rest.TavernaServerInputREST.InDesc; -import org.taverna.server.master.rest.TavernaServerInputREST.InputsDescriptor; -import org.taverna.server.master.rest.TavernaServerListenersREST.ListenerDescription; -import org.taverna.server.master.rest.TavernaServerListenersREST.Listeners; -import org.taverna.server.master.rest.TavernaServerListenersREST.Properties; -import org.taverna.server.master.rest.TavernaServerListenersREST.PropertyDescription; -import org.taverna.server.master.rest.TavernaServerREST.EnabledNotificationFabrics; -import org.taverna.server.master.rest.TavernaServerREST.PermittedListeners; -import org.taverna.server.master.rest.TavernaServerREST.PermittedWorkflows; -import org.taverna.server.master.rest.TavernaServerREST.PolicyView.CapabilityList; -import org.taverna.server.master.rest.TavernaServerREST.PolicyView.PolicyDescription; -import org.taverna.server.master.rest.TavernaServerREST.RunList; -import org.taverna.server.master.rest.TavernaServerREST.ServerDescription; -import org.taverna.server.master.rest.TavernaServerRunREST.RunDescription; -import org.taverna.server.master.rest.TavernaServerSecurityREST; -import org.taverna.server.master.rest.TavernaServerSecurityREST.CredentialHolder; -import org.taverna.server.master.soap.DirEntry; -import org.taverna.server.master.soap.FileContents; -import org.taverna.server.master.soap.PermissionList; +import org.apache.taverna.server.master.admin.Admin; +import org.apache.taverna.server.master.common.Credential.KeyPair; +import org.apache.taverna.server.master.common.Credential.Password; +import org.apache.taverna.server.master.common.Capability; +import org.apache.taverna.server.master.common.DirEntryReference; +import org.apache.taverna.server.master.common.InputDescription; +import org.apache.taverna.server.master.common.Permission; +import org.apache.taverna.server.master.common.ProfileList; +import org.apache.taverna.server.master.common.RunReference; +import org.apache.taverna.server.master.common.Status; +import org.apache.taverna.server.master.common.Trust; +import org.apache.taverna.server.master.common.Uri; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.rest.DirectoryContents; +import org.apache.taverna.server.master.rest.ListenerDefinition; +import org.apache.taverna.server.master.rest.MakeOrUpdateDirEntry; +import org.apache.taverna.server.master.rest.TavernaServerInputREST.InDesc; +import org.apache.taverna.server.master.rest.TavernaServerInputREST.InputsDescriptor; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST.ListenerDescription; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST.Listeners; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST.Properties; +import org.apache.taverna.server.master.rest.TavernaServerListenersREST.PropertyDescription; +import org.apache.taverna.server.master.rest.TavernaServerREST.EnabledNotificationFabrics; +import org.apache.taverna.server.master.rest.TavernaServerREST.PermittedListeners; +import org.apache.taverna.server.master.rest.TavernaServerREST.PermittedWorkflows; +import org.apache.taverna.server.master.rest.TavernaServerREST.PolicyView.CapabilityList; +import org.apache.taverna.server.master.rest.TavernaServerREST.PolicyView.PolicyDescription; +import org.apache.taverna.server.master.rest.TavernaServerREST.RunList; +import org.apache.taverna.server.master.rest.TavernaServerREST.ServerDescription; +import org.apache.taverna.server.master.rest.TavernaServerRunREST.RunDescription; +import org.apache.taverna.server.master.rest.TavernaServerSecurityREST; +import org.apache.taverna.server.master.rest.TavernaServerSecurityREST.CredentialHolder; +import org.apache.taverna.server.master.soap.DirEntry; +import org.apache.taverna.server.master.soap.FileContents; +import org.apache.taverna.server.master.soap.PermissionList; /** * This test file ensures that the JAXB bindings will work once deployed instead http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/TavernaServerImplTest.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/TavernaServerImplTest.java b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/TavernaServerImplTest.java index b1191f1..687fd6d 100644 --- a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/TavernaServerImplTest.java +++ b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/TavernaServerImplTest.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,18 +23,18 @@ import static org.junit.Assert.assertNotNull; import org.junit.Before; import org.junit.Test; -import org.taverna.server.master.api.ManagementModel; -import org.taverna.server.master.common.RunReference; -import org.taverna.server.master.exceptions.BadPropertyValueException; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.exceptions.UnknownRunException; -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.mocks.ExampleRun; -import org.taverna.server.master.mocks.MockPolicy; -import org.taverna.server.master.mocks.SimpleListenerFactory; -import org.taverna.server.master.mocks.SimpleNonpersistentRunStore; +import org.apache.taverna.server.master.api.ManagementModel; +import org.apache.taverna.server.master.common.RunReference; +import org.apache.taverna.server.master.exceptions.BadPropertyValueException; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.mocks.ExampleRun; +import org.apache.taverna.server.master.mocks.MockPolicy; +import org.apache.taverna.server.master.mocks.SimpleListenerFactory; +import org.apache.taverna.server.master.mocks.SimpleNonpersistentRunStore; public class TavernaServerImplTest { private TavernaServer server; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/WorkflowSerializationTest.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/WorkflowSerializationTest.java b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/WorkflowSerializationTest.java index 1217c1f..0c4e87f 100644 --- a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/WorkflowSerializationTest.java +++ b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/WorkflowSerializationTest.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 @@ -16,8 +16,8 @@ package org.taverna.server.master; * limitations under the License. */ -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW_NS; -import static org.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW_ROOTNAME; +import static org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW_NS; +import static org.apache.taverna.server.master.rest.handler.T2FlowDocumentHandler.T2FLOW_ROOTNAME; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -31,7 +31,7 @@ import javax.xml.parsers.ParserConfigurationException; import org.junit.Assert; import org.junit.Test; -import org.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.common.Workflow; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/ExampleRun.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/ExampleRun.java b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/ExampleRun.java index 862cf2c..5c8ca97 100644 --- a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/ExampleRun.java +++ b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/ExampleRun.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.master.mocks; +package org.apache.taverna.server.master.mocks; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,7 +21,7 @@ package org.taverna.server.master.mocks; import static java.util.Calendar.MINUTE; import static java.util.Collections.unmodifiableList; import static java.util.UUID.randomUUID; -import static org.taverna.server.master.common.Status.Initialized; +import static org.apache.taverna.server.master.common.Status.Initialized; import java.io.IOException; import java.security.GeneralSecurityException; @@ -38,23 +38,23 @@ import javax.ws.rs.core.HttpHeaders; import javax.xml.ws.handler.MessageContext; import org.springframework.security.core.context.SecurityContext; -import org.taverna.server.master.common.Credential; -import org.taverna.server.master.common.Status; -import org.taverna.server.master.common.Trust; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.exceptions.BadStateChangeException; -import org.taverna.server.master.exceptions.FilesystemAccessException; -import org.taverna.server.master.exceptions.InvalidCredentialException; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.exceptions.UnknownRunException; -import org.taverna.server.master.factories.RunFactory; -import org.taverna.server.master.interfaces.Directory; -import org.taverna.server.master.interfaces.Input; -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.SecurityContextFactory; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.interfaces.TavernaSecurityContext; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.common.Credential; +import org.apache.taverna.server.master.common.Status; +import org.apache.taverna.server.master.common.Trust; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.exceptions.BadStateChangeException; +import org.apache.taverna.server.master.exceptions.FilesystemAccessException; +import org.apache.taverna.server.master.exceptions.InvalidCredentialException; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.factories.RunFactory; +import org.apache.taverna.server.master.interfaces.Directory; +import org.apache.taverna.server.master.interfaces.Input; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.SecurityContextFactory; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.interfaces.TavernaSecurityContext; +import org.apache.taverna.server.master.utils.UsernamePrincipal; @SuppressWarnings("serial") public class ExampleRun implements TavernaRun, TavernaSecurityContext { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/MockPolicy.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/MockPolicy.java b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/MockPolicy.java index b61fc10..5a65874 100644 --- a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/MockPolicy.java +++ b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/MockPolicy.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.mocks; +package org.apache.taverna.server.master.mocks; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,12 +19,12 @@ package org.taverna.server.master.mocks; import java.util.HashSet; import java.util.Set; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.exceptions.NoCreateException; -import org.taverna.server.master.exceptions.NoDestroyException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.exceptions.NoDestroyException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.utils.UsernamePrincipal; public class MockPolicy extends SimpleServerPolicy { public MockPolicy() { http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleListenerFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleListenerFactory.java b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleListenerFactory.java index 7d9c998..397aefe 100644 --- a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleListenerFactory.java +++ b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleListenerFactory.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.mocks; +package org.apache.taverna.server.master.mocks; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,10 +21,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.taverna.server.master.exceptions.NoListenerException; -import org.taverna.server.master.factories.ListenerFactory; -import org.taverna.server.master.interfaces.Listener; -import org.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.exceptions.NoListenerException; +import org.apache.taverna.server.master.factories.ListenerFactory; +import org.apache.taverna.server.master.interfaces.Listener; +import org.apache.taverna.server.master.interfaces.TavernaRun; /** * A factory for event listener. The factory is configured using Spring. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleNonpersistentRunStore.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleNonpersistentRunStore.java b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleNonpersistentRunStore.java index 63b6754..72985da 100644 --- a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleNonpersistentRunStore.java +++ b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleNonpersistentRunStore.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.mocks; +package org.apache.taverna.server.master.mocks; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,12 +24,12 @@ import java.util.Map; import java.util.Timer; import java.util.TimerTask; -import org.taverna.server.master.exceptions.NoDestroyException; -import org.taverna.server.master.exceptions.UnknownRunException; -import org.taverna.server.master.interfaces.Policy; -import org.taverna.server.master.interfaces.RunStore; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.exceptions.NoDestroyException; +import org.apache.taverna.server.master.exceptions.UnknownRunException; +import org.apache.taverna.server.master.interfaces.Policy; +import org.apache.taverna.server.master.interfaces.RunStore; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * Example of a store for Taverna Workflow Runs. http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleServerPolicy.java ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleServerPolicy.java b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleServerPolicy.java index 8dd2757..c648b56 100644 --- a/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleServerPolicy.java +++ b/taverna-server-webapp/src/test/java/org/apache/taverna/server/master/mocks/SimpleServerPolicy.java @@ -1,4 +1,4 @@ -package org.taverna.server.master.mocks; +package org.apache.taverna.server.master.mocks; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,13 +19,13 @@ package org.taverna.server.master.mocks; import java.net.URI; import java.util.List; -import org.taverna.server.master.common.Workflow; -import org.taverna.server.master.exceptions.NoCreateException; -import org.taverna.server.master.exceptions.NoDestroyException; -import org.taverna.server.master.exceptions.NoUpdateException; -import org.taverna.server.master.interfaces.Policy; -import org.taverna.server.master.interfaces.TavernaRun; -import org.taverna.server.master.utils.UsernamePrincipal; +import org.apache.taverna.server.master.common.Workflow; +import org.apache.taverna.server.master.exceptions.NoCreateException; +import org.apache.taverna.server.master.exceptions.NoDestroyException; +import org.apache.taverna.server.master.exceptions.NoUpdateException; +import org.apache.taverna.server.master.interfaces.Policy; +import org.apache.taverna.server.master.interfaces.TavernaRun; +import org.apache.taverna.server.master.utils.UsernamePrincipal; /** * A very simple (and unsafe) security model. The number of runs is configurable http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-webapp/src/test/resources/example.xml ---------------------------------------------------------------------- diff --git a/taverna-server-webapp/src/test/resources/example.xml b/taverna-server-webapp/src/test/resources/example.xml index 5a00c62..ac788d1 100644 --- a/taverna-server-webapp/src/test/resources/example.xml +++ b/taverna-server-webapp/src/test/resources/example.xml @@ -19,7 +19,7 @@ limitations under the License. xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";> - <bean id="policy" class="org.taverna.server.master.mocks.SimpleServerPolicy" + <bean id="policy" class="org.apache.taverna.server.master.mocks.SimpleServerPolicy" lazy-init="false" scope="singleton"> <property name="maxRuns" value="1"> <description> @@ -33,16 +33,16 @@ limitations under the License. </property> </bean> - <bean id="runFactory" class="org.taverna.server.master.mocks.ExampleRun$Builder"> + <bean id="runFactory" class="org.apache.taverna.server.master.mocks.ExampleRun$Builder"> <constructor-arg type="int" value="10" /> <!-- "initialLifetimeMinutes" --> </bean> <bean id="runCatalog" scope="singleton" - class="org.taverna.server.master.mocks.SimpleNonpersistentRunStore"> + class="org.apache.taverna.server.master.mocks.SimpleNonpersistentRunStore"> <property name="policy" ref="policy" /> </bean> - <bean id="listenerFactory" class="org.taverna.server.master.mocks.SimpleListenerFactory"> + <bean id="listenerFactory" class="org.apache.taverna.server.master.mocks.SimpleListenerFactory"> <property name="builders"> <description> This map describes how to build each type of supported @@ -50,7 +50,7 @@ limitations under the License. a listeners should be installed using its properties, as shown. The "key" is the type, the "class" is the builder for actual instances (which must be an instance of - org.taverna.server.master.factories.SimpleListenerFactory.Builder) + org.apache.taverna.server.master.factories.SimpleListenerFactory.Builder) and any policies and installation-specific configurations are characterised by properties such as "sitePolicy" below. </description> @@ -58,7 +58,7 @@ limitations under the License. <!-- <entry key="exampleListener">--> <!-- <bean - class="org.taverna.server.master.example.ExampleListener$Builder"> + class="org.apache.taverna.server.master.example.ExampleListener$Builder"> --> <!-- <property name="sitePolicy">--> <!-- <value>Just an example!</value>--> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-server-worker/pom.xml b/taverna-server-worker/pom.xml index 4b8df5d..56c496c 100644 --- a/taverna-server-worker/pom.xml +++ b/taverna-server-worker/pom.xml @@ -29,7 +29,7 @@ limitations under the License. This is the implementation of the factory process that is started up by the web application to manage executing Taverna Workflow executeworkflow.sh calls. Also provides per-user access to filestore.</description> <properties> - <workerMainClass>org.taverna.server.localworker.impl.TavernaRunManager</workerMainClass> + <workerMainClass>org.apache.taverna.server.localworker.impl.TavernaRunManager</workerMainClass> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/Constants.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/Constants.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/Constants.java index 4ee24ad..e0c091e 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/Constants.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/Constants.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.api; +package org.apache.taverna.server.localworker.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/RunAccounting.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/RunAccounting.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/RunAccounting.java index dd18db0..e4e0dfd 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/RunAccounting.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/RunAccounting.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.api; +package org.apache.taverna.server.localworker.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/Worker.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/Worker.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/Worker.java index 52c7009..078096d 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/Worker.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/Worker.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.api; +package org.apache.taverna.server.localworker.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,11 +22,11 @@ import java.io.File; import java.util.List; import java.util.Map; -import org.taverna.server.localworker.impl.LocalWorker; -import org.taverna.server.localworker.remote.ImplementationException; -import org.taverna.server.localworker.remote.RemoteListener; -import org.taverna.server.localworker.remote.RemoteStatus; -import org.taverna.server.localworker.server.UsageRecordReceiver; +import org.apache.taverna.server.localworker.impl.LocalWorker; +import org.apache.taverna.server.localworker.remote.ImplementationException; +import org.apache.taverna.server.localworker.remote.RemoteListener; +import org.apache.taverna.server.localworker.remote.RemoteStatus; +import org.apache.taverna.server.localworker.server.UsageRecordReceiver; /** * The interface between the connectivity layer and the thunk to the http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/WorkerFactory.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/WorkerFactory.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/WorkerFactory.java index 0fd2d20..6785c11 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/WorkerFactory.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/api/WorkerFactory.java @@ -1,4 +1,4 @@ -package org.taverna.server.localworker.api; +package org.apache.taverna.server.localworker.api; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/DirectoryDelegate.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/DirectoryDelegate.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/DirectoryDelegate.java index 6b7ba77..3e2513a 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/DirectoryDelegate.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/DirectoryDelegate.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.impl; +package org.apache.taverna.server.localworker.impl; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,7 +21,7 @@ package org.taverna.server.localworker.impl; import static org.apache.commons.io.FileUtils.forceDelete; import static org.apache.commons.io.FileUtils.forceMkdir; import static org.apache.commons.io.FileUtils.touch; -import static org.taverna.server.localworker.impl.utils.FilenameVerifier.getValidatedNewFile; +import static org.apache.taverna.server.localworker.impl.utils.FilenameVerifier.getValidatedNewFile; import java.io.File; import java.io.IOException; @@ -36,9 +36,9 @@ import javax.annotation.Nonnull; import org.apache.commons.collections.MapIterator; import org.apache.commons.collections.map.ReferenceMap; -import org.taverna.server.localworker.remote.RemoteDirectory; -import org.taverna.server.localworker.remote.RemoteDirectoryEntry; -import org.taverna.server.localworker.remote.RemoteFile; +import org.apache.taverna.server.localworker.remote.RemoteDirectory; +import org.apache.taverna.server.localworker.remote.RemoteDirectoryEntry; +import org.apache.taverna.server.localworker.remote.RemoteFile; /** * This class acts as a remote-aware delegate for the workflow run's working http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/FileDelegate.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/FileDelegate.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/FileDelegate.java index 8dd9ede..3f1f5d8 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/FileDelegate.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/FileDelegate.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.impl; +package org.apache.taverna.server.localworker.impl; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -34,8 +34,8 @@ import java.util.Date; import javax.annotation.Nonnull; -import org.taverna.server.localworker.remote.RemoteDirectory; -import org.taverna.server.localworker.remote.RemoteFile; +import org.apache.taverna.server.localworker.remote.RemoteDirectory; +import org.apache.taverna.server.localworker.remote.RemoteFile; /** * This class acts as a remote-aware delegate for the files in a workflow run's http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/LocalWorker.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/LocalWorker.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/LocalWorker.java index f96f91c..2effd53 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/LocalWorker.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/LocalWorker.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.impl; +package org.apache.taverna.server.localworker.impl; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,19 +30,19 @@ import static org.apache.commons.io.FileUtils.forceDelete; import static org.apache.commons.io.FileUtils.forceMkdir; import static org.apache.commons.io.FileUtils.writeByteArrayToFile; import static org.apache.commons.io.FileUtils.writeLines; -import static org.taverna.server.localworker.api.Constants.HELIO_TOKEN_NAME; -import static org.taverna.server.localworker.api.Constants.KEYSTORE_FILE; -import static org.taverna.server.localworker.api.Constants.KEYSTORE_PASSWORD; -import static org.taverna.server.localworker.api.Constants.SECURITY_DIR_NAME; -import static org.taverna.server.localworker.api.Constants.SHARED_DIR_PROP; -import static org.taverna.server.localworker.api.Constants.SUBDIR_LIST; -import static org.taverna.server.localworker.api.Constants.SYSTEM_ENCODING; -import static org.taverna.server.localworker.api.Constants.TRUSTSTORE_FILE; -import static org.taverna.server.localworker.impl.utils.FilenameVerifier.getValidatedFile; -import static org.taverna.server.localworker.remote.RemoteStatus.Finished; -import static org.taverna.server.localworker.remote.RemoteStatus.Initialized; -import static org.taverna.server.localworker.remote.RemoteStatus.Operating; -import static org.taverna.server.localworker.remote.RemoteStatus.Stopped; +import static org.apache.taverna.server.localworker.api.Constants.HELIO_TOKEN_NAME; +import static org.apache.taverna.server.localworker.api.Constants.KEYSTORE_FILE; +import static org.apache.taverna.server.localworker.api.Constants.KEYSTORE_PASSWORD; +import static org.apache.taverna.server.localworker.api.Constants.SECURITY_DIR_NAME; +import static org.apache.taverna.server.localworker.api.Constants.SHARED_DIR_PROP; +import static org.apache.taverna.server.localworker.api.Constants.SUBDIR_LIST; +import static org.apache.taverna.server.localworker.api.Constants.SYSTEM_ENCODING; +import static org.apache.taverna.server.localworker.api.Constants.TRUSTSTORE_FILE; +import static org.apache.taverna.server.localworker.impl.utils.FilenameVerifier.getValidatedFile; +import static org.apache.taverna.server.localworker.remote.RemoteStatus.Finished; +import static org.apache.taverna.server.localworker.remote.RemoteStatus.Initialized; +import static org.apache.taverna.server.localworker.remote.RemoteStatus.Operating; +import static org.apache.taverna.server.localworker.remote.RemoteStatus.Stopped; import java.io.File; import java.io.IOException; @@ -59,18 +59,18 @@ import java.util.Map; import java.util.Map.Entry; import java.util.UUID; -import org.taverna.server.localworker.api.Worker; -import org.taverna.server.localworker.api.WorkerFactory; -import org.taverna.server.localworker.remote.IllegalStateTransitionException; -import org.taverna.server.localworker.remote.ImplementationException; -import org.taverna.server.localworker.remote.RemoteDirectory; -import org.taverna.server.localworker.remote.RemoteInput; -import org.taverna.server.localworker.remote.RemoteListener; -import org.taverna.server.localworker.remote.RemoteSecurityContext; -import org.taverna.server.localworker.remote.RemoteSingleRun; -import org.taverna.server.localworker.remote.RemoteStatus; -import org.taverna.server.localworker.remote.StillWorkingOnItException; -import org.taverna.server.localworker.server.UsageRecordReceiver; +import org.apache.taverna.server.localworker.api.Worker; +import org.apache.taverna.server.localworker.api.WorkerFactory; +import org.apache.taverna.server.localworker.remote.IllegalStateTransitionException; +import org.apache.taverna.server.localworker.remote.ImplementationException; +import org.apache.taverna.server.localworker.remote.RemoteDirectory; +import org.apache.taverna.server.localworker.remote.RemoteInput; +import org.apache.taverna.server.localworker.remote.RemoteListener; +import org.apache.taverna.server.localworker.remote.RemoteSecurityContext; +import org.apache.taverna.server.localworker.remote.RemoteSingleRun; +import org.apache.taverna.server.localworker.remote.RemoteStatus; +import org.apache.taverna.server.localworker.remote.StillWorkingOnItException; +import org.apache.taverna.server.localworker.server.UsageRecordReceiver; /** * This class implements one side of the connection between the Taverna Server http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/TavernaRunManager.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/TavernaRunManager.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/TavernaRunManager.java index 167302c..5ce03c2 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/TavernaRunManager.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/TavernaRunManager.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.impl; +package org.apache.taverna.server.localworker.impl; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,12 +25,12 @@ import static java.lang.System.out; import static java.lang.System.setProperty; import static java.lang.System.setSecurityManager; import static java.rmi.registry.LocateRegistry.getRegistry; -import static org.taverna.server.localworker.api.Constants.DEATH_DELAY; -import static org.taverna.server.localworker.api.Constants.LOCALHOST; -import static org.taverna.server.localworker.api.Constants.RMI_HOST_PROP; -import static org.taverna.server.localworker.api.Constants.SECURITY_POLICY_FILE; -import static org.taverna.server.localworker.api.Constants.SEC_POLICY_PROP; -import static org.taverna.server.localworker.api.Constants.UNSECURE_PROP; +import static org.apache.taverna.server.localworker.api.Constants.DEATH_DELAY; +import static org.apache.taverna.server.localworker.api.Constants.LOCALHOST; +import static org.apache.taverna.server.localworker.api.Constants.RMI_HOST_PROP; +import static org.apache.taverna.server.localworker.api.Constants.SECURITY_POLICY_FILE; +import static org.apache.taverna.server.localworker.api.Constants.SEC_POLICY_PROP; +import static org.apache.taverna.server.localworker.api.Constants.UNSECURE_PROP; import java.io.ByteArrayInputStream; import java.net.URI; @@ -44,12 +44,12 @@ import java.util.Map; import java.util.UUID; import org.apache.taverna.scufl2.api.io.WorkflowBundleIO; -import org.taverna.server.localworker.api.RunAccounting; -import org.taverna.server.localworker.api.Worker; -import org.taverna.server.localworker.api.WorkerFactory; -import org.taverna.server.localworker.remote.RemoteRunFactory; -import org.taverna.server.localworker.remote.RemoteSingleRun; -import org.taverna.server.localworker.server.UsageRecordReceiver; +import org.apache.taverna.server.localworker.api.RunAccounting; +import org.apache.taverna.server.localworker.api.Worker; +import org.apache.taverna.server.localworker.api.WorkerFactory; +import org.apache.taverna.server.localworker.remote.RemoteRunFactory; +import org.apache.taverna.server.localworker.remote.RemoteSingleRun; +import org.apache.taverna.server.localworker.server.UsageRecordReceiver; import org.w3c.dom.Document; import org.w3c.dom.Element; http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/WorkerCore.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/WorkerCore.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/WorkerCore.java index 4aa6605..c2b2050 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/WorkerCore.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/WorkerCore.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.impl; +package org.apache.taverna.server.localworker.impl; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,28 +31,28 @@ import static org.apache.commons.io.FileUtils.forceDelete; import static org.apache.commons.io.FileUtils.sizeOfDirectory; import static org.apache.commons.io.FileUtils.write; import static org.apache.commons.io.IOUtils.copy; -import static org.taverna.server.localworker.api.Constants.CREDENTIAL_MANAGER_DIRECTORY; -import static org.taverna.server.localworker.api.Constants.CREDENTIAL_MANAGER_PASSWORD; -import static org.taverna.server.localworker.api.Constants.DEATH_TIME; -import static org.taverna.server.localworker.api.Constants.DEFAULT_LISTENER_NAME; -import static org.taverna.server.localworker.api.Constants.KEYSTORE_PASSWORD; -import static org.taverna.server.localworker.api.Constants.START_WAIT_TIME; -import static org.taverna.server.localworker.api.Constants.SYSTEM_ENCODING; -import static org.taverna.server.localworker.api.Constants.TIME; -import static org.taverna.server.localworker.impl.Status.Aborted; -import static org.taverna.server.localworker.impl.Status.Completed; -import static org.taverna.server.localworker.impl.Status.Failed; -import static org.taverna.server.localworker.impl.Status.Held; -import static org.taverna.server.localworker.impl.Status.Started; -import static org.taverna.server.localworker.impl.TavernaRunManager.interactionFeedPath; -import static org.taverna.server.localworker.impl.TavernaRunManager.interactionHost; -import static org.taverna.server.localworker.impl.TavernaRunManager.interactionPort; -import static org.taverna.server.localworker.impl.TavernaRunManager.interactionWebdavPath; -import static org.taverna.server.localworker.impl.WorkerCore.pmap; -import static org.taverna.server.localworker.remote.RemoteStatus.Finished; -import static org.taverna.server.localworker.remote.RemoteStatus.Initialized; -import static org.taverna.server.localworker.remote.RemoteStatus.Operating; -import static org.taverna.server.localworker.remote.RemoteStatus.Stopped; +import static org.apache.taverna.server.localworker.api.Constants.CREDENTIAL_MANAGER_DIRECTORY; +import static org.apache.taverna.server.localworker.api.Constants.CREDENTIAL_MANAGER_PASSWORD; +import static org.apache.taverna.server.localworker.api.Constants.DEATH_TIME; +import static org.apache.taverna.server.localworker.api.Constants.DEFAULT_LISTENER_NAME; +import static org.apache.taverna.server.localworker.api.Constants.KEYSTORE_PASSWORD; +import static org.apache.taverna.server.localworker.api.Constants.START_WAIT_TIME; +import static org.apache.taverna.server.localworker.api.Constants.SYSTEM_ENCODING; +import static org.apache.taverna.server.localworker.api.Constants.TIME; +import static org.apache.taverna.server.localworker.impl.Status.Aborted; +import static org.apache.taverna.server.localworker.impl.Status.Completed; +import static org.apache.taverna.server.localworker.impl.Status.Failed; +import static org.apache.taverna.server.localworker.impl.Status.Held; +import static org.apache.taverna.server.localworker.impl.Status.Started; +import static org.apache.taverna.server.localworker.impl.TavernaRunManager.interactionFeedPath; +import static org.apache.taverna.server.localworker.impl.TavernaRunManager.interactionHost; +import static org.apache.taverna.server.localworker.impl.TavernaRunManager.interactionPort; +import static org.apache.taverna.server.localworker.impl.TavernaRunManager.interactionWebdavPath; +import static org.apache.taverna.server.localworker.impl.WorkerCore.pmap; +import static org.apache.taverna.server.localworker.remote.RemoteStatus.Finished; +import static org.apache.taverna.server.localworker.remote.RemoteStatus.Initialized; +import static org.apache.taverna.server.localworker.remote.RemoteStatus.Operating; +import static org.apache.taverna.server.localworker.remote.RemoteStatus.Stopped; import java.io.BufferedReader; import java.io.File; @@ -87,13 +87,13 @@ import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.ws.Holder; import org.apache.taverna.server.usagerecord.JobUsageRecord; -import org.taverna.server.localworker.api.RunAccounting; -import org.taverna.server.localworker.api.Worker; -import org.taverna.server.localworker.impl.utils.TimingOutTask; -import org.taverna.server.localworker.remote.ImplementationException; -import org.taverna.server.localworker.remote.RemoteListener; -import org.taverna.server.localworker.remote.RemoteStatus; -import org.taverna.server.localworker.server.UsageRecordReceiver; +import org.apache.taverna.server.localworker.api.RunAccounting; +import org.apache.taverna.server.localworker.api.Worker; +import org.apache.taverna.server.localworker.impl.utils.TimingOutTask; +import org.apache.taverna.server.localworker.remote.ImplementationException; +import org.apache.taverna.server.localworker.remote.RemoteListener; +import org.apache.taverna.server.localworker.remote.RemoteStatus; +import org.apache.taverna.server.localworker.server.UsageRecordReceiver; /** * The core class that connects to a Taverna command-line workflow execution http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/46777e2c/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/utils/FilenameVerifier.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/utils/FilenameVerifier.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/utils/FilenameVerifier.java index fa2e117..cf9a0c9 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/utils/FilenameVerifier.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/utils/FilenameVerifier.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.impl.utils; +package org.apache.taverna.server.localworker.impl.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-worker/src/main/java/org/apache/taverna/server/localworker/impl/utils/TimingOutTask.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/utils/TimingOutTask.java b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/utils/TimingOutTask.java index c5b1b7b..68fdc1f 100644 --- a/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/utils/TimingOutTask.java +++ b/taverna-server-worker/src/main/java/org/apache/taverna/server/localworker/impl/utils/TimingOutTask.java @@ -1,4 +1,4 @@ -package org.taverna.server.localworker.impl.utils; +package org.apache.taverna.server.localworker.impl.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-worker/src/test/java/org/apache/taverna/server/localworker/impl/LocalWorkerTest.java ---------------------------------------------------------------------- diff --git a/taverna-server-worker/src/test/java/org/apache/taverna/server/localworker/impl/LocalWorkerTest.java b/taverna-server-worker/src/test/java/org/apache/taverna/server/localworker/impl/LocalWorkerTest.java index 084738f..5cf9e18 100644 --- a/taverna-server-worker/src/test/java/org/apache/taverna/server/localworker/impl/LocalWorkerTest.java +++ b/taverna-server-worker/src/test/java/org/apache/taverna/server/localworker/impl/LocalWorkerTest.java @@ -1,6 +1,6 @@ /* */ -package org.taverna.server.localworker.impl; +package org.apache.taverna.server.localworker.impl; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,7 +25,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; -import static org.taverna.server.localworker.impl.LocalWorker.DO_MKDIR; +import static org.apache.taverna.server.localworker.impl.LocalWorker.DO_MKDIR; import java.io.File; import java.rmi.RemoteException; @@ -40,15 +40,15 @@ import java.util.TreeMap; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.taverna.server.localworker.api.Worker; -import org.taverna.server.localworker.api.WorkerFactory; -import org.taverna.server.localworker.remote.IllegalStateTransitionException; -import org.taverna.server.localworker.remote.ImplementationException; -import org.taverna.server.localworker.remote.RemoteDirectory; -import org.taverna.server.localworker.remote.RemoteInput; -import org.taverna.server.localworker.remote.RemoteListener; -import org.taverna.server.localworker.remote.RemoteStatus; -import org.taverna.server.localworker.server.UsageRecordReceiver; +import org.apache.taverna.server.localworker.api.Worker; +import org.apache.taverna.server.localworker.api.WorkerFactory; +import org.apache.taverna.server.localworker.remote.IllegalStateTransitionException; +import org.apache.taverna.server.localworker.remote.ImplementationException; +import org.apache.taverna.server.localworker.remote.RemoteDirectory; +import org.apache.taverna.server.localworker.remote.RemoteInput; +import org.apache.taverna.server.localworker.remote.RemoteListener; +import org.apache.taverna.server.localworker.remote.RemoteStatus; +import org.apache.taverna.server.localworker.server.UsageRecordReceiver; public class LocalWorkerTest { LocalWorker lw;
