Repository: incubator-taverna-engine Updated Branches: refs/heads/master 634203a57 -> 50373179a
OSGi/Spring config: uk.org.taverna.* -> org.apache.taverna 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/90125930 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/90125930 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/90125930 Branch: refs/heads/master Commit: 90125930354ba5473864bc1cb9cadacffc60f3b7 Parents: 634203a Author: Stian Soiland-Reyes <[email protected]> Authored: Sun Oct 18 18:57:03 2015 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Sun Oct 18 18:57:03 2015 +0100 ---------------------------------------------------------------------- .../src/main/resources/META-INF/spring/context-osgi.xml | 2 +- taverna-capability-impl/pom.xml | 2 +- .../resources/META-INF/spring/taverna-capability-context.xml | 4 ++-- .../META-INF/spring/credential-manager-impl-context-osgi.xml | 2 +- taverna-database-configuration-impl/pom.xml | 2 +- .../src/main/resources/META-INF/spring/database-context-osgi.xml | 4 ++-- .../src/main/resources/META-INF/spring/database-context.xml | 4 ++-- taverna-execution-impl/pom.xml | 2 +- taverna-execution-local/pom.xml | 2 +- .../resources/META-INF/spring/execution-local-context-osgi.xml | 4 ++-- taverna-execution-remote/pom.xml | 2 +- taverna-run-impl/pom.xml | 2 +- taverna-services-impl/pom.xml | 2 +- .../resources/META-INF/spring/taverna-services-context-osgi.xml | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml ---------------------------------------------------------------------- diff --git a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml index 2485411..41a9297 100644 --- a/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml +++ b/taverna-activity-archetype/src/main/resources/archetype-resources/__rootArtifactId__-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml @@ -21,6 +21,6 @@ <reference id="activityIconManager" interface="org.apache.taverna.workbench.activityicons.ActivityIconManager" /> <reference id="colourManager" interface="org.apache.taverna.workbench.configuration.colour.ColourManager" /> <reference id="serviceDescriptionRegistry" interface="org.apache.taverna.servicedescriptions.ServiceDescriptionRegistry" /> - <reference id="serviceRegistry" interface="org.apache.taverna.commons.services.ServiceRegistry" /> + <reference id="serviceRegistry" interface="org.apache.taverna.services.ServiceRegistry" /> </beans:beans> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-capability-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-capability-impl/pom.xml b/taverna-capability-impl/pom.xml index c4fa489..0beabc3 100644 --- a/taverna-capability-impl/pom.xml +++ b/taverna-capability-impl/pom.xml @@ -15,7 +15,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Import-Package>uk.org.taverna.platform.capability.api;provide:=true,*</Import-Package> + <Import-Package>org.apache.taverna.platform.capability.api;provide:=true,*</Import-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context.xml ---------------------------------------------------------------------- diff --git a/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context.xml b/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context.xml index fad027e..3a752d4 100644 --- a/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context.xml +++ b/taverna-capability-impl/src/main/resources/META-INF/spring/taverna-capability-context.xml @@ -3,11 +3,11 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean id="activityService" class="uk.org.taverna.platform.capability.activity.impl.ActivityServiceImpl"> + <bean id="activityService" class="org.apache.taverna.platform.capability.activity.impl.ActivityServiceImpl"> <property name="activityFactories" ref="activityFactories" /> </bean> - <bean id="dispatchLayerService" class="uk.org.taverna.platform.capability.dispatch.impl.DispatchLayerServiceImpl"> + <bean id="dispatchLayerService" class="org.apache.taverna.platform.capability.dispatch.impl.DispatchLayerServiceImpl"> <property name="dispatchLayerFactories" ref="dispatchLayerFactories" /> </bean> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context-osgi.xml ---------------------------------------------------------------------- diff --git a/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context-osgi.xml b/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context-osgi.xml index 813cc31..f4c8bed 100644 --- a/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context-osgi.xml +++ b/taverna-credential-manager-impl/src/main/resources/META-INF/spring/credential-manager-impl-context-osgi.xml @@ -14,7 +14,7 @@ interface="org.apache.taverna.security.credentialmanager.DistinguishedNameParser" /> <reference id="applicationConfiguration" - interface="uk.org.taverna.configuration.app.ApplicationConfiguration" /> + interface="org.apache.taverna.configuration.app.ApplicationConfiguration" /> <list id="masterPasswordProviders" interface="org.apache.taverna.security.credentialmanager.MasterPasswordProvider" http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-database-configuration-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/pom.xml b/taverna-database-configuration-impl/pom.xml index 39034f4..db6b33a 100644 --- a/taverna-database-configuration-impl/pom.xml +++ b/taverna-database-configuration-impl/pom.xml @@ -17,7 +17,7 @@ <configuration> <instructions> <Import-Package> - uk.org.taverna.configuration.database;provide:=true, + org.apache.taverna.configuration.database;provide:=true, org.apache.derby.jdbc, * </Import-Package> </instructions> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml b/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml index 9bc5909..1cc64fb 100644 --- a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml +++ b/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context-osgi.xml @@ -9,8 +9,8 @@ <service ref="databaseConfiguration" interface="org.apache.taverna.configuration.database.DatabaseConfiguration" /> <service ref="databaseManager" interface="org.apache.taverna.configuration.database.DatabaseManager" /> - <reference id="configurationManager" interface="uk.org.taverna.configuration.ConfigurationManager" /> - <reference id="applicationConfiguration" interface="uk.org.taverna.configuration.app.ApplicationConfiguration" /> + <reference id="configurationManager" interface="org.apache.taverna.configuration.ConfigurationManager" /> + <reference id="applicationConfiguration" interface="org.apache.taverna.configuration.app.ApplicationConfiguration" /> <!-- <reference id="dataSourceFactory" interface="org.osgi.service.jdbc.DataSourceFactory" filter="(osgi.jdbc.driver.class=org.apache.derby.jdbc.EmbeddedDriver)" /> --> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml b/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml index f397933..6d6bad0 100644 --- a/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml +++ b/taverna-database-configuration-impl/src/main/resources/META-INF/spring/database-context.xml @@ -5,12 +5,12 @@ http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="databaseConfiguration" - class="uk.org.taverna.configuration.database.impl.DatabaseConfigurationImpl"> + class="org.apache.taverna.configuration.database.impl.DatabaseConfigurationImpl"> <constructor-arg name="configurationManager" ref="configurationManager" /> </bean> <bean id="databaseManager" - class="uk.org.taverna.configuration.database.impl.DatabaseManagerImpl"> + class="org.apache.taverna.configuration.database.impl.DatabaseManagerImpl"> <constructor-arg name="applicationConfiguration" ref="applicationConfiguration" /> <constructor-arg name="databaseConfiguration"> <ref local="databaseConfiguration" /> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-execution-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-execution-impl/pom.xml b/taverna-execution-impl/pom.xml index 3c1f0e8..6041af6 100644 --- a/taverna-execution-impl/pom.xml +++ b/taverna-execution-impl/pom.xml @@ -16,7 +16,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Import-Package>uk.org.taverna.platform.execution.api;provide:=true,*</Import-Package> + <Import-Package>org.apache.taverna.platform.execution.api;provide:=true,*</Import-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-execution-local/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-execution-local/pom.xml b/taverna-execution-local/pom.xml index 83eea60..66de313 100644 --- a/taverna-execution-local/pom.xml +++ b/taverna-execution-local/pom.xml @@ -16,7 +16,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Import-Package>uk.org.taverna.platform.execution.api;provide:=true,*</Import-Package> + <Import-Package>org.apache.taverna.platform.execution.api;provide:=true,*</Import-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context-osgi.xml ---------------------------------------------------------------------- diff --git a/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context-osgi.xml b/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context-osgi.xml index 9ed6854..b1e5ea8 100644 --- a/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context-osgi.xml +++ b/taverna-execution-local/src/main/resources/META-INF/spring/execution-local-context-osgi.xml @@ -8,8 +8,8 @@ <service ref="localExecution"> <interfaces> - <beans:value>uk.org.taverna.platform.execution.api.ExecutionService</beans:value> - <beans:value>uk.org.taverna.platform.execution.api.WorkflowCompiler</beans:value> + <beans:value>org.apache.taverna.platform.execution.api.ExecutionService</beans:value> + <beans:value>org.apache.taverna.platform.execution.api.WorkflowCompiler</beans:value> </interfaces> <service-properties> <beans:entry key="executor" value="TavernaEngine" /> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-execution-remote/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-execution-remote/pom.xml b/taverna-execution-remote/pom.xml index 81e039e..e5fca8a 100644 --- a/taverna-execution-remote/pom.xml +++ b/taverna-execution-remote/pom.xml @@ -17,7 +17,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Import-Package>uk.org.taverna.platform.execution.api;provide:=true,*</Import-Package> + <Import-Package>org.apache.taverna.platform.execution.api;provide:=true,*</Import-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-run-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-run-impl/pom.xml b/taverna-run-impl/pom.xml index 80429a1..6620081 100644 --- a/taverna-run-impl/pom.xml +++ b/taverna-run-impl/pom.xml @@ -15,7 +15,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Import-Package>uk.org.taverna.platform.run.api;provide:=true,*</Import-Package> + <Import-Package>org.apache.taverna.platform.run.api;provide:=true,*</Import-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/taverna-services-impl/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-services-impl/pom.xml b/taverna-services-impl/pom.xml index a588e4d..2086a63 100644 --- a/taverna-services-impl/pom.xml +++ b/taverna-services-impl/pom.xml @@ -15,7 +15,7 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Import-Package>uk.org.taverna.commons.services;provide:=true,*</Import-Package> + <Import-Package>org.apache.taverna.services;provide:=true,*</Import-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/90125930/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 9bd2f75..8528a69 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 @@ -8,6 +8,6 @@ <service ref="serviceRegistry" interface="org.apache.taverna.services.ServiceRegistry" /> - <reference id="activityService" interface="uk.org.taverna.platform.capability.api.ActivityService" /> + <reference id="activityService" interface="org.apache.taverna.platform.capability.api.ActivityService" /> </beans:beans>
