commons.services -> org.apache.taverna.services
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/367adc16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/367adc16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/367adc16 Branch: refs/heads/master Commit: 367adc163be8df15047b6d6ad09e69a9f5859c0e Parents: 80c15ee Author: Stian Soiland-Reyes <[email protected]> Authored: Sun Oct 18 18:40:32 2015 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Sun Oct 18 18:40:32 2015 +0100 ---------------------------------------------------------------------- .../services/ActivityTypeNotFoundException.java | 46 ---------- .../services/InvalidConfigurationException.java | 46 ---------- .../commons/services/ServiceRegistry.java | 88 ------------------- .../services/ActivityTypeNotFoundException.java | 46 ++++++++++ .../services/InvalidConfigurationException.java | 46 ++++++++++ .../taverna/services/ServiceRegistry.java | 88 +++++++++++++++++++ .../services/impl/ServiceRegistryImpl.java | 91 -------------------- .../services/impl/ServiceRegistryImpl.java | 91 ++++++++++++++++++++ .../spring/taverna-services-context-osgi.xml | 2 +- .../spring/taverna-services-context.xml | 2 +- 10 files changed, 273 insertions(+), 273 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/367adc16/taverna-services-api/src/main/java/org/apache/taverna/commons/services/ActivityTypeNotFoundException.java ---------------------------------------------------------------------- diff --git a/taverna-services-api/src/main/java/org/apache/taverna/commons/services/ActivityTypeNotFoundException.java b/taverna-services-api/src/main/java/org/apache/taverna/commons/services/ActivityTypeNotFoundException.java deleted file mode 100644 index b260f91..0000000 --- a/taverna-services-api/src/main/java/org/apache/taverna/commons/services/ActivityTypeNotFoundException.java +++ /dev/null @@ -1,46 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ - -package org.apache.taverna.commons.services; - -/** - * Thrown when an activity type is not found. - * - * @author David Withers - */ -@SuppressWarnings("serial") -public class ActivityTypeNotFoundException extends Exception { - - public ActivityTypeNotFoundException() { - super(); - } - - public ActivityTypeNotFoundException(String message) { - super(message); - } - - public ActivityTypeNotFoundException(String message, Throwable cause) { - super(message, cause); - } - - public ActivityTypeNotFoundException(Throwable cause) { - super(cause); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/367adc16/taverna-services-api/src/main/java/org/apache/taverna/commons/services/InvalidConfigurationException.java ---------------------------------------------------------------------- diff --git a/taverna-services-api/src/main/java/org/apache/taverna/commons/services/InvalidConfigurationException.java b/taverna-services-api/src/main/java/org/apache/taverna/commons/services/InvalidConfigurationException.java deleted file mode 100644 index 35a1db8..0000000 --- a/taverna-services-api/src/main/java/org/apache/taverna/commons/services/InvalidConfigurationException.java +++ /dev/null @@ -1,46 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ - -package org.apache.taverna.commons.services; - -/** - * Thrown when a Configuration is not valid for a Configurable. - * - * @author David Withers - */ -@SuppressWarnings("serial") -public class InvalidConfigurationException extends Exception { - - public InvalidConfigurationException() { - super(); - } - - public InvalidConfigurationException(String message) { - super(message); - } - - public InvalidConfigurationException(String message, Throwable cause) { - super(message, cause); - } - - public InvalidConfigurationException(Throwable cause) { - super(cause); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/367adc16/taverna-services-api/src/main/java/org/apache/taverna/commons/services/ServiceRegistry.java ---------------------------------------------------------------------- diff --git a/taverna-services-api/src/main/java/org/apache/taverna/commons/services/ServiceRegistry.java b/taverna-services-api/src/main/java/org/apache/taverna/commons/services/ServiceRegistry.java deleted file mode 100644 index 7411dd2..0000000 --- a/taverna-services-api/src/main/java/org/apache/taverna/commons/services/ServiceRegistry.java +++ /dev/null @@ -1,88 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ - -package org.apache.taverna.commons.services; - -import java.net.URI; -import java.util.Set; - -import org.apache.taverna.scufl2.api.port.InputActivityPort; -import org.apache.taverna.scufl2.api.port.OutputActivityPort; - -import com.fasterxml.jackson.databind.JsonNode; - -/** - * Register of Taverna services. - * - * @author David Withers - */ -public interface ServiceRegistry { - - /** - * Returns the activity types in the registry. - * - * @return the activity types in the registry - */ - public Set<URI> getActivityTypes(); - - /** - * Returns the JSON Schema for the configuration required by an activity. - * - * @param activityType - * the activity type - * @return the JSON Schema for the configuration required by an activity - * @throws ActivityTypeNotFoundException - * if the activity type is not in the registry - */ - public JsonNode getActivityConfigurationSchema(URI activityType) - throws InvalidConfigurationException, ActivityTypeNotFoundException; - - /** - * Returns the input ports that the activity type requires to be present in order to execute - * with the specified configuration. - * <p> - * If the activity does not require any input port for the configuration then an empty set is - * returned. - * - * @param configuration - * the activity configuration - * @throws ActivityTypeNotFoundException - * if the activity type is not in the registry - * @return the input ports that the activity requires to be present in order to execute - */ - public Set<InputActivityPort> getActivityInputPorts(URI activityType, - JsonNode configuration) throws InvalidConfigurationException, ActivityTypeNotFoundException; - - /** - * Returns the output ports that the activity type requires to be present in order to execute - * with the specified configuration. - * <p> - * If the activity type does not require any output ports for the configuration then an empty - * set is returned. - * - * @param configuration - * the activity configuration - * @throws ActivityTypeNotFoundException - * if the activity type is not in the registry - * @return the output ports that the activity requires to be present in order to execute - */ - public Set<OutputActivityPort> getActivityOutputPorts(URI activityType, - JsonNode configuration) throws InvalidConfigurationException, ActivityTypeNotFoundException; - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/367adc16/taverna-services-api/src/main/java/org/apache/taverna/services/ActivityTypeNotFoundException.java ---------------------------------------------------------------------- diff --git a/taverna-services-api/src/main/java/org/apache/taverna/services/ActivityTypeNotFoundException.java b/taverna-services-api/src/main/java/org/apache/taverna/services/ActivityTypeNotFoundException.java new file mode 100644 index 0000000..b7da4f5 --- /dev/null +++ b/taverna-services-api/src/main/java/org/apache/taverna/services/ActivityTypeNotFoundException.java @@ -0,0 +1,46 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + +package org.apache.taverna.services; + +/** + * Thrown when an activity type is not found. + * + * @author David Withers + */ +@SuppressWarnings("serial") +public class ActivityTypeNotFoundException extends Exception { + + public ActivityTypeNotFoundException() { + super(); + } + + public ActivityTypeNotFoundException(String message) { + super(message); + } + + public ActivityTypeNotFoundException(String message, Throwable cause) { + super(message, cause); + } + + public ActivityTypeNotFoundException(Throwable cause) { + super(cause); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/367adc16/taverna-services-api/src/main/java/org/apache/taverna/services/InvalidConfigurationException.java ---------------------------------------------------------------------- diff --git a/taverna-services-api/src/main/java/org/apache/taverna/services/InvalidConfigurationException.java b/taverna-services-api/src/main/java/org/apache/taverna/services/InvalidConfigurationException.java new file mode 100644 index 0000000..244362e --- /dev/null +++ b/taverna-services-api/src/main/java/org/apache/taverna/services/InvalidConfigurationException.java @@ -0,0 +1,46 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + +package org.apache.taverna.services; + +/** + * Thrown when a Configuration is not valid for a Configurable. + * + * @author David Withers + */ +@SuppressWarnings("serial") +public class InvalidConfigurationException extends Exception { + + public InvalidConfigurationException() { + super(); + } + + public InvalidConfigurationException(String message) { + super(message); + } + + public InvalidConfigurationException(String message, Throwable cause) { + super(message, cause); + } + + public InvalidConfigurationException(Throwable cause) { + super(cause); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/367adc16/taverna-services-api/src/main/java/org/apache/taverna/services/ServiceRegistry.java ---------------------------------------------------------------------- diff --git a/taverna-services-api/src/main/java/org/apache/taverna/services/ServiceRegistry.java b/taverna-services-api/src/main/java/org/apache/taverna/services/ServiceRegistry.java new file mode 100644 index 0000000..108250e --- /dev/null +++ b/taverna-services-api/src/main/java/org/apache/taverna/services/ServiceRegistry.java @@ -0,0 +1,88 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + +package org.apache.taverna.services; + +import java.net.URI; +import java.util.Set; + +import org.apache.taverna.scufl2.api.port.InputActivityPort; +import org.apache.taverna.scufl2.api.port.OutputActivityPort; + +import com.fasterxml.jackson.databind.JsonNode; + +/** + * Register of Taverna services. + * + * @author David Withers + */ +public interface ServiceRegistry { + + /** + * Returns the activity types in the registry. + * + * @return the activity types in the registry + */ + public Set<URI> getActivityTypes(); + + /** + * Returns the JSON Schema for the configuration required by an activity. + * + * @param activityType + * the activity type + * @return the JSON Schema for the configuration required by an activity + * @throws ActivityTypeNotFoundException + * if the activity type is not in the registry + */ + public JsonNode getActivityConfigurationSchema(URI activityType) + throws InvalidConfigurationException, ActivityTypeNotFoundException; + + /** + * Returns the input ports that the activity type requires to be present in order to execute + * with the specified configuration. + * <p> + * If the activity does not require any input port for the configuration then an empty set is + * returned. + * + * @param configuration + * the activity configuration + * @throws ActivityTypeNotFoundException + * if the activity type is not in the registry + * @return the input ports that the activity requires to be present in order to execute + */ + public Set<InputActivityPort> getActivityInputPorts(URI activityType, + JsonNode configuration) throws InvalidConfigurationException, ActivityTypeNotFoundException; + + /** + * Returns the output ports that the activity type requires to be present in order to execute + * with the specified configuration. + * <p> + * If the activity type does not require any output ports for the configuration then an empty + * set is returned. + * + * @param configuration + * the activity configuration + * @throws ActivityTypeNotFoundException + * if the activity type is not in the registry + * @return the output ports that the activity requires to be present in order to execute + */ + public Set<OutputActivityPort> getActivityOutputPorts(URI activityType, + JsonNode configuration) throws InvalidConfigurationException, ActivityTypeNotFoundException; + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/367adc16/taverna-services-impl/src/main/java/org/apache/taverna/commons/services/impl/ServiceRegistryImpl.java ---------------------------------------------------------------------- diff --git a/taverna-services-impl/src/main/java/org/apache/taverna/commons/services/impl/ServiceRegistryImpl.java b/taverna-services-impl/src/main/java/org/apache/taverna/commons/services/impl/ServiceRegistryImpl.java deleted file mode 100644 index d1c52fe..0000000 --- a/taverna-services-impl/src/main/java/org/apache/taverna/commons/services/impl/ServiceRegistryImpl.java +++ /dev/null @@ -1,91 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ - -package org.apache.taverna.commons.services.impl; - -import java.net.URI; -import java.util.Set; - -import org.apache.taverna.services.ActivityTypeNotFoundException; -import org.apache.taverna.services.InvalidConfigurationException; -import org.apache.taverna.services.ServiceRegistry; -import org.apache.taverna.platform.capability.api.ActivityConfigurationException; -import org.apache.taverna.platform.capability.api.ActivityNotFoundException; -import org.apache.taverna.platform.capability.api.ActivityService; -import org.apache.taverna.scufl2.api.port.InputActivityPort; -import org.apache.taverna.scufl2.api.port.OutputActivityPort; - -import com.fasterxml.jackson.databind.JsonNode; - -/** - * Simple implementation of a ServiceRegistry that discovers available services from the - * ActivityService. - * - * @author David Withers - */ -public class ServiceRegistryImpl implements ServiceRegistry { - - private ActivityService activityService; - - @Override - public Set<URI> getActivityTypes() { - return activityService.getActivityTypes(); - } - - @Override - public JsonNode getActivityConfigurationSchema(URI activityType) - throws InvalidConfigurationException, ActivityTypeNotFoundException { - try { - return activityService.getActivityConfigurationSchema(activityType); - } catch (ActivityConfigurationException e) { - throw new InvalidConfigurationException(e); - } catch (ActivityNotFoundException e) { - throw new ActivityTypeNotFoundException(e); - } - } - - @Override - public Set<InputActivityPort> getActivityInputPorts(URI activityType, JsonNode configuration) - throws InvalidConfigurationException, ActivityTypeNotFoundException { - try { - return activityService.getActivityInputPorts(activityType, configuration); - } catch (ActivityConfigurationException e) { - throw new InvalidConfigurationException(e); - } catch (ActivityNotFoundException e) { - throw new ActivityTypeNotFoundException(e); - } - } - - @Override - public Set<OutputActivityPort> getActivityOutputPorts(URI activityType, JsonNode configuration) - throws InvalidConfigurationException, ActivityTypeNotFoundException { - try { - return activityService.getActivityOutputPorts(activityType, configuration); - } catch (ActivityConfigurationException e) { - throw new InvalidConfigurationException(e); - } catch (ActivityNotFoundException e) { - throw new ActivityTypeNotFoundException(e); - } - } - - public void setActivityService(ActivityService activityService) { - this.activityService = activityService; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/367adc16/taverna-services-impl/src/main/java/org/apache/taverna/services/impl/ServiceRegistryImpl.java ---------------------------------------------------------------------- diff --git a/taverna-services-impl/src/main/java/org/apache/taverna/services/impl/ServiceRegistryImpl.java b/taverna-services-impl/src/main/java/org/apache/taverna/services/impl/ServiceRegistryImpl.java new file mode 100644 index 0000000..849ada8 --- /dev/null +++ b/taverna-services-impl/src/main/java/org/apache/taverna/services/impl/ServiceRegistryImpl.java @@ -0,0 +1,91 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + +package org.apache.taverna.services.impl; + +import java.net.URI; +import java.util.Set; + +import org.apache.taverna.services.ActivityTypeNotFoundException; +import org.apache.taverna.services.InvalidConfigurationException; +import org.apache.taverna.services.ServiceRegistry; +import org.apache.taverna.platform.capability.api.ActivityConfigurationException; +import org.apache.taverna.platform.capability.api.ActivityNotFoundException; +import org.apache.taverna.platform.capability.api.ActivityService; +import org.apache.taverna.scufl2.api.port.InputActivityPort; +import org.apache.taverna.scufl2.api.port.OutputActivityPort; + +import com.fasterxml.jackson.databind.JsonNode; + +/** + * Simple implementation of a ServiceRegistry that discovers available services from the + * ActivityService. + * + * @author David Withers + */ +public class ServiceRegistryImpl implements ServiceRegistry { + + private ActivityService activityService; + + @Override + public Set<URI> getActivityTypes() { + return activityService.getActivityTypes(); + } + + @Override + public JsonNode getActivityConfigurationSchema(URI activityType) + throws InvalidConfigurationException, ActivityTypeNotFoundException { + try { + return activityService.getActivityConfigurationSchema(activityType); + } catch (ActivityConfigurationException e) { + throw new InvalidConfigurationException(e); + } catch (ActivityNotFoundException e) { + throw new ActivityTypeNotFoundException(e); + } + } + + @Override + public Set<InputActivityPort> getActivityInputPorts(URI activityType, JsonNode configuration) + throws InvalidConfigurationException, ActivityTypeNotFoundException { + try { + return activityService.getActivityInputPorts(activityType, configuration); + } catch (ActivityConfigurationException e) { + throw new InvalidConfigurationException(e); + } catch (ActivityNotFoundException e) { + throw new ActivityTypeNotFoundException(e); + } + } + + @Override + public Set<OutputActivityPort> getActivityOutputPorts(URI activityType, JsonNode configuration) + throws InvalidConfigurationException, ActivityTypeNotFoundException { + try { + return activityService.getActivityOutputPorts(activityType, configuration); + } catch (ActivityConfigurationException e) { + throw new InvalidConfigurationException(e); + } catch (ActivityNotFoundException e) { + throw new ActivityTypeNotFoundException(e); + } + } + + public void setActivityService(ActivityService activityService) { + this.activityService = activityService; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/367adc16/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml ---------------------------------------------------------------------- diff --git a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml b/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml index b33d451..9bd2f75 100644 --- a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml +++ b/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context-osgi.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd";> - <service ref="serviceRegistry" interface="org.apache.taverna.commons.services.ServiceRegistry" /> + <service ref="serviceRegistry" interface="org.apache.taverna.services.ServiceRegistry" /> <reference id="activityService" interface="uk.org.taverna.platform.capability.api.ActivityService" /> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/367adc16/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml ---------------------------------------------------------------------- diff --git a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml b/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml index 4ee6119..2a3d91d 100644 --- a/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml +++ b/taverna-services-impl/src/main/resources/META-INF/spring/taverna-services-context.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean id="serviceRegistry" class="org.apache.taverna.commons.services.impl.ServiceRegistryImpl"> + <bean id="serviceRegistry" class="org.apache.taverna.services.impl.ServiceRegistryImpl"> <property name="activityService" ref="activityService" /> </bean>
