From 723c11ac15ebb086b1ede805254dda24908c8452 Mon Sep 17 00:00:00 2001 From: Robbie Gemmell Date: Tue, 27 Feb 2024 15:58:53 +0000 Subject: [PATCH] ARTEMIS-4656: remove superflous artemis-spring-integration module --- artemis-bom/pom.xml | 5 -- .../activemq-spring-integration/pom.xml | 51 ---------------- .../spring/SpringBindingRegistry.java | 59 ------------------- .../spring/SpringJmsBootstrap.java | 40 ------------- pom.xml | 1 - tests/compatibility-tests/pom.xml | 4 -- 6 files changed, 160 deletions(-) delete mode 100644 integration/activemq-spring-integration/pom.xml delete mode 100644 integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java delete mode 100644 integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java diff --git a/artemis-bom/pom.xml b/artemis-bom/pom.xml index 27b4aafcfc..a44ffac759 100644 --- a/artemis-bom/pom.xml +++ b/artemis-bom/pom.xml @@ -218,11 +218,6 @@ artemis-service-extensions ${project.version} - - org.apache.activemq - artemis-spring-integration - ${project.version} - org.apache.activemq artemis-stomp-protocol diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml deleted file mode 100644 index 690542d8ee..0000000000 --- a/integration/activemq-spring-integration/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - 4.0.0 - - - org.apache.activemq - artemis-pom - 2.33.0-SNAPSHOT - ../../artemis-pom/pom.xml - - - artemis-spring-integration - jar - ActiveMQ Artemis Spring Integration - - - ${project.basedir}/../.. - - - - - org.apache.activemq - artemis-server - - - org.apache.activemq - artemis-jms-server - - - org.springframework - spring-beans - - - - diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java deleted file mode 100644 index 892eb6ffa3..0000000000 --- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringBindingRegistry.java +++ /dev/null @@ -1,59 +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.activemq.artemis.integration.spring; - -import org.apache.activemq.artemis.spi.core.naming.BindingRegistry; -import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import org.springframework.beans.factory.config.ConfigurableBeanFactory; - -/** - * This has been deprecated since org.apache.activemq.artemis.integration.spring.SpringJmsBootstrap was also deprecated. - */ -@Deprecated -public class SpringBindingRegistry implements BindingRegistry { - - private ConfigurableBeanFactory factory; - - public SpringBindingRegistry(ConfigurableBeanFactory factory) { - this.factory = factory; - } - - @Override - public Object lookup(String name) { - Object obj = null; - try { - obj = factory.getBean(name); - } catch (NoSuchBeanDefinitionException e) { - //ignore - } - return obj; - } - - @Override - public boolean bind(String name, Object obj) { - factory.registerSingleton(name, obj); - return true; - } - - @Override - public void unbind(String name) { - } - - @Override - public void close() { - } -} diff --git a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java b/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java deleted file mode 100644 index a5e406f38b..0000000000 --- a/integration/activemq-spring-integration/src/main/java/org/apache/activemq/artemis/integration/spring/SpringJmsBootstrap.java +++ /dev/null @@ -1,40 +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.activemq.artemis.integration.spring; - -import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.beans.factory.config.ConfigurableBeanFactory; - -/** - * This really isn't needed for Spring integration as demonstrated by org.apache.activemq.artemis.tests.integration.spring.SpringIntegrationTest - * as well as the "spring-integration" example - */ -@Deprecated -public class SpringJmsBootstrap extends EmbeddedJMS implements BeanFactoryAware { - - @Override - public void setBeanFactory(BeanFactory beanFactory) throws BeansException { - registry = new SpringBindingRegistry((ConfigurableBeanFactory) beanFactory); - } - - public void close() throws Exception { - stop(); - } -} diff --git a/pom.xml b/pom.xml index d208f015f4..67cc250555 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,6 @@ artemis-maven-plugin artemis-server-osgi artemis-hawtio - integration/activemq-spring-integration artemis-distribution artemis-unit-test-support tests diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml index 62de87e92c..2e1584e978 100644 --- a/tests/compatibility-tests/pom.xml +++ b/tests/compatibility-tests/pom.xml @@ -53,10 +53,6 @@ org.apache.activemq artemis-commons - - org.apache.activemq - artemis-spring-integration - org.apache.activemq artemis-journal