You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/03/17 07:22:56 UTC
svn commit: r519247 - in /geronimo/server/branches/1.2/modules:
geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/
geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/
Author: jdillon
Date: Fri Mar 16 23:22:55 2007
New Revision: 519247
URL: http://svn.apache.org/viewvc?view=rev&rev=519247
Log:
Tidy up a wee bit
Modified:
geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQBroker.java
geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQConnector.java
geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQManager.java
geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java
geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java
geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java
Modified: geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQBroker.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQBroker.java?view=diff&rev=519247&r1=519246&r2=519247
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQBroker.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQBroker.java Fri Mar 16 23:22:55 2007
@@ -24,7 +24,7 @@
* links to code in activemq-core, yet we still want to be able to
* distinguish ActiveMQ brokers from non-ActiveMQ JMS brokers.
*
- * @version $Revision: 1.0$
+ * @version $Rev$ $Date$
*/
public interface ActiveMQBroker extends JMSBroker {
}
Modified: geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQConnector.java?view=diff&rev=519247&r1=519246&r2=519247
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQConnector.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQConnector.java Fri Mar 16 23:22:55 2007
@@ -21,10 +21,10 @@
/**
* The GBean interface for the ActiveMQ network connector GBean
*
- * @version $Revision: 1.0$
+ * @version $Rev$ $Date$
*/
public interface ActiveMQConnector extends JMSConnector {
- public final static String CONNECTOR_J2EE_TYPE = "JMSConnector";
+ String CONNECTOR_J2EE_TYPE = "JMSConnector";
// Additional stuff you can add to an ActiveMQ connector URI
String getPath();
Modified: geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQManager.java?view=diff&rev=519247&r1=519246&r2=519247
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQManager.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-activemq-gbean-management/src/main/java/org/apache/activemq/gbean/ActiveMQManager.java Fri Mar 16 23:22:55 2007
@@ -23,7 +23,7 @@
* The GBean interface for the ActiveMQ management GBean. This defines the
* features that should be available to the management interface at runtime.
*
- * @version $Revision: 1.0$
+ * @version $Rev$ $Date$
*/
public interface ActiveMQManager extends JMSManager, J2EEManagedObject {
}
Modified: geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java?view=diff&rev=519247&r1=519246&r2=519247
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBean.java Fri Mar 16 23:22:55 2007
@@ -23,11 +23,9 @@
* An interface to the ActiveMQContainerGBean for use by the
* ActiveMQConnectorGBean.
*
- * @version $Revision$
+ * @version $Rev$ $Date$
*/
public interface BrokerServiceGBean extends ActiveMQBroker {
-
- abstract BrokerService getBrokerContainer();
- String getBrokerName();
-
+ BrokerService getBrokerContainer();
+ String getBrokerName();
}
Modified: geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java?view=diff&rev=519247&r1=519246&r2=519247
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/BrokerServiceGBeanImpl.java Fri Mar 16 23:22:55 2007
@@ -39,7 +39,7 @@
/**
* Default implementation of the ActiveMQ Message Server
*
- * @version $Revision$
+ * @version $Rev$ $Date$
*/
public class BrokerServiceGBeanImpl implements GBeanLifecycle, BrokerServiceGBean {
@@ -232,7 +232,7 @@
}
public ClassLoader getClassLoader() {
- if( classLoader == null ) {
+ if (classLoader == null) {
classLoader = this.getClass().getClassLoader();
}
return classLoader;
Modified: geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java?view=diff&rev=519247&r1=519246&r2=519247
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java (original)
+++ geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/src/main/java/org/apache/activemq/gbean/TransportConnectorGBeanImpl.java Fri Mar 16 23:22:55 2007
@@ -32,7 +32,7 @@
/**
* Default implementation of the ActiveMQ connector
*
- * @version $Revision$ $Date$
+ * @version $Rev$ $Date$
*/
public class TransportConnectorGBeanImpl implements GBeanLifecycle, ActiveMQConnector {
private Log log = LogFactory.getLog(getClass().getName());
@@ -116,13 +116,13 @@
ClassLoader old = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(getClassLoader());
try {
- if (transportConnector == null) {
+ if (transportConnector == null) {
urlAsStarted = getUrl();
- transportConnector = createBrokerConnector(urlAsStarted);
- transportConnector.start();
- }
+ transportConnector = createBrokerConnector(urlAsStarted);
+ transportConnector.start();
+ }
} finally {
- Thread.currentThread().setContextClassLoader(old);
+ Thread.currentThread().setContextClassLoader(old);
}
}
@@ -152,7 +152,7 @@
}
public ClassLoader getClassLoader() {
- if( classLoader == null ) {
+ if (classLoader == null) {
classLoader = this.getClass().getClassLoader();
}
return classLoader;