From 3d43a18e2add8ad1378495f74cfb9c410ca3659e Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Mon, 27 Mar 2006 16:02:48 +0000 Subject: [PATCH] Moved to the org.apache.activemq package and updated copyright headers. git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@389180 13f79535-47bb-0310-9956-ffa450edef68 --- .../activemq/gbean/BrokerServiceGBean.java | 34 ------------------ .../activemq/gbean/BrokerServiceGBean.java | 34 ++++++++++++++++++ .../gbean/BrokerServiceGBeanImpl.java | 35 +++++++++---------- .../gbean/TransportConnectorGBeanImpl.java | 26 +++++++------- .../management/ActiveMQManagerGBean.java | 33 +++++++++-------- .../{ => apache}/activemq/gbean/package.html | 0 .../activemq/gbean/ConnectorTest.java | 27 +++++++------- 7 files changed, 94 insertions(+), 95 deletions(-) delete mode 100755 activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBean.java create mode 100755 activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java rename activemq-gbean/src/main/java/org/{ => apache}/activemq/gbean/BrokerServiceGBeanImpl.java (83%) rename activemq-gbean/src/main/java/org/{ => apache}/activemq/gbean/TransportConnectorGBeanImpl.java (86%) rename activemq-gbean/src/main/java/org/{ => apache}/activemq/gbean/management/ActiveMQManagerGBean.java (93%) rename activemq-gbean/src/main/java/org/{ => apache}/activemq/gbean/package.html (100%) rename activemq-gbean/src/test/java/org/{ => apache}/activemq/gbean/ConnectorTest.java (69%) diff --git a/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBean.java b/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBean.java deleted file mode 100755 index 06baeb5b86..0000000000 --- a/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBean.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * - * Copyright 2004 Protique Ltd - * - * Licensed 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.activemq.gbean; - -import org.apache.activemq.broker.BrokerService; - -/** - * An interface to the ActiveMQContainerGBean for use by the - * ActiveMQConnectorGBean. - * - * @version $Revision: 1.1.1.1 $ - */ -public interface BrokerServiceGBean extends ActiveMQBroker { - - public abstract BrokerService getBrokerContainer(); - public String getBrokerName(); - - -} \ No newline at end of file diff --git a/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java b/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java new file mode 100755 index 0000000000..6669daf6b3 --- /dev/null +++ b/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java @@ -0,0 +1,34 @@ +/** + * + * Copyright 2005-2006 The Apache Software Foundation + * + * Licensed 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.gbean; + +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.gbean.ActiveMQBroker; + +/** + * An interface to the ActiveMQContainerGBean for use by the + * ActiveMQConnectorGBean. + * + * @version $Revision: 1.1.1.1 $ + */ +public interface BrokerServiceGBean extends ActiveMQBroker { + + public abstract BrokerService getBrokerContainer(); + public String getBrokerName(); + + +} \ No newline at end of file diff --git a/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBeanImpl.java b/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java similarity index 83% rename from activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBeanImpl.java rename to activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java index 806a9e2536..25d948ccfc 100755 --- a/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBeanImpl.java +++ b/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java @@ -1,21 +1,20 @@ -/** - * - * Copyright 2004 Protique Ltd - * - * Licensed 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.activemq.gbean; +/** + * + * Copyright 2005-2006 The Apache Software Foundation + * + * Licensed 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.gbean; import java.net.URI; diff --git a/activemq-gbean/src/main/java/org/activemq/gbean/TransportConnectorGBeanImpl.java b/activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java similarity index 86% rename from activemq-gbean/src/main/java/org/activemq/gbean/TransportConnectorGBeanImpl.java rename to activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java index e4194949ee..ad5ec9919e 100755 --- a/activemq-gbean/src/main/java/org/activemq/gbean/TransportConnectorGBeanImpl.java +++ b/activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java @@ -1,27 +1,27 @@ /** * - * Copyright 2004 Protique Ltd + * Copyright 2005-2006 The Apache Software Foundation * - * Licensed 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 + * Licensed 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 + * 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.activemq.gbean; + * 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.gbean; import java.net.InetSocketAddress; import java.net.URI; import java.net.URISyntaxException; import org.apache.activemq.broker.TransportConnector; +import org.apache.activemq.gbean.ActiveMQConnector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.geronimo.gbean.GBeanInfo; diff --git a/activemq-gbean/src/main/java/org/activemq/gbean/management/ActiveMQManagerGBean.java b/activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java similarity index 93% rename from activemq-gbean/src/main/java/org/activemq/gbean/management/ActiveMQManagerGBean.java rename to activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java index a0e4e5916b..2755662e07 100644 --- a/activemq-gbean/src/main/java/org/activemq/gbean/management/ActiveMQManagerGBean.java +++ b/activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java @@ -1,21 +1,20 @@ /** * - * Copyright 2004 Protique Ltd + * Copyright 2005-2006 The Apache Software Foundation * - * Licensed 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 + * Licensed 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 + * 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.activemq.gbean.management; + * 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.gbean.management; import java.util.Set; import java.util.Iterator; @@ -24,10 +23,6 @@ import java.util.List; import java.util.Hashtable; import javax.management.ObjectName; import javax.management.MalformedObjectNameException; -import org.activemq.gbean.ActiveMQManager; -import org.activemq.gbean.ActiveMQBroker; -import org.activemq.gbean.ActiveMQConnector; -import org.activemq.gbean.TransportConnectorGBeanImpl; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.gbean.GBeanQuery; @@ -36,6 +31,10 @@ import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.GBeanNotFoundException; import org.apache.geronimo.j2ee.management.impl.Util; import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.activemq.gbean.ActiveMQBroker; +import org.apache.activemq.gbean.ActiveMQConnector; +import org.apache.activemq.gbean.ActiveMQManager; +import org.apache.activemq.gbean.TransportConnectorGBeanImpl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/activemq-gbean/src/main/java/org/activemq/gbean/package.html b/activemq-gbean/src/main/java/org/apache/activemq/gbean/package.html similarity index 100% rename from activemq-gbean/src/main/java/org/activemq/gbean/package.html rename to activemq-gbean/src/main/java/org/apache/activemq/gbean/package.html diff --git a/activemq-gbean/src/test/java/org/activemq/gbean/ConnectorTest.java b/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java similarity index 69% rename from activemq-gbean/src/test/java/org/activemq/gbean/ConnectorTest.java rename to activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java index ba00ce717c..6b520669df 100644 --- a/activemq-gbean/src/test/java/org/activemq/gbean/ConnectorTest.java +++ b/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java @@ -1,21 +1,22 @@ /** * - * Copyright 2004 Protique Ltd + * Copyright 2005-2006 The Apache Software Foundation * - * Licensed 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 + * Licensed 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 + * 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.activemq.gbean; + * 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.gbean; + +import org.apache.activemq.gbean.TransportConnectorGBeanImpl; import junit.framework.TestCase;