You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2024/02/27 16:03:19 UTC
(activemq-artemis) branch main updated: ARTEMIS-4656: remove superflous artemis-spring-integration module
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 723c11ac15 ARTEMIS-4656: remove superflous artemis-spring-integration module
723c11ac15 is described below
commit 723c11ac15ebb086b1ede805254dda24908c8452
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Feb 27 15:58:53 2024 +0000
ARTEMIS-4656: remove superflous artemis-spring-integration module
---
artemis-bom/pom.xml | 5 --
integration/activemq-spring-integration/pom.xml | 51 -------------------
.../integration/spring/SpringBindingRegistry.java | 59 ----------------------
.../integration/spring/SpringJmsBootstrap.java | 40 ---------------
pom.xml | 1 -
tests/compatibility-tests/pom.xml | 4 --
6 files changed, 160 deletions(-)
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 @@
<artifactId>artemis-service-extensions</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-spring-integration</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-stomp-protocol</artifactId>
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 @@
-<!--
- ~ 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.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-pom</artifactId>
- <version>2.33.0-SNAPSHOT</version>
- <relativePath>../../artemis-pom/pom.xml</relativePath>
- </parent>
-
- <artifactId>artemis-spring-integration</artifactId>
- <packaging>jar</packaging>
- <name>ActiveMQ Artemis Spring Integration</name>
-
- <properties>
- <activemq.basedir>${project.basedir}/../..</activemq.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-jms-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- </dependencies>
-
-</project>
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 @@
<module>artemis-maven-plugin</module>
<module>artemis-server-osgi</module>
<module>artemis-hawtio</module>
- <module>integration/activemq-spring-integration</module>
<module>artemis-distribution</module>
<module>artemis-unit-test-support</module>
<module>tests</module>
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 @@
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-commons</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>artemis-spring-integration</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-journal</artifactId>