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 2006/01/24 18:40:00 UTC
svn commit: r371961 - in /geronimo/branches/1.0/applications:
console-core/src/java/org/apache/geronimo/console/util/
console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/
console-standard/src/java/org/apache/geronimo/console/util/ c...
Author: ammulder
Date: Tue Jan 24 09:39:50 2006
New Revision: 371961
URL: http://svn.apache.org/viewcvs?rev=371961&view=rev
Log:
Improve JMS resource portlet
Added:
geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ReviewHandler.java (with props)
geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp (with props)
Modified:
geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java
geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java
geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java
geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java
geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp
geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp
geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp
geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp
geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp
geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp
geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp
Modified: geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java (original)
+++ geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java Tue Jan 24 09:39:50 2006
@@ -24,6 +24,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.HashSet;
+import java.util.Arrays;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.security.auth.Subject;
@@ -265,6 +267,11 @@
}
public ResourceAdapterModule[] getOutboundRAModules(J2EEServer server, String connectionFactoryInterface) {
+ return getOutboundRAModules(server, new String[]{connectionFactoryInterface});
+ }
+
+ public ResourceAdapterModule[] getOutboundRAModules(J2EEServer server, String[] connectionFactoryInterfaces) {
+ Set targets = new HashSet(Arrays.asList(connectionFactoryInterfaces));
List list = new ArrayList();
try {
String[] names = server.getDeployedObjects();
@@ -284,13 +291,13 @@
for (int l = 0; l < factories.length; l++) {
JCAConnectionFactory factory = factories[l];
JCAManagedConnectionFactory mcf = getManagedConnectionFactory(factory);
- if(mcf.getConnectionFactoryInterface().equals(connectionFactoryInterface)) {
+ if(targets.contains(mcf.getConnectionFactoryInterface())) {
list.add(module);
break outer;
}
for (int m = 0; m < mcf.getImplementedInterfaces().length; m++) {
String iface = mcf.getImplementedInterfaces()[m];
- if(iface.equals(connectionFactoryInterface)) {
+ if(targets.contains(iface)) {
list.add(module);
break outer;
}
@@ -368,6 +375,10 @@
}
public JCAManagedConnectionFactory[] getOutboundFactories(ResourceAdapterModule module, String connectionFactoryInterface) {
+ return getOutboundFactories(module, new String[]{connectionFactoryInterface});
+ }
+ public JCAManagedConnectionFactory[] getOutboundFactories(ResourceAdapterModule module, String[] connectionFactoryInterfaces) {
+ Set targets = new HashSet(Arrays.asList(connectionFactoryInterfaces));
List list = new ArrayList();
try {
ResourceAdapter[] adapters = getResourceAdapters(module);
@@ -380,13 +391,13 @@
for (int l = 0; l < factories.length; l++) {
JCAConnectionFactory factory = factories[l];
JCAManagedConnectionFactory mcf = getManagedConnectionFactory(factory);
- if(mcf.getConnectionFactoryInterface().equals(connectionFactoryInterface)) {
+ if(targets.contains(mcf.getConnectionFactoryInterface())) {
list.add(mcf);
continue;
}
for (int m = 0; m < mcf.getImplementedInterfaces().length; m++) {
String iface = mcf.getImplementedInterfaces()[m];
- if(iface.equals(connectionFactoryInterface)) {
+ if(targets.contains(iface)) {
list.add(mcf);
break;
}
Modified: geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java (original)
+++ geronimo/branches/1.0/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java Tue Jan 24 09:39:50 2006
@@ -81,6 +81,7 @@
EJBModule[] getEJBModules(J2EEServer server);
ResourceAdapterModule[] getRAModules(J2EEServer server);
ResourceAdapterModule[] getOutboundRAModules(J2EEServer server, String connectionFactoryInterface);
+ ResourceAdapterModule[] getOutboundRAModules(J2EEServer server, String[] connectionFactoryInterfaces);
ResourceAdapterModule[] getAdminObjectModules(J2EEServer server, String[] adminObjectInterfaces);
JCAManagedConnectionFactory[] getOutboundFactories(J2EEServer server, String connectionFactoryInterface);
J2EEResource[] getResources(J2EEServer server);
@@ -139,6 +140,7 @@
ResourceAdapter[] getResourceAdapters(ResourceAdapterModule module);
JCAManagedConnectionFactory[] getOutboundFactories(ResourceAdapterModule module);
JCAManagedConnectionFactory[] getOutboundFactories(ResourceAdapterModule module, String connectionFactoryInterface);
+ JCAManagedConnectionFactory[] getOutboundFactories(ResourceAdapterModule module, String[] connectionFactoryInterfaces);
//todo: create an interface for admin objects
JCAAdminObject[] getAdminObjects(ResourceAdapterModule module, String[] adminObjectInterfaces);
Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java Tue Jan 24 09:39:50 2006
@@ -21,7 +21,6 @@
import javax.enterprise.deploy.spi.DeploymentConfiguration;
import javax.enterprise.deploy.spi.Target;
import javax.enterprise.deploy.spi.TargetModuleID;
-import javax.enterprise.deploy.spi.DConfigBean;
import javax.enterprise.deploy.spi.status.ProgressObject;
import javax.enterprise.deploy.model.DDBeanRoot;
import javax.enterprise.deploy.model.DDBean;
Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java Tue Jan 24 09:39:50 2006
@@ -184,6 +184,9 @@
}
public static JMSProviderData getProviderData(String rar, PortletRequest request) throws IOException {
+ if(all == null) {
+ loadProviders();
+ }
for (int i = 0; i < all.size(); i++) {
JMSProviderData data = (JMSProviderData) all.get(i);
if(data.getRaURI().equals(rar)) {
Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java Tue Jan 24 09:39:50 2006
@@ -52,6 +52,7 @@
addHelper(new CreateDestinationHandler(), config);
addHelper(new ShowPlanHandler(), config);
addHelper(new DeployHandler(), config);
+ addHelper(new ReviewHandler(), config);
}
public void destroy() {
@@ -82,7 +83,7 @@
log.error("No handler for action mode '"+mode+"'");
break;
}
-System.out.println("Using action handler '"+handler.getClass().getName()+"'");
+ log.debug("Using action handler '"+handler.getClass().getName()+"'");
if(type.equals("before")) {
mode = handler.actionBeforeView(actionRequest, actionResponse, data);
} else if(type.equals("after")) {
@@ -113,7 +114,7 @@
if(handler == null) {
log.error("No handler for render mode '"+mode+"'");
} else {
-System.out.println("Using render handler '"+handler.getClass().getName()+"'");
+ log.debug("Using render handler '"+handler.getClass().getName()+"'");
handler.renderView(renderRequest, renderResponse, data);
}
} catch (Throwable e) {
Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java Tue Jan 24 09:39:50 2006
@@ -70,8 +70,8 @@
List resources = new ArrayList();
// Get the list of connection factories
- //todo: do we need to check for QueueCF and TopicCF too?
- ResourceAdapterModule[] modules = PortletManager.getOutboundRAModules(renderRequest, "javax.jms.ConnectionFactory");
+ ResourceAdapterModule[] modules = PortletManager.getOutboundRAModules(renderRequest, new String[]{
+ "javax.jms.ConnectionFactory","javax.jms.QueueConnectionFactory","javax.jms.TopicConnectionFactory",});
try {
for (int i = 0; i < modules.length; i++) {
ResourceAdapterModule module = modules[i];
@@ -90,7 +90,6 @@
if(adapters.length == 1 && adapters[0].getJCAResources().length == 1) {
JCAResource[] resource = PortletManager.getJCAResources(renderRequest, adapters[0]);
if(resource.length == 1 && resource[0].getResourceAdapterInstances().length == 1) {
- System.out.println("RA Object Name is '"+resource[0].getResourceAdapterInstances()[0]);
name = ObjectName.getInstance(resource[0].getResourceAdapterInstances()[0]).getKeyProperty(NameFactory.J2EE_NAME);
}
}
@@ -102,7 +101,8 @@
resources.add(target);
}
- JCAManagedConnectionFactory[] factories = PortletManager.getOutboundFactoriesForRA(renderRequest, module, "javax.jms.ConnectionFactory");
+ JCAManagedConnectionFactory[] factories = PortletManager.getOutboundFactoriesForRA(renderRequest, module, new String[]{
+ "javax.jms.ConnectionFactory", "javax.jms.QueueConnectionFactory", "javax.jms.TopicConnectionFactory", });
for (int j = 0; j < factories.length; j++) {
JCAManagedConnectionFactory factory = factories[j];
ObjectName name = ObjectName.getInstance(factory.getObjectName());
@@ -130,7 +130,6 @@
if(adapters.length == 1 && adapters[0].getJCAResources().length == 1) {
JCAResource[] resource = PortletManager.getJCAResources(renderRequest, adapters[0]);
if(resource.length == 1 && resource[0].getResourceAdapterInstances().length == 1) {
- System.out.println("RA Object Name is '"+resource[0].getResourceAdapterInstances()[0]);
name = ObjectName.getInstance(resource[0].getResourceAdapterInstances()[0]).getKeyProperty(NameFactory.J2EE_NAME);
}
}
Added: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ReviewHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ReviewHandler.java?rev=371961&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ReviewHandler.java (added)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ReviewHandler.java Tue Jan 24 09:39:50 2006
@@ -0,0 +1,54 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.console.jmsmanager.wizard;
+
+import java.io.IOException;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+/**
+ * HAndles the screen where you review your progress so far
+ *
+ * @version $Rev: 368994 $ $Date: 2006-01-14 02:07:18 -0500 (Sat, 14 Jan 2006) $
+ */
+public class ReviewHandler extends AbstractHandler {
+ public ReviewHandler() {
+ super(REVIEW_MODE, "/WEB-INF/view/jmswizard/status.jsp");
+ }
+
+ public String actionBeforeView(ActionRequest request, ActionResponse response, JMSResourceData data) throws PortletException, IOException {
+ return getMode();
+ }
+
+ public void renderView(RenderRequest request, RenderResponse response, JMSResourceData data) throws PortletException, IOException {
+ JMSProviderData provider = JMSProviderData.getProviderData(data.getRarURI(), request);
+ request.setAttribute("provider", provider);
+ }
+
+ public String actionAfterView(ActionRequest request, ActionResponse response, JMSResourceData data) throws PortletException, IOException {
+ String next = request.getParameter("nextAction");
+ if(next.equals(SELECT_DESTINATION_TYPE_MODE)) {
+ data.setCurrentDestinationID(data.getAdminObjects().size());
+ } else if(next.equals(SELECT_FACTORY_TYPE_MODE)) {
+ data.setCurrentFactoryID(data.getConnectionFactories().size());
+ }
+ return next+BEFORE_ACTION;
+ }
+}
Propchange: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ReviewHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java Tue Jan 24 09:39:50 2006
@@ -57,6 +57,7 @@
}
public String actionAfterView(ActionRequest request, ActionResponse response, JMSResourceData data) throws PortletException, IOException {
+ request.getPortletSession(true).removeAttribute("deploymentPlan");
String next = request.getParameter("nextAction");
if(next.equals(SELECT_DESTINATION_TYPE_MODE)) {
data.setCurrentDestinationID(data.getAdminObjects().size());
Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java Tue Jan 24 09:39:50 2006
@@ -199,6 +199,11 @@
return helper.getOutboundRAModules(getCurrentServer(request), iface);
}
+ public static ResourceAdapterModule[] getOutboundRAModules(PortletRequest request, String[] iface) {
+ ManagementHelper helper = getManagementHelper(request);
+ return helper.getOutboundRAModules(getCurrentServer(request), iface);
+ }
+
public static ResourceAdapterModule[] getAdminObjectModules(PortletRequest request, String[] ifaces) {
ManagementHelper helper = getManagementHelper(request);
return helper.getAdminObjectModules(getCurrentServer(request), ifaces);
@@ -225,6 +230,11 @@
}
public static JCAManagedConnectionFactory[] getOutboundFactoriesForRA(PortletRequest request, ResourceAdapterModule module, String iface) {
+ ManagementHelper helper = getManagementHelper(request);
+ return helper.getOutboundFactories(module, iface);
+ }
+
+ public static JCAManagedConnectionFactory[] getOutboundFactoriesForRA(PortletRequest request, ResourceAdapterModule module, String[] iface) {
ManagementHelper helper = getManagementHelper(request);
return helper.getOutboundFactories(module, iface);
}
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp Tue Jan 24 09:39:50 2006
@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<portlet:defineObjects/>
-<p><b>Create JMS Resource</b> -- Add Connection Factory</p>
+<p><b>JMS Resource Group</b> -- Configure Destination</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -75,11 +75,8 @@
<tr>
<td></td>
<td>
- <input type="hidden" name="nextAction" value="factoryType" />
- <input type="submit" value="Add Connection Factory" />
- <input type="button" value="Add Destination" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='destinationType';document.<portlet:namespace/>JMSForm.submit();return false;" />
- <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='plan';document.<portlet:namespace/>JMSForm.submit();return false;" />
- <input type="button" value="Deploy Now" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='deploy';document.<portlet:namespace/>JMSForm.submit();return false;" />
+ <input type="hidden" name="nextAction" value="review" />
+ <input type="submit" value="Next" />
</td>
</tr>
</table>
@@ -87,9 +84,9 @@
<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-<p><b>Current Status for JMS Resource <c:out value="${data.instanceName}" /></b></p>
+<p><b>Current Status for JMS Resource Group <c:out value="${data.instanceName}" /></b></p>
<ul>
- <li><c:out value="${data.connectionFactoryCount}" /> Connection Factories
+ <li><c:out value="${data.connectionFactoryCount}" /> Connection Factor<c:choose><c:when test="${data.connectionFactoryCount == 1}">y</c:when><c:otherwise>ies</c:otherwise></c:choose>
<c:if test="${data.connectionFactoryCount > 0}">
<ul>
<c:forEach var="factory" items="${data.connectionFactories}">
@@ -107,7 +104,7 @@
</ul>
</c:if>
</li>
- <li><c:out value="${data.destinationCount}" /> Destinations
+ <li><c:out value="${data.destinationCount}" /> Destination<c:if test="${data.destinationCount != 1}">s</c:if>
<c:if test="${data.destinationCount > 0}">
<ul>
<c:forEach var="dest" items="${data.adminObjects}">
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp Tue Jan 24 09:39:50 2006
@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<portlet:defineObjects/>
-<p><b>Create JMS Resource</b> -- Select JMS Provider RAR</p>
+<p><b>JMS Resource Group</b> -- Select Destination Type</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -67,9 +67,9 @@
<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-<p><b>Current Status for JMS Resource <c:out value="${data.instanceName}" /></b></p>
+<p><b>Current Status for JMS Resource Group <c:out value="${data.instanceName}" /></b></p>
<ul>
- <li><c:out value="${data.connectionFactoryCount}" /> Connection Factories
+ <li><c:out value="${data.connectionFactoryCount}" /> Connection Factor<c:choose><c:when test="${data.connectionFactoryCount == 1}">y</c:when><c:otherwise>ies</c:otherwise></c:choose>
<c:if test="${data.connectionFactoryCount > 0}">
<ul>
<c:forEach var="factory" items="${data.connectionFactories}">
@@ -87,7 +87,7 @@
</ul>
</c:if>
</li>
- <li><c:out value="${data.destinationCount}" /> Destinations
+ <li><c:out value="${data.destinationCount}" /> Destination<c:if test="${data.destinationCount != 1}">s</c:if>
<c:if test="${data.destinationCount > 0}">
<ul>
<c:forEach var="dest" items="${data.adminObjects}">
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp Tue Jan 24 09:39:50 2006
@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<portlet:defineObjects/>
-<p><b>Create JMS Resource</b> -- Add Connection Factory</p>
+<p><b>JMS Resource Group</b> -- Configure Connection Factory</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -131,11 +131,8 @@
<tr>
<td></td>
<td>
- <input type="hidden" name="nextAction" value="factoryType" />
- <input type="submit" value="Add Connection Factory" />
- <input type="button" value="Add Destination" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='destinationType';document.<portlet:namespace/>JMSForm.submit();return false;" />
- <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='plan';document.<portlet:namespace/>JMSForm.submit();return false;" />
- <input type="button" value="Deploy Now" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='deploy';document.<portlet:namespace/>JMSForm.submit();return false;" />
+ <input type="hidden" name="nextAction" value="review" />
+ <input type="submit" value="Next" />
</td>
</tr>
</table>
@@ -143,9 +140,9 @@
<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-<p><b>Current Status for JMS Resource <c:out value="${data.instanceName}" /></b></p>
+<p><b>Current Status for JMS Resource Group <c:out value="${data.instanceName}" /></b></p>
<ul>
- <li><c:out value="${data.connectionFactoryCount}" /> Connection Factories
+ <li><c:out value="${data.connectionFactoryCount}" /> Connection Factor<c:choose><c:when test="${data.connectionFactoryCount == 1}">y</c:when><c:otherwise>ies</c:otherwise></c:choose>
<c:if test="${data.connectionFactoryCount > 0}">
<ul>
<c:forEach var="factory" items="${data.connectionFactories}">
@@ -163,7 +160,7 @@
</ul>
</c:if>
</li>
- <li><c:out value="${data.destinationCount}" /> Destinations
+ <li><c:out value="${data.destinationCount}" /> Destination<c:if test="${data.destinationCount != 1}">s</c:if>
<c:if test="${data.destinationCount > 0}">
<ul>
<c:forEach var="dest" items="${data.adminObjects}">
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp Tue Jan 24 09:39:50 2006
@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<portlet:defineObjects/>
-<p><b>Create JMS Resource</b> -- Select JMS Provider RAR</p>
+<p><b>JMS Resource Group</b> -- Select Connection Factory Type</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -67,9 +67,9 @@
<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-<p><b>Current Status for JMS Resource <c:out value="${data.instanceName}" /></b></p>
+<p><b>Current Status for JMS Resource Group <c:out value="${data.instanceName}" /></b></p>
<ul>
- <li><c:out value="${data.connectionFactoryCount}" /> Connection Factories
+ <li><c:out value="${data.connectionFactoryCount}" /> Connection Factor<c:choose><c:when test="${data.connectionFactoryCount == 1}">y</c:when><c:otherwise>ies</c:otherwise></c:choose>
<c:if test="${data.connectionFactoryCount > 0}">
<ul>
<c:forEach var="factory" items="${data.connectionFactories}">
@@ -87,7 +87,7 @@
</ul>
</c:if>
</li>
- <li><c:out value="${data.destinationCount}" /> Destinations
+ <li><c:out value="${data.destinationCount}" /> Destination<c:if test="${data.destinationCount != 1}">s</c:if>
<c:if test="${data.destinationCount > 0}">
<ul>
<c:forEach var="dest" items="${data.adminObjects}">
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp Tue Jan 24 09:39:50 2006
@@ -2,7 +2,7 @@
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<portlet:defineObjects/>
-<p><b>Create JMS Resource</b> -- Show Deployment Plan</p>
+<p><b>JMS Resource Group</b> -- Show Deployment Plan</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -51,8 +51,7 @@
<td></td>
<td>
<input type="hidden" name="nextAction" value="deploy" />
- <input type="button" value="Add Connection Factory" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='factoryType';document.<portlet:namespace/>JMSForm.submit();return false;" />
- <input type="button" value="Add Destination" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='destinationType';document.<portlet:namespace/>JMSForm.submit();return false;" />
+ <input type="button" value="Edit Configuration" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='review';document.<portlet:namespace/>JMSForm.submit();return false;" />
<input type="submit" value="Deploy JMS Resource" />
</td>
</tr>
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp Tue Jan 24 09:39:50 2006
@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<portlet:defineObjects/>
-<p><b>Create JMS Resource</b> -- Select JMS Provider RAR</p>
+<p><b>JMS Resource Group</b> -- Select JMS Provider RAR</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>">
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp?rev=371961&r1=371960&r2=371961&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp Tue Jan 24 09:39:50 2006
@@ -3,7 +3,12 @@
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<portlet:defineObjects/>
-<p><b>Create JMS Resource</b> -- Configure Server Connection</p>
+<p><b>JMS Resource Group</b> -- Configure Server Connection</p>
+
+<p>The settings on this screen are different for each JMS provider, but they
+ generally configure connectivity to the JMS server. Connection factories
+ or destinations you create in the next step typically use these settings to
+ communicate with the server.</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
@@ -45,7 +50,8 @@
<tr>
<td></td>
<td>A unique name for the resource adapter; used to generate the configuration name
- as well as to connect Message-Driven Beans to this resource adapter.</td>
+ for this resource group as well as to connect Message-Driven Beans to the JMS server
+ using the settings on this page.</td>
</tr>
<!-- ENTRY FIELD: Config Properties -->
<tr>
@@ -64,11 +70,10 @@
</c:forEach>
<!-- SUBMIT BUTTON -->
<tr>
- <th><div align="right">Next Actions:</div></th>
+ <th><div align="right"></div></th>
<td>
- <input type="hidden" name="nextAction" value="factoryType" />
- <input type="submit" value="Add Connection Factory" />
- <input type="button" value="Add Destination" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='destinationType';document.<portlet:namespace/>JMSForm.submit();return false;" />
+ <input type="hidden" name="nextAction" value="review" />
+ <input type="submit" value="Next" />
</td>
</tr>
</table>
Added: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp?rev=371961&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp (added)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp Tue Jan 24 09:39:50 2006
@@ -0,0 +1,103 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>JMS Resource Group</b> -- Current Progress</p>
+
+<c:choose>
+ <c:when test="${data.connectionFactoryCount == 0 && data.destinationCount == 0}">
+ <p>So far, you've entered the basic configuration information required for
+ a JMS resource group. Now you can create connection factories and
+ destinations. When you're finished adding connection factories and
+ destinations, you can review the Geronimo deployment plan for this JMS
+ resource group, or go ahead and deploy it.</p>
+ </c:when>
+ <c:otherwise>
+ <p>These are the connection factories and destinations you've added to the
+ JMS resource group so far. When you're finished adding connection factories and
+ destinations, you can review the Geronimo deployment plan for this resource
+ group, or go ahead and deploy it.</p>
+
+ <table border="0" width="100%">
+ <tr><th colspan="3">Resource Group <c:out value="${data.instanceName}"/></th></tr>
+ <tr>
+ <td class="DarkBackground">Type</td>
+ <td class="DarkBackground">Name</td>
+ <td class="DarkBackground">Interface</td>
+ </tr>
+ <c:forEach var="factory" items="${data.connectionFactories}">
+ <tr>
+ <td>Connection Factory</td>
+ <td><c:out value="${factory.instanceName}" /></td>
+ <td><c:out value="${provider.connectionDefinitions[factory.factoryType].connectionFactoryInterface}" /></td>
+ </tr>
+ </c:forEach>
+ <c:forEach var="dest" items="${data.adminObjects}">
+ <tr>
+ <td>Destination</td>
+ <td><c:out value="${dest.name}" /></td>
+ <td><c:out value="${provider.adminObjectDefinitions[dest.destinationType].adminObjectInterface}" /></td>
+ </tr>
+ </c:forEach>
+ </table>
+ </c:otherwise>
+</c:choose>
+
+<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
+<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
+ <input type="hidden" name="mode" value="review-after" />
+ <input type="hidden" name="rar" value="${data.rarURI}" />
+ <input type="hidden" name="dependency" value="${data.dependency}" />
+ <input type="hidden" name="instanceName" value="${data.instanceName}" />
+ <input type="hidden" name="workManager" value="${data.workManager}" /> <%-- todo: pick list for WorkManager --%>
+ <c:forEach var="prop" items="${data.instanceProps}">
+ <input type="hidden" name="${prop.key}" value="${prop.value}" />
+ </c:forEach>
+ <input type="hidden" name="currentFactoryID" value="${data.currentFactoryID}" />
+ <input type="hidden" name="currentDestinationID" value="${data.currentDestinationID}" />
+ <input type="hidden" name="factoryType" value="${data.factoryType}" />
+ <input type="hidden" name="destinationType" value="${data.destinationType}" />
+ <c:forEach var="factory" items="${data.connectionFactories}" varStatus="status">
+ <input type="hidden" name="factory.${status.index}.factoryType" value="${factory.factoryType}" />
+ <input type="hidden" name="factory.${status.index}.instanceName" value="${factory.instanceName}" />
+ <input type="hidden" name="factory.${status.index}.transaction" value="${factory.transaction}" />
+ <input type="hidden" name="factory.${status.index}.xaTransaction" value="${factory.xaTransactionCaching}" />
+ <input type="hidden" name="factory.${status.index}.xaThread" value="${factory.xaThreadCaching}" />
+ <input type="hidden" name="factory.${status.index}.poolMinSize" value="${factory.poolMinSize}" />
+ <input type="hidden" name="factory.${status.index}.poolMaxSize" value="${factory.poolMaxSize}" />
+ <input type="hidden" name="factory.${status.index}.poolIdleTimeout" value="${factory.poolIdleTimeout}" />
+ <input type="hidden" name="factory.${status.index}.poolBlockingTimeout" value="${factory.poolBlockingTimeout}" />
+ <c:forEach var="prop" items="${factory.instanceProps}">
+ <input type="hidden" name="factory.${status.index}.${prop.key}" value="${prop.value}" />
+ </c:forEach>
+ </c:forEach>
+ <c:forEach var="dest" items="${data.adminObjects}" varStatus="status">
+ <input type="hidden" name="destination.${status.index}.destinationType" value="${dest.destinationType}" />
+ <input type="hidden" name="destination.${status.index}.name" value="${dest.name}" />
+ <c:forEach var="prop" items="${dest.instanceProps}">
+ <input type="hidden" name="destination.${status.index}.${prop.key}" value="${prop.value}" />
+ </c:forEach>
+ </c:forEach>
+ <table border="0">
+ <!-- SUBMIT BUTTON -->
+ <tr>
+ <td></td>
+ <td>
+ <input type="hidden" name="nextAction" value="factoryType" />
+ <input type="submit" value="Add Connection Factory" />
+ <input type="button" value="Add Destination" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='destinationType';document.<portlet:namespace/>JMSForm.submit();return false;" />
+<c:if test="${data.connectionFactoryCount > 0 || data.destinationCount > 0}">
+ <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='plan';document.<portlet:namespace/>JMSForm.submit();return false;" />
+ <input type="button" value="Deploy Now" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='deploy';document.<portlet:namespace/>JMSForm.submit();return false;" />
+</c:if>
+ </td>
+ </tr>
+ </table>
+</form>
+<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="list-before" />
+ </portlet:actionURL>">Cancel</a></p>
Propchange: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp
------------------------------------------------------------------------------
svn:eol-style = native