geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r356113 - in /geronimo/branches/1.0: applications/console-framework/src/webapp/WEB-INF/data/ applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/ applications/console-standard/src/java/org/apache/geronimo/console/s...
Date Mon, 12 Dec 2005 02:54:05 GMT
Author: ammulder
Date: Sun Dec 11 18:54:02 2005
New Revision: 356113

URL: http://svn.apache.org/viewcvs?rev=356113&view=rev
Log:
Remove unused portlets
Fix broken JMS portlets, and remove broken options from others
Unbreak the ActiveMQ config
Unbreak the Jetty request log

Modified:
    geronimo/branches/1.0/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp
    geronimo/branches/1.0/configs/activemq/project.properties
    geronimo/branches/1.0/configs/activemq/src/plan/plan.xml
    geronimo/branches/1.0/configs/jetty/src/plan/plan.xml

Modified: geronimo/branches/1.0/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml?rev=356113&r1=356112&r2=356113&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
(original)
+++ geronimo/branches/1.0/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
Sun Dec 11 18:54:02 2005
@@ -142,7 +142,7 @@
                 </fragment>
             </fragment>
         </fragment>
-
+<!--
         <fragment name="ejb" type="page">
             <navigation>
                 <title>EJB Server</title>
@@ -157,7 +157,7 @@
                 </fragment>
             </fragment>
         </fragment>
-
+-->
         <fragment name="jmsserver" type="page">
             <navigation>
                 <title>JMS Server</title>
@@ -178,7 +178,7 @@
                 </fragment>
             </fragment>
         </fragment>
-
+<!--
         <fragment name="j2ca" type="page">
             <navigation>
                 <title>J2EE Connectors</title>
@@ -223,6 +223,7 @@
                 </fragment>
             </fragment>
         </fragment>
+-->
     </fragment>
 
     <fragment name="services" type="page">

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java?rev=356113&r1=356112&r2=356113&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/AbstractJMSManager.java
Sun Dec 11 18:54:02 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/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/car,j2eeType=JCAManagedConnectionFactory,name=DefaultActiveMQConnectionFactory";
 
     protected static Object[] no_args = new Object[0];
 

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java?rev=356113&r1=356112&r2=356113&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
Sun Dec 11 18:54:02 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/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp?rev=356113&r1=356112&r2=356113&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/server/normal.jsp
Sun Dec 11 18:54:02 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/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp?rev=356113&r1=356112&r2=356113&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmsmanager/view.jsp
Sun Dec 11 18:54:02 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/branches/1.0/configs/activemq/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/activemq/project.properties?rev=356113&r1=356112&r2=356113&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/activemq/project.properties (original)
+++ geronimo/branches/1.0/configs/activemq/project.properties Sun Dec 11 18:54:02 2005
@@ -29,3 +29,4 @@
 PlanServerHostname=localhost
 PlanClientAddresses=127.0.0.1
 PlanRemoteLoginPort=4242
+PlanActiveMQPort=61616

Modified: geronimo/branches/1.0/configs/activemq/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/activemq/src/plan/plan.xml?rev=356113&r1=356112&r2=356113&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/activemq/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/activemq/src/plan/plan.xml Sun Dec 11 18:54:02 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/branches/1.0/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/jetty/src/plan/plan.xml?rev=356113&r1=356112&r2=356113&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/jetty/src/plan/plan.xml Sun Dec 11 18:54:02 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>
 
 



Mime
View raw message