From 079e4b24387c78ffbbcf52878949e6bf2bf1d506 Mon Sep 17 00:00:00 2001 From: jbertram Date: Mon, 17 Nov 2014 15:40:07 -0600 Subject: [PATCH] ACTIVEMQ6-10 Remove JBoss 4 integration --- activemq-service-sar/pom.xml | 49 -------- .../HornetQFileConfigurationService.java | 50 -------- .../HornetQFileConfigurationServiceMBean.java | 32 ----- .../service/HornetQJMSStarterService.java | 46 ------- .../HornetQJMSStarterServiceMBean.java | 27 ---- .../service/HornetQServiceBundle.java | 31 ----- .../service/HornetQServiceLogger.java | 38 ------ .../service/HornetQStarterService.java | 118 ------------------ .../service/HornetQStarterServiceMBean.java | 36 ------ .../JBossASSecurityManagerService.java | 35 ------ .../JBossASSecurityManagerServiceMBean.java | 26 ---- pom.xml | 6 - 12 files changed, 494 deletions(-) delete mode 100644 activemq-service-sar/pom.xml delete mode 100644 activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java delete mode 100644 activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java delete mode 100644 activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java delete mode 100644 activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java delete mode 100644 activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java delete mode 100644 activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java delete mode 100644 activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java delete mode 100644 activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java delete mode 100644 activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java delete mode 100644 activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java diff --git a/activemq-service-sar/pom.xml b/activemq-service-sar/pom.xml deleted file mode 100644 index f6e849203a..0000000000 --- a/activemq-service-sar/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - 4.0.0 - - - org.apache.activemq - activemq-pom - 6.0.0-SNAPSHOT - - - activemq-service-sar - jar - ActiveMQ6 JBoss AS4 Integration - - - ${project.basedir}/.. - - - - - org.jboss.logging - jboss-logging-processor - - - - - org.jboss.logging - jboss-logging - - - org.apache.activemq - activemq-server - ${project.version} - - - org.apache.activemq - activemq-jms-server - ${project.version} - - - org.apache.activemq - activemq-jboss-as-integration - ${project.version} - - - - diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java deleted file mode 100644 index 6d20f963b8..0000000000 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationService.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.service; - -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.FileConfiguration; - -/** - * @author Andy Taylor - * Created Oct 21, 2009 - */ -public class HornetQFileConfigurationService implements HornetQFileConfigurationServiceMBean -{ - private FileConfiguration configuration; - - public void create() throws Exception - { - configuration = new FileConfiguration(); - } - - public void start() throws Exception - { - configuration.start(); - } - - public void stop() throws Exception - { - configuration.stop(); - } - - public void setConfigurationUrl(final String configurationUrl) - { - configuration.setConfigurationUrl(configurationUrl); - } - - public Configuration getConfiguration() - { - return configuration; - } -} diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java deleted file mode 100644 index 4fd9e2a1a3..0000000000 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQFileConfigurationServiceMBean.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.service; - -import org.apache.activemq.core.config.Configuration; - -/** - * @author Andy Taylor - * Created Oct 21, 2009 - */ -public interface HornetQFileConfigurationServiceMBean -{ - void create() throws Exception; - - void start() throws Exception; - - void stop() throws Exception; - - void setConfigurationUrl(String configurationUrl); - - Configuration getConfiguration(); -} diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java deleted file mode 100644 index 433044a3db..0000000000 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterService.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.service; - -import org.apache.activemq.jms.server.impl.JMSServerManagerImpl; - -/** - * @author Andy Taylor - * Created Oct 19, 2009 - */ -public class HornetQJMSStarterService implements HornetQJMSStarterServiceMBean -{ - HornetQStarterServiceMBean service; - - private JMSServerManagerImpl jmsServerManager; - - public void create() throws Exception - { - jmsServerManager = new JMSServerManagerImpl(service.getServer()); - } - - public void start() throws Exception - { - jmsServerManager.start(); - } - - public void stop() throws Exception - { - jmsServerManager.stop(); - } - - public void setHornetQServer(final HornetQStarterServiceMBean service) - { - this.service = service; - } -} diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java deleted file mode 100644 index 7859eaf346..0000000000 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQJMSStarterServiceMBean.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.service; - -/** - * @author Andy Taylor - */ -public interface HornetQJMSStarterServiceMBean -{ - void create() throws Exception; - - void start() throws Exception; - - void stop() throws Exception; - - void setHornetQServer(HornetQStarterServiceMBean server); -} diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java deleted file mode 100644 index 7e4d0e056c..0000000000 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceBundle.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.service; - - -import org.jboss.logging.annotations.MessageBundle; - -/** - * @author Andy Taylor - * 3/12/12 - * - * Logger Code 16 - * - * each message id must be 6 digits long starting with 16, the 3rd digit should be 9 - * - * so 169000 to 169999 - */ -@MessageBundle(projectCode = "HQ") -public class HornetQServiceBundle -{ -} diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java deleted file mode 100644 index 4f6a31a5b5..0000000000 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQServiceLogger.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.service; - -import org.jboss.logging.annotations.MessageLogger; - -/** - * @author Andy Taylor - * 3/15/12 - * - * Logger Code 16 - * - * each message id must be 6 digits long starting with 16, the 3rd digit donates the level so - * - * INF0 1 - * WARN 2 - * DEBUG 3 - * ERROR 4 - * TRACE 5 - * FATAL 6 - * - * so an INFO message would be 161000 to 161999 - */ -@MessageLogger(projectCode = "HQ") -public class HornetQServiceLogger -{ -} diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java deleted file mode 100644 index 4008d00130..0000000000 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterService.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.service; - -import javax.management.MBeanRegistration; -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.apache.activemq.core.config.Configuration; -import org.apache.activemq.core.config.impl.ConfigurationImpl; -import org.apache.activemq.core.server.HornetQServer; -import org.apache.activemq.core.server.impl.HornetQServerImpl; -import org.apache.activemq.spi.core.security.HornetQSecurityManager; - -/** - * @author Lucaz Amador - * @author Andy Taylor - */ -public class HornetQStarterService implements HornetQStarterServiceMBean, MBeanRegistration -{ - JBossASSecurityManagerServiceMBean securityManagerService; - - HornetQFileConfigurationServiceMBean configurationService; - - private MBeanServer mBeanServer; - - private HornetQServer server; - - private boolean start = true; - - public void create() throws Exception - { - Configuration config; - HornetQSecurityManager hornetQSecurityManager = null; - if (securityManagerService != null) - { - hornetQSecurityManager = securityManagerService.getJBossASSecurityManager(); - } - if (configurationService != null) - { - config = configurationService.getConfiguration(); - } - else - { - config = new ConfigurationImpl(); - } - server = new HornetQServerImpl(config, mBeanServer, hornetQSecurityManager); - } - - public void start() throws Exception - { - if (start) - { - server.start(); - } - } - - public void stop() throws Exception - { - if (start) - { - server.stop(); - } - } - - public HornetQServer getServer() - { - return server; - } - - public void setStart(final boolean start) - { - this.start = start; - } - - public void setSecurityManagerService(final JBossASSecurityManagerServiceMBean securityManagerService) - { - this.securityManagerService = securityManagerService; - } - - public void setConfigurationService(final HornetQFileConfigurationServiceMBean configurationService) - { - this.configurationService = configurationService; - } - - public ObjectName preRegister(final MBeanServer server, final ObjectName name) throws Exception - { - mBeanServer = server; - - return name; - } - - public void postRegister(final Boolean registrationDone) - { - // NO - OP - } - - public void preDeregister() throws Exception - { - // NO - OP - } - - public void postDeregister() - { - server = null; - mBeanServer = null; - } -} diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java deleted file mode 100644 index 6f96f2be1e..0000000000 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/HornetQStarterServiceMBean.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.service; - -import org.apache.activemq.core.server.HornetQServer; - -/** - * @author Lucaz Amador - * @author Andy Taylor - */ -public interface HornetQStarterServiceMBean -{ - void create() throws Exception; - - void start() throws Exception; - - void stop() throws Exception; - - HornetQServer getServer(); - - void setStart(boolean start); - - void setSecurityManagerService(JBossASSecurityManagerServiceMBean securityManagerService); - - void setConfigurationService(HornetQFileConfigurationServiceMBean configurationService); -} diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java deleted file mode 100644 index 36dd27cff7..0000000000 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerService.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.service; - -import org.apache.activemq.integration.jboss.security.JBossASSecurityManager; - -/** - * @author Andy Taylor - * Created Oct 20, 2009 - */ -public class JBossASSecurityManagerService implements JBossASSecurityManagerServiceMBean -{ - private JBossASSecurityManager jBossASSecurityManager; - - public void create() - { - jBossASSecurityManager = new JBossASSecurityManager(); - jBossASSecurityManager.setAs5(false); - } - - public JBossASSecurityManager getJBossASSecurityManager() - { - return jBossASSecurityManager; - } -} diff --git a/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java b/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java deleted file mode 100644 index dd051f2bfa..0000000000 --- a/activemq-service-sar/src/main/java/org/apache/activemq/service/JBossASSecurityManagerServiceMBean.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat 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.service; - -import org.apache.activemq.integration.jboss.security.JBossASSecurityManager; - -/** - * @author Andy Taylor - * Created Oct 20, 2009 - */ -public interface JBossASSecurityManagerServiceMBean -{ - void create(); - - JBossASSecurityManager getJBossASSecurityManager(); -} diff --git a/pom.xml b/pom.xml index c418b60c38..cfc1153636 100644 --- a/pom.xml +++ b/pom.xml @@ -481,7 +481,6 @@ activemq-native activemq-ra activemq-rest - activemq-service-sar activemq-tools integration/activemq-spring-integration @@ -506,7 +505,6 @@ activemq-native activemq-ra activemq-rest - activemq-service-sar activemq-tools integration/activemq-jboss-as-integration integration/activemq-spring-integration @@ -531,7 +529,6 @@ activemq-journal activemq-ra activemq-rest - activemq-service-sar activemq-tools integration/activemq-jboss-as-integration integration/activemq-spring-integration @@ -558,7 +555,6 @@ activemq-journal activemq-ra activemq-rest - activemq-service-sar activemq-tools integration/activemq-jboss-as-integration integration/activemq-spring-integration @@ -596,7 +592,6 @@ activemq-journal activemq-ra activemq-rest - activemq-service-sar activemq-tools integration/activemq-jboss-as-integration integration/activemq-spring-integration @@ -630,7 +625,6 @@ activemq-journal activemq-ra activemq-rest - activemq-service-sar activemq-tools integration/activemq-jboss-as-integration integration/activemq-spring-integration