You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/03/27 18:02:52 UTC
svn commit: r389180 - in /incubator/activemq/trunk/activemq-gbean/src:
main/java/org/activemq/gbean/ main/java/org/activemq/gbean/management/
main/java/org/activemq/store/ main/java/org/apache/
main/java/org/apache/activemq/ main/java/org/apache/active...
Author: chirino
Date: Mon Mar 27 08:02:48 2006
New Revision: 389180
URL: http://svn.apache.org/viewcvs?rev=389180&view=rev
Log:
Moved to the org.apache.activemq package and updated copyright headers.
Added:
incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/
incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/
incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/
incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java (contents, props changed)
- copied, changed from r389022, incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBean.java
incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java (contents, props changed)
- copied, changed from r389022, incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBeanImpl.java
incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java (contents, props changed)
- copied, changed from r389022, incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/TransportConnectorGBeanImpl.java
incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/management/
- copied from r389022, incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/management/
incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/package.html (props changed)
- copied unchanged from r389022, incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/package.html
incubator/activemq/trunk/activemq-gbean/src/test/java/org/apache/
incubator/activemq/trunk/activemq-gbean/src/test/java/org/apache/activemq/
incubator/activemq/trunk/activemq-gbean/src/test/java/org/apache/activemq/gbean/
- copied from r389022, incubator/activemq/trunk/activemq-gbean/src/test/java/org/activemq/gbean/
Removed:
incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBean.java
incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBeanImpl.java
incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/TransportConnectorGBeanImpl.java
incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/management/
incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/package.html
incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/store/
incubator/activemq/trunk/activemq-gbean/src/test/java/org/activemq/gbean/
Modified:
incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java
incubator/activemq/trunk/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java
Copied: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java (from r389022, incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBean.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java?p2=incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java&p1=incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBean.java&r1=389022&r2=389180&rev=389180&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBean.java (original)
+++ incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java Mon Mar 27 08:02:48 2006
@@ -1,23 +1,23 @@
-/**
- *
- * 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 org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.gbean.ActiveMQBroker;
/**
* An interface to the ActiveMQContainerGBean for use by the
Propchange: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java
------------------------------------------------------------------------------
svn:executable = *
Copied: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java (from r389022, incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBeanImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java?p2=incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java&p1=incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBeanImpl.java&r1=389022&r2=389180&rev=389180&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/BrokerServiceGBeanImpl.java (original)
+++ incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java Mon Mar 27 08:02:48 2006
@@ -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;
Propchange: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java
------------------------------------------------------------------------------
svn:executable = *
Copied: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java (from r389022, incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/TransportConnectorGBeanImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java?p2=incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java&p1=incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/TransportConnectorGBeanImpl.java&r1=389022&r2=389180&rev=389180&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean/src/main/java/org/activemq/gbean/TransportConnectorGBeanImpl.java (original)
+++ incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java Mon Mar 27 08:02:48 2006
@@ -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;
Propchange: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java?rev=389180&r1=389022&r2=389180&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java (original)
+++ incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/management/ActiveMQManagerGBean.java Mon Mar 27 08:02:48 2006
@@ -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.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.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;
Propchange: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/package.html
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/activemq/trunk/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java?rev=389180&r1=389022&r2=389180&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java (original)
+++ incubator/activemq/trunk/activemq-gbean/src/test/java/org/apache/activemq/gbean/ConnectorTest.java Mon Mar 27 08:02:48 2006
@@ -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;