You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/12/12 04:16:38 UTC
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/...
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 @@
<!-- Show existing connectors -->
<c:if test="${empty(brokers)}">There are no JMS brokers defined</c:if>
<c:if test="${!empty(brokers)}">
-<table width="100%">
+<table width="50%">
<tr><td style="padding: 0 20px"></td></tr>
<tr>
<td class="DarkBackground">Name</td>
<td class="DarkBackground" align="center">State</td>
+<!--
<td class="DarkBackground" align="center">Actions</td>
+-->
</tr>
<c:forEach var="entry" items="${brokers}">
<tr>
<td>${entry.key}</td>
<td>${entry.value.stateInstance}</td>
+<!--
<td>
<c:choose>
<c:when test="${entry.value.stateInstance.name eq 'running'}">
@@ -42,12 +45,14 @@
<portlet:param name="objectName" value="${entry.value.objectName}" />
</portlet:actionURL>">delete</a>
</td>
+-->
</tr>
</c:forEach>
</table>
</c:if>
-
+<!--
<br />
<a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="new" />
</portlet:actionURL>">Add new JMS Broker</a>
+-->
\ 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 @@
<br>
<table>
+<!--
<tr>
<td align=LEFT colspan="3"> <a href="<portlet:renderURL portletMode="view"><portlet:param name="processAction" value="createDestination"/></portlet:renderURL>">Add Queue/Topic </a> </td>
</tr>
+-->
<c:if test="${!destinationsMsg}">
<tr>
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 @@
<resourceadapter>
<resourceadapter-instance>
<resourceadapter-name>ActiveMQ RA</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://localhost:61616${PlanActiveMQPort}</config-property-setting>
+ <config-property-setting name="ServerUrl">tcp://${PlanServerHostname}:${PlanActiveMQPort}</config-property-setting>
<config-property-setting name="UserName">geronimo</config-property-setting>
<config-property-setting name="Password">geronimo</config-property-setting>
<workmanager>
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 @@
<gbean-name>geronimo.server:name=JettyRequestLog,*</gbean-name>
</pattern>
</references>
+ <reference name="ServerInfo">
+ <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
+ <name>ServerInfo</name>
+ </reference>
</gbean>