You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/07/21 17:10:03 UTC
svn commit: r1149211 - in
/geronimo/server/trunk/plugins/activemq/activemq-portlets: pom.xml
src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java
Author: genspring
Date: Thu Jul 21 15:10:02 2011
New Revision: 1149211
URL: http://svn.apache.org/viewvc?rev=1149211&view=rev
Log:
GERONIMO-5859 Reenable JMS related portlets, additional patch from Shenghao Fang to remove the invalid geronimo-activemq dependency.
Modified:
geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=1149211&r1=1149210&r2=1149211&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Thu Jul 21 15:10:02 2011
@@ -107,13 +107,7 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-activemq</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq-management</artifactId>
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java?rev=1149211&r1=1149210&r2=1149211&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/server/JMSBrokerPortlet.java Thu Jul 21 15:10:02 2011
@@ -26,8 +26,6 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.URI;
-import java.util.Collections;
-import java.util.List;
import java.util.Map;
import javax.portlet.ActionRequest;
@@ -41,18 +39,13 @@ import javax.portlet.RenderResponse;
import javax.portlet.WindowState;
import org.apache.activemq.broker.BrokerService;
-import org.apache.geronimo.activemq.BrokerServiceGBeanImpl;
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.InternalKernelException;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
-import org.apache.geronimo.management.geronimo.JMSBroker;
-import org.apache.geronimo.system.jmx.MBeanServerReference;
import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;