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 20:28:19 UTC
svn commit: r389219 - in /incubator/activemq/trunk: ./
activemq-gbean-management/src/main/java/org/activemq/gbean/
activemq-gbean-management/src/main/java/org/apache/
activemq-gbean-management/src/main/java/org/apache/activemq/
activemq-gbean-managemen...
Author: chirino
Date: Mon Mar 27 10:28:18 2006
New Revision: 389219
URL: http://svn.apache.org/viewcvs?rev=389219&view=rev
Log:
Getting gbeans to work.
Added:
incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/
incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/
incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/
- copied from r389022, incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/activemq/gbean/
Removed:
incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/activemq/gbean/
Modified:
incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQBroker.java
incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQConnector.java
incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQManager.java
incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java
incubator/activemq/trunk/project.properties
Modified: incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQBroker.java?rev=389219&r1=389022&r2=389219&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQBroker.java (original)
+++ incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQBroker.java Mon Mar 27 10:28:18 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;
+ * 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.geronimo.management.geronimo.JMSBroker;
Modified: incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQConnector.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQConnector.java?rev=389219&r1=389022&r2=389219&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQConnector.java (original)
+++ incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQConnector.java Mon Mar 27 10:28:18 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;
+ * 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.geronimo.management.geronimo.JMSConnector;
Modified: incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQManager.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQManager.java?rev=389219&r1=389022&r2=389219&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQManager.java (original)
+++ incubator/activemq/trunk/activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQManager.java Mon Mar 27 10:28:18 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;
+ * 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.geronimo.management.geronimo.JMSManager;
Modified: incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java?rev=389219&r1=389218&r2=389219&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java (original)
+++ incubator/activemq/trunk/activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java Mon Mar 27 10:28:18 2006
@@ -36,18 +36,10 @@
private Log log = LogFactory.getLog(getClass().getName());
private String brokerName;
- private final URI brokerUri;
+ private String brokerUri;
private BrokerService brokerService;
public BrokerServiceGBeanImpl() {
- brokerName = null;
- brokerUri=null;
- }
-
- public BrokerServiceGBeanImpl(String brokerName, URI brokerUri) {
- assert brokerName != null;
- this.brokerName = brokerName;
- this.brokerUri=brokerUri;
}
public synchronized BrokerService getBrokerContainer() {
@@ -69,7 +61,7 @@
protected BrokerService createContainer() throws Exception {
if( brokerUri!=null ) {
- BrokerService answer = BrokerFactory.createBroker(brokerUri);
+ BrokerService answer = BrokerFactory.createBroker(new URI(brokerUri));
brokerName = answer.getBrokerName();
return answer;
} else {
@@ -104,9 +96,9 @@
static {
GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("ActiveMQ Message Broker", BrokerServiceGBeanImpl.class, "JMSServer");
infoFactory.addAttribute("brokerName", String.class, true);
- infoFactory.addAttribute("brokerUri", URI.class, true);
+ infoFactory.addAttribute("brokerUri", String.class, true);
infoFactory.addInterface(BrokerServiceGBean.class);
- infoFactory.setConstructor(new String[]{"brokerName, brokerUri"});
+ // infoFactory.setConstructor(new String[]{"brokerName, brokerUri"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
@@ -121,8 +113,16 @@
return brokerName;
}
- public URI getBrokerUri() {
+ public String getBrokerUri() {
return brokerUri;
+ }
+
+ public void setBrokerName(String brokerName) {
+ this.brokerName = brokerName;
+ }
+
+ public void setBrokerUri(String brokerUri) {
+ this.brokerUri = brokerUri;
}
Modified: incubator/activemq/trunk/project.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/project.properties?rev=389219&r1=389218&r2=389219&view=diff
==============================================================================
--- incubator/activemq/trunk/project.properties (original)
+++ incubator/activemq/trunk/project.properties Mon Mar 27 10:28:18 2006
@@ -14,6 +14,8 @@
activemq-web/project.xml,\
activemq-console/project.xml,\
activemq-optional/project.xml,\
+activemq-gbean/project.xml,\
+activemq-gbean-management/project.xml,\
assembly/project.xml
#activeio/project.xml,\
#activemq-systest/project.xml,\