Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 51375 invoked from network); 12 Dec 2005 03:17:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Dec 2005 03:17:04 -0000 Received: (qmail 9758 invoked by uid 500); 12 Dec 2005 03:17:03 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 9709 invoked by uid 500); 12 Dec 2005 03:17:02 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 9697 invoked by uid 99); 12 Dec 2005 03:17:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Dec 2005 19:17:02 -0800 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 11 Dec 2005 19:17:01 -0800 Received: (qmail 51042 invoked by uid 65534); 12 Dec 2005 03:16:41 -0000 Message-ID: <20051212031641.51040.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r356127 - in /geronimo/trunk: applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/ applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ applications/console-standard/src/webapp/WEB-INF/... Date: Mon, 12 Dec 2005 03:16:38 -0000 To: scm@geronimo.apache.org From: ammulder@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ammulder Date: Sun Dec 11 19:16:35 2005 New Revision: 356127 URL: http://svn.apache.org/viewcvs?rev=356127&view=rev Log: Clean up portlets and ActiveMQ and stuff Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp geronimo/trunk/configs/activemq/project.properties geronimo/trunk/configs/activemq/src/plan/plan.xml geronimo/trunk/configs/jetty/src/plan/plan.xml Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java?rev=356127&r1=356126&r2=356127&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java (original) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java Sun Dec 11 19:16:35 2005 @@ -31,7 +31,7 @@ public abstract class AbstractJMSManager { - protected static final String JMS_SERVER_MBEAN_NAME = "geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/ActiveMQServer,J2EEServer=geronimo,j2eeType=JMSServer,name=ActiveMQl"; + protected static final String JMS_SERVER_MBEAN_NAME = "geronimo.server:J2EEApplication=null,J2EEModule=geronimo/activemq-broker/1.0-SNAPSHOT/car,J2EEServer=geronimo,j2eeType=JMSServer,name=ActiveMQl"; protected static final String GET_BROKER_ADMIN_FUNCTION = "getBrokerAdmin"; @@ -57,7 +57,7 @@ protected static final String DESTINATION_CONFIG_URI = "destinationConfigURI"; - protected static final String CONNECTION_FACTORY_NAME = "geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=org/apache/geronimo/SystemJMS,j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory"; + protected static final String CONNECTION_FACTORY_NAME = "geronimo.server:J2EEApplication=null,J2EEServer=geronimo,JCAResource=geronimo/activemq/1.0-SNAPSHOT/car,j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory"; protected static Object[] no_args = new Object[0]; Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java?rev=356127&r1=356126&r2=356127&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java (original) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java Sun Dec 11 19:16:35 2005 @@ -36,7 +36,7 @@ public class ServerManagerPortlet extends BasePortlet { - private static final Log log = LogFactory.getLog("ServerManager"); + private static final Log log = LogFactory.getLog(ServerManagerPortlet.class); private PortletRequestDispatcher normalView; @@ -49,7 +49,7 @@ public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException { if (actionRequest.getParameter("reboot") != null) { - log.info("Reboot initiated by user request: " + actionRequest.getUserPrincipal()); + log.info("Reboot initiated by user request: " + actionRequest.getUserPrincipal().getName()); new Thread() { public void run() { try { @@ -66,7 +66,7 @@ protected void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException { if (request.getParameter("shutdown") != null) { - log.info("Shutting down by user request: " + request.getUserPrincipal()); + log.info("Shutting down by user request: " + request.getUserPrincipal().getName()); shutdownView.include(request, response); response.flushBuffer(); kernel.shutdown(); Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp?rev=356127&r1=356126&r2=356127&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp (original) +++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp Sun Dec 11 19:16:35 2005 @@ -7,17 +7,20 @@ There are no JMS brokers defined - +
+ +
Name State
${entry.key} ${entry.value.stateInstance}
- + \ No newline at end of file Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp?rev=356127&r1=356126&r2=356127&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp (original) +++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp Sun Dec 11 19:16:35 2005 @@ -4,9 +4,11 @@
+ Modified: geronimo/trunk/configs/activemq/project.properties URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq/project.properties?rev=356127&r1=356126&r2=356127&view=diff ============================================================================== --- geronimo/trunk/configs/activemq/project.properties (original) +++ geronimo/trunk/configs/activemq/project.properties Sun Dec 11 19:16:35 2005 @@ -29,3 +29,4 @@ PlanServerHostname=localhost PlanClientAddresses=127.0.0.1 PlanRemoteLoginPort=4242 +PlanActiveMQPort=61616 Modified: geronimo/trunk/configs/activemq/src/plan/plan.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/activemq/src/plan/plan.xml?rev=356127&r1=356126&r2=356127&view=diff ============================================================================== --- geronimo/trunk/configs/activemq/src/plan/plan.xml (original) +++ geronimo/trunk/configs/activemq/src/plan/plan.xml Sun Dec 11 19:16:35 2005 @@ -24,7 +24,7 @@ ActiveMQ RA - tcp://localhost:61616${PlanActiveMQPort} + tcp://${PlanServerHostname}:${PlanActiveMQPort} geronimo geronimo Modified: geronimo/trunk/configs/jetty/src/plan/plan.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty/src/plan/plan.xml?rev=356127&r1=356126&r2=356127&view=diff ============================================================================== --- geronimo/trunk/configs/jetty/src/plan/plan.xml (original) +++ geronimo/trunk/configs/jetty/src/plan/plan.xml Sun Dec 11 19:16:35 2005 @@ -40,6 +40,10 @@ geronimo.server:name=JettyRequestLog,* + + geronimo/j2ee-system/${pom.currentVersion}/car + ServerInfo +