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 04:01:49 UTC
svn commit: r371785 [2/3] - in /geronimo/branches/1.0/applications:
console-core/src/java/org/apache/geronimo/console/util/ console-framework/
console-framework/src/webapp/WEB-INF/data/ console-standard/
console-standard/src/conf/ console-standard/src/...
Added: 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=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java (added)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java Mon Jan 23 19:01:27 2006
@@ -0,0 +1,132 @@
+/**
+ *
+ * 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 java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
+import javax.portlet.PortletException;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.RenderResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.ActionRequest;
+import javax.portlet.WindowState;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.BasePortlet;
+
+/**
+ * A portlet that lets you configure and deploy JDBC connection pools.
+ *
+ * @version $Rev: 368994 $ $Date: 2006-01-14 02:07:18 -0500 (Sat, 14 Jan 2006) $
+ */
+public class JMSResourcePortlet extends BasePortlet {
+ private final static Log log = LogFactory.getLog(JMSResourcePortlet.class);
+ private static final String MODE_KEY = "mode";
+ private Map helpers = new HashMap();
+
+ public void init(PortletConfig config) throws PortletException {
+ super.init(config);
+ addHelper(new ListScreenHandler(), config);
+ addHelper(new SelectProviderHandler(), config);
+ addHelper(new ConfigureRAInstanceHandler(), config);
+ addHelper(new SelectConnectionFactoryTypeHandler(), config);
+ addHelper(new CreateConnectionFactoryHandler(), config);
+ addHelper(new SelectDestinationTypeHandler(), config);
+ addHelper(new CreateDestinationHandler(), config);
+ addHelper(new ShowPlanHandler(), config);
+ addHelper(new DeployHandler(), config);
+ }
+
+ public void destroy() {
+ for (Iterator it = helpers.values().iterator(); it.hasNext();) {
+ AbstractHandler handler = (AbstractHandler) it.next();
+ handler.destroy();
+ }
+ helpers.clear();
+ super.destroy();
+ }
+
+ public void processAction(ActionRequest actionRequest,
+ ActionResponse actionResponse) throws PortletException, IOException {
+ String mode = actionRequest.getParameter(MODE_KEY);
+ AbstractHandler.JMSResourceData data = new AbstractHandler.JMSResourceData(actionRequest);
+ while(true) {
+ if(mode == null) {
+ break;
+ }
+ int pos = mode.lastIndexOf('-');
+ if(pos == -1) { // Assume it's a render request
+ break;
+ } else {
+ String type = mode.substring(pos+1);
+ mode = mode.substring(0, pos);
+ AbstractHandler handler = (AbstractHandler) helpers.get(mode);
+ if(handler == null) {
+ log.error("No handler for action mode '"+mode+"'");
+ break;
+ }
+System.out.println("Using action handler '"+handler.getClass().getName()+"'");
+ if(type.equals("before")) {
+ mode = handler.actionBeforeView(actionRequest, actionResponse, data);
+ } else if(type.equals("after")) {
+ mode = handler.actionAfterView(actionRequest, actionResponse, data);
+ } else {
+ log.error("Unrecognized portlet action '"+mode+"'");
+ mode = null;
+ }
+ }
+ }
+ if(mode != null) {
+ actionResponse.setRenderParameter(MODE_KEY, mode);
+ }
+ data.save(actionResponse);
+ }
+
+ protected void doView(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
+ if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
+ return;
+ }
+ String mode = renderRequest.getParameter(MODE_KEY);
+ AbstractHandler.JMSResourceData data = new AbstractHandler.JMSResourceData(renderRequest);
+ if(mode == null || mode.equals("")) {
+ mode = "list";
+ }
+ AbstractHandler handler = (AbstractHandler) helpers.get(mode);
+ try {
+ if(handler == null) {
+ log.error("No handler for render mode '"+mode+"'");
+ } else {
+System.out.println("Using render handler '"+handler.getClass().getName()+"'");
+ handler.renderView(renderRequest, renderResponse, data);
+ }
+ } catch (Throwable e) {
+ log.error("Unable to render portlet", e);
+ }
+ renderRequest.setAttribute("data", data);
+ if(handler != null) {
+ handler.getView().include(renderRequest, renderResponse);
+ }
+ }
+
+ private void addHelper(AbstractHandler handler, PortletConfig config) throws PortletException {
+ handler.init(config);
+ helpers.put(handler.getMode(), handler);
+ }
+}
Propchange: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java (added)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java Mon Jan 23 19:01:27 2006
@@ -0,0 +1,320 @@
+/**
+ *
+ * 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 org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.management.State;
+import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
+import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
+import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
+import org.apache.geronimo.management.geronimo.JCAAdminObject;
+import org.apache.geronimo.management.geronimo.JCAResource;
+import org.apache.geronimo.management.ResourceAdapter;
+import org.apache.geronimo.console.util.PortletManager;
+
+import javax.portlet.*;
+import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * A handles for the front page that lists available resources.
+ *
+ * @version $Rev: 368994 $ $Date: 2006-01-14 02:07:18 -0500 (Sat, 14 Jan 2006) $
+ */
+public class ListScreenHandler extends AbstractHandler {
+ public ListScreenHandler() {
+ super(LIST_MODE, "/WEB-INF/view/jmswizard/list.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 {
+ populateExistingList(request);
+ }
+
+ public String actionAfterView(ActionRequest request, ActionResponse response, JMSResourceData data) throws PortletException, IOException {
+ String provider = request.getParameter(PROVIDER_PARAMETER);
+ if(isEmpty(provider)) {
+ return SELECT_PROVIDER_MODE+BEFORE_ACTION;
+ }
+ JMSProviderData providerData = JMSProviderData.getProviderByName(provider);
+ data.setRarURI(providerData.getRaURI());
+ data.setDependency(providerData.getDependency());
+ return CONFIGURE_RA_MODE+BEFORE_ACTION;
+ }
+
+
+
+ private void populateExistingList(PortletRequest renderRequest) {
+ // Prepare a list of JMS configurations
+ 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");
+ try {
+ for (int i = 0; i < modules.length; i++) {
+ ResourceAdapterModule module = modules[i];
+
+ JMSResourceSummary target = null;
+ for (int j = 0; j < resources.size(); j++) {
+ JMSResourceSummary data = (JMSResourceSummary) resources.get(j);
+ if(data.adapterObjectName.equals(module.getObjectName())) {
+ target = data;
+ break;
+ }
+ }
+ if(target == null) {
+ ResourceAdapter[] adapters = PortletManager.getResourceAdapters(renderRequest, module);
+ String name = null;
+ 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);
+ }
+ }
+ if(name == null) {
+ name = ObjectName.getInstance(module.getObjectName()).getKeyProperty(NameFactory.J2EE_NAME);
+ }
+ target = new JMSResourceSummary(PortletManager.getConfigurationFor(renderRequest, module.getObjectName()).toString(),
+ module.getObjectName(), name, ((GeronimoManagedBean)module).getState());
+ resources.add(target);
+ }
+
+ JCAManagedConnectionFactory[] factories = PortletManager.getOutboundFactoriesForRA(renderRequest, module, "javax.jms.ConnectionFactory");
+ for (int j = 0; j < factories.length; j++) {
+ JCAManagedConnectionFactory factory = factories[j];
+ ObjectName name = ObjectName.getInstance(factory.getObjectName());
+ target.getConnectionFactories().add(new ConnectionFactorySummary(factory.getObjectName(), name.getKeyProperty(NameFactory.J2EE_NAME),
+ ((GeronimoManagedBean)factory).getState()));
+ }
+ }
+
+ // Get the list of admin objects
+ modules = PortletManager.getAdminObjectModules(renderRequest, new String[]{"javax.jms.Queue","javax.jms.Topic"});
+ for (int i = 0; i < modules.length; i++) {
+ ResourceAdapterModule module = modules[i];
+
+ JMSResourceSummary target = null;
+ for (int j = 0; j < resources.size(); j++) {
+ JMSResourceSummary data = (JMSResourceSummary) resources.get(j);
+ if(data.adapterObjectName.equals(module.getObjectName())) {
+ target = data;
+ break;
+ }
+ }
+ if(target == null) {
+ ResourceAdapter[] adapters = PortletManager.getResourceAdapters(renderRequest, module);
+ String name = null;
+ 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);
+ }
+ }
+ if(name == null) {
+ name = ObjectName.getInstance(module.getObjectName()).getKeyProperty(NameFactory.J2EE_NAME);
+ }
+ target = new JMSResourceSummary(PortletManager.getConfigurationFor(renderRequest, module.getObjectName()).toString(),
+ module.getObjectName(), name, ((GeronimoManagedBean)module).getState());
+ resources.add(target);
+ }
+
+ JCAAdminObject[] admins = PortletManager.getAdminObjectsForRA(renderRequest, module, new String[]{"javax.jms.Queue","javax.jms.Topic"});
+ for (int j = 0; j < admins.length; j++) {
+ GeronimoManagedBean bean = (GeronimoManagedBean) admins[j];
+ ObjectName name = ObjectName.getInstance(bean.getObjectName());
+ target.getAdminObjects().add(new AdminObjectSummary(bean.getObjectName(), name.getKeyProperty(NameFactory.J2EE_NAME),
+ admins[j].getAdminObjectInterface().indexOf("Queue") > -1 ? "Queue" : "Topic",
+ bean.getState()));
+ }
+ }
+ } catch (MalformedObjectNameException e) {
+ e.printStackTrace();
+ }
+
+ renderRequest.setAttribute("resources", resources);
+ // Get the list of JMS providers
+ renderRequest.setAttribute("providers", JMSProviderData.getAllProviders());
+ }
+
+
+
+ public static class JMSResourceSummary implements Serializable, Comparable {
+ private final String configurationName;
+ private final String adapterObjectName;
+ private final String name;
+ private final String parentName;
+ private final int state;
+ private final List connectionFactories = new ArrayList();
+ private final List adminObjects = new ArrayList();
+
+ public JMSResourceSummary(String configurationName, String adapterObjectName, String name, int state) {
+ this.configurationName = configurationName;
+ this.adapterObjectName = adapterObjectName;
+ this.state = state;
+ try {
+ ObjectName objectName = ObjectName.getInstance(adapterObjectName);
+ String parent = objectName.getKeyProperty(NameFactory.J2EE_APPLICATION);
+ if(parent != null && parent.equals("null")) {
+ parent = null;
+ }
+ parentName = parent;
+ this.name = name;
+ } catch (MalformedObjectNameException e) {
+ throw new RuntimeException("Can't parse ObjectName", e);
+ }
+ }
+
+ public String getConfigurationName() {
+ return configurationName;
+ }
+
+ public String getAdapterObjectName() {
+ return adapterObjectName;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getParentName() {
+ return parentName;
+ }
+
+ public int getState() {
+ return state;
+ }
+
+ public List getConnectionFactories() {
+ return connectionFactories;
+ }
+
+ public List getAdminObjects() {
+ return adminObjects;
+ }
+
+ public String getStateName() {
+ return State.toString(state);
+ }
+
+ public int compareTo(Object o) {
+ final JMSResourceSummary pool = (JMSResourceSummary)o;
+ int names = configurationName.compareTo(pool.configurationName);
+ if(parentName == null) {
+ if(pool.parentName == null) {
+ return names;
+ } else {
+ return -1;
+ }
+ } else {
+ if(pool.parentName == null) {
+ return 1;
+ } else {
+ int test = parentName.compareTo(pool.parentName);
+ if(test != 0) {
+ return test;
+ } else {
+ return names;
+ }
+ }
+ }
+ }
+ }
+
+ public static class ConnectionFactorySummary implements Serializable, Comparable {
+ private final String factoryObjectName;
+ private final String name;
+ private final int state;
+
+ public ConnectionFactorySummary(String factoryObjectName, String name, int state) {
+ this.factoryObjectName = factoryObjectName;
+ this.name = name;
+ this.state = state;
+ }
+
+ public String getFactoryObjectName() {
+ return factoryObjectName;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public int getState() {
+ return state;
+ }
+
+ public String getStateName() {
+ return State.toString(state);
+ }
+
+ public int compareTo(Object o) {
+ final ConnectionFactorySummary pool = (ConnectionFactorySummary)o;
+ return name.compareTo(pool.name);
+ }
+ }
+
+
+ public static class AdminObjectSummary implements Serializable, Comparable {
+ private final String adminObjectName;
+ private final String name;
+ private final String type;
+ private final int state;
+
+ public AdminObjectSummary(String adminObjectName, String name, String type, int state) {
+ this.adminObjectName = adminObjectName;
+ this.name = name;
+ this.type = type;
+ this.state = state;
+ }
+
+ public String getAdminObjectName() {
+ return adminObjectName;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public int getState() {
+ return state;
+ }
+
+ public String getStateName() {
+ return State.toString(state);
+ }
+
+ public int compareTo(Object o) {
+ final AdminObjectSummary pool = (AdminObjectSummary)o;
+ int result = name.compareTo(pool.name);
+ return result == 0 ? type.compareTo(pool.type) : result;
+ }
+ }
+}
Propchange: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectConnectionFactoryTypeHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectConnectionFactoryTypeHandler.java?rev=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectConnectionFactoryTypeHandler.java (added)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectConnectionFactoryTypeHandler.java Mon Jan 23 19:01:27 2006
@@ -0,0 +1,58 @@
+/**
+ *
+ * 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;
+
+/**
+ * Handler for the screen that creates a new connection factory
+ *
+ * @version $Rev: 368994 $ $Date: 2006-01-14 02:07:18 -0500 (Sat, 14 Jan 2006) $
+ */
+public class SelectConnectionFactoryTypeHandler extends AbstractHandler {
+ public SelectConnectionFactoryTypeHandler() {
+ super(SELECT_FACTORY_TYPE_MODE, "/WEB-INF/view/jmswizard/factoryType.jsp");
+ }
+
+ public String actionBeforeView(ActionRequest request, ActionResponse response, JMSResourceData data) throws PortletException, IOException {
+ data.createIfNecessary();
+ JMSProviderData provider = JMSProviderData.getProviderData(data.getRarURI(), request);
+ if(data.getCurrentFactory().getTransaction() == null || data.getCurrentFactory().getTransaction().equals("")) {
+ data.getCurrentFactory().setTransaction(provider.getDefaultTransaction());
+ }
+ // If there's only one factory type, skip this step
+ if(provider.getConnectionDefinitions().length == 1) {
+ data.setFactoryType(0);
+ return ADD_FACTORY_MODE+BEFORE_ACTION;
+ }
+ 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 {
+ return ADD_FACTORY_MODE+BEFORE_ACTION;
+ }
+}
Propchange: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectConnectionFactoryTypeHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectDestinationTypeHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectDestinationTypeHandler.java?rev=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectDestinationTypeHandler.java (added)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectDestinationTypeHandler.java Mon Jan 23 19:01:27 2006
@@ -0,0 +1,55 @@
+/**
+ *
+ * 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;
+
+/**
+ * Handler for the screen that creates a new connection factory
+ *
+ * @version $Rev: 368994 $ $Date: 2006-01-14 02:07:18 -0500 (Sat, 14 Jan 2006) $
+ */
+public class SelectDestinationTypeHandler extends AbstractHandler {
+ public SelectDestinationTypeHandler() {
+ super(SELECT_DESTINATION_TYPE_MODE, "/WEB-INF/view/jmswizard/destinationType.jsp");
+ }
+
+ public String actionBeforeView(ActionRequest request, ActionResponse response, JMSResourceData data) throws PortletException, IOException {
+ data.createIfNecessary();
+ JMSProviderData provider = JMSProviderData.getProviderData(data.getRarURI(), request);
+ // If there's only one factory type, skip this step
+ if(provider.getAdminObjectDefinitions().length == 1) {
+ data.setDestinationType(0);
+ return ADD_DESTINATION_MODE+BEFORE_ACTION;
+ }
+ 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 {
+ return ADD_DESTINATION_MODE+BEFORE_ACTION;
+ }
+}
Propchange: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectDestinationTypeHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java?rev=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java (added)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java Mon Jan 23 19:01:27 2006
@@ -0,0 +1,92 @@
+/**
+ *
+ * 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 java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.net.URI;
+import java.net.URISyntaxException;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import org.apache.geronimo.kernel.repository.ListableRepository;
+import org.apache.geronimo.console.util.PortletManager;
+
+/**
+ * Handler for the screen where you select a JMS provider (because
+ * you didn't want one of the ones we know about).
+ *
+ * @version $Rev: 368994 $ $Date: 2006-01-14 02:07:18 -0500 (Sat, 14 Jan 2006) $
+ */
+public class SelectProviderHandler extends AbstractHandler {
+ private final static String[] SKIP_RARS_CONTAINING = new String[]{"tranql"};
+
+ public SelectProviderHandler() {
+ super(SELECT_PROVIDER_MODE, "/WEB-INF/view/jmswizard/provider.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 {
+ loadRARList(request);
+ }
+
+ public String actionAfterView(ActionRequest request, ActionResponse response, JMSResourceData data) throws PortletException, IOException {
+ String rar = request.getParameter(RAR_FILE_PARAMETER);
+ if(isEmpty(rar)) {
+ return SELECT_PROVIDER_MODE+BEFORE_ACTION;
+ }
+ data.setRarURI(rar);
+ return CONFIGURE_RA_MODE+BEFORE_ACTION;
+ }
+
+ private void loadRARList(RenderRequest renderRequest) {
+ // List the available RARs
+ List list = new ArrayList();
+ ListableRepository[] repos = PortletManager.getListableRepositories(renderRequest);
+ for (int i = 0; i < repos.length; i++) {
+ ListableRepository repo = repos[i];
+ try {
+ final URI[] uris = repo.listURIs();
+ outer:
+ for (int j = 0; j < uris.length; j++) {
+ String test = uris[j].toString();
+ if(!test.endsWith("/rar")) {
+ continue;
+ }
+ for (int k = 0; k < SKIP_RARS_CONTAINING.length; k++) {
+ String skip = SKIP_RARS_CONTAINING[k];
+ if(test.indexOf(skip) > -1) {
+ continue outer;
+ }
+ }
+ list.add(test);
+ }
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ }
+ }
+ Collections.sort(list);
+ renderRequest.setAttribute("rars", list);
+ }
+}
Propchange: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java (added)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java Mon Jan 23 19:01:27 2006
@@ -0,0 +1,68 @@
+/**
+ *
+ * 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;
+import org.apache.geronimo.console.util.PortletManager;
+
+/**
+ * Handles the page that shows a deployment plan
+ *
+ * @version $Rev: 368994 $ $Date: 2006-01-14 02:07:18 -0500 (Sat, 14 Jan 2006) $
+ */
+public class ShowPlanHandler extends AbstractHandler {
+ public ShowPlanHandler() {
+ super(SHOW_PLAN_MODE, "/WEB-INF/view/jmswizard/plan.jsp");
+ }
+
+ public String actionBeforeView(ActionRequest request, ActionResponse response, JMSResourceData data) throws PortletException, IOException {
+ String plan = save(request, response, data, true);
+ request.getPortletSession(true).setAttribute("deploymentPlan", plan);
+ return getMode();
+ }
+
+ public void renderView(RenderRequest request, RenderResponse response, JMSResourceData data) throws PortletException, IOException {
+ request.setAttribute("deploymentPlan", request.getPortletSession().getAttribute("deploymentPlan"));
+ String path = PortletManager.getRepositoryEntry(request, data.getRarURI()).getPath();
+ String base = PortletManager.getServerInfo(request).getCurrentBaseDirectory();
+ if(base != null && path.startsWith(base)) {
+ path = path.substring(base.length());
+ if(path.startsWith("/")) {
+ path = path.substring(1);
+ }
+ } else {
+ int pos = path.lastIndexOf('/');
+ path = path.substring(pos+1);
+ }
+ request.setAttribute("rarURL", path);
+ }
+
+ 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/ShowPlanHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java?rev=371785&r1=371784&r2=371785&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java Mon Jan 23 19:01:27 2006
@@ -31,9 +31,12 @@
import org.apache.commons.logging.LogFactory;
/**
+ * Describes an available login module, including how to create and configure it.
+ * Reads the list of available login modules from a properties file on the class path.
+ *
* @version $Rev$ $Date$
*/
-public class MasterLoginModuleInfo {
+public class MasterLoginModuleInfo implements Serializable {
private final static Log log = LogFactory.getLog(MasterLoginModuleInfo.class);
private static MasterLoginModuleInfo[] allModules;
private String name;
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=371785&r1=371784&r2=371785&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 Mon Jan 23 19:01:27 2006
@@ -26,18 +26,8 @@
import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.kernel.repository.WriteableRepository;
import org.apache.geronimo.management.J2EEDomain;
-import org.apache.geronimo.management.geronimo.EJBManager;
-import org.apache.geronimo.management.geronimo.J2EEServer;
-import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
-import org.apache.geronimo.management.geronimo.JMSBroker;
-import org.apache.geronimo.management.geronimo.JMSConnector;
-import org.apache.geronimo.management.geronimo.JMSManager;
-import org.apache.geronimo.management.geronimo.JVM;
-import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
-import org.apache.geronimo.management.geronimo.WebAccessLog;
-import org.apache.geronimo.management.geronimo.WebConnector;
-import org.apache.geronimo.management.geronimo.WebContainer;
-import org.apache.geronimo.management.geronimo.WebManager;
+import org.apache.geronimo.management.ResourceAdapter;
+import org.apache.geronimo.management.geronimo.*;
import org.apache.geronimo.pool.GeronimoExecutor;
import org.apache.geronimo.security.realm.SecurityRealm;
import org.apache.geronimo.system.logging.SystemLog;
@@ -58,6 +48,10 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.net.URI;
+import java.net.URL;
+import java.net.URISyntaxException;
+import java.net.MalformedURLException;
/**
* @version $Rev$ $Date$
@@ -205,6 +199,11 @@
return helper.getOutboundRAModules(getCurrentServer(request), iface);
}
+ public static ResourceAdapterModule[] getAdminObjectModules(PortletRequest request, String[] ifaces) {
+ ManagementHelper helper = getManagementHelper(request);
+ return helper.getAdminObjectModules(getCurrentServer(request), ifaces);
+ }
+
public static JCAManagedConnectionFactory[] getOutboundFactoriesOfType(PortletRequest request, String iface) {
ManagementHelper helper = getManagementHelper(request);
return helper.getOutboundFactories(getCurrentServer(request), iface);
@@ -230,6 +229,12 @@
return helper.getOutboundFactories(module, iface);
}
+ //todo: Create an interface for admin objects
+ public static JCAAdminObject[] getAdminObjectsForRA(PortletRequest request, ResourceAdapterModule module, String[] ifaces) {
+ ManagementHelper helper = getManagementHelper(request);
+ return helper.getAdminObjects(module, ifaces);
+ }
+
public static String[] getWebManagerNames(PortletRequest request) {
return getCurrentServer(request).getWebManagers();
}
@@ -353,6 +358,16 @@
return helper.getJMSConnectorsForContainer(manager, brokerObjectName, protocol);
}
+ public static ResourceAdapter[] getResourceAdapters(PortletRequest request, ResourceAdapterModule module) {
+ ManagementHelper helper = getManagementHelper(request);
+ return helper.getResourceAdapters(module);
+ }
+
+ public static JCAResource[] getJCAResources(PortletRequest request, ResourceAdapter adapter) {
+ ManagementHelper helper = getManagementHelper(request);
+ return helper.getRAResources(adapter);
+ }
+
public static GeronimoExecutor[] getThreadPools(PortletRequest request) {
ManagementHelper helper = getManagementHelper(request);
return helper.getThreadPools(getCurrentServer(request));
@@ -386,6 +401,29 @@
public static GeronimoManagedBean getManagedBean(PortletRequest request, String name) {
ManagementHelper helper = getManagementHelper(request);
return (GeronimoManagedBean) helper.getObject(name);
+ }
+
+ public static URI getConfigurationFor(PortletRequest request, String objectName) {
+ ManagementHelper helper = getManagementHelper(request);
+ return helper.getConfigurationNameFor(objectName);
+ }
+
+ public static URL getRepositoryEntry(PortletRequest request, String repositoryURI) {
+ try {
+ Repository[] repos = getRepositories(request);
+ URI uri = new URI(repositoryURI);
+ for (int i = 0; i < repos.length; i++) {
+ Repository repo = repos[i];
+ if(repo.hasURI(uri)) {
+ return repo.getURL(uri);
+ }
+ }
+ } catch (URISyntaxException e) {
+ log.error("Unable to access repository entry '"+repositoryURI+"'", e);
+ } catch (MalformedURLException e) {
+ log.error("Unable to access repository entry '"+repositoryURI+"'", e);
+ }
+ return null;
}
/**
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/portlet.xml?rev=371785&r1=371784&r2=371785&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/portlet.xml Mon Jan 23 19:01:27 2006
@@ -506,6 +506,29 @@
</portlet>
<portlet>
+ <description>Portlet for managing JMS Resources</description>
+ <portlet-name>JMSWizard</portlet-name>
+ <display-name>JMS Resource Wizard</display-name>
+
+ <portlet-class>org.apache.geronimo.console.jmsmanager.wizard.JMSResourcePortlet</portlet-class>
+
+ <expiration-cache>-1</expiration-cache>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+
+ <supported-locale>en</supported-locale>
+
+ <portlet-info>
+ <title>JMS Resources</title>
+ <short-title>JMS Resources</short-title>
+ <keywords>JMS Resource Connection Factory Destination Wizard</keywords>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
<description>Portlet for managing security realms</description>
<portlet-name>RealmWizard</portlet-name>
<display-name>Security Realm Wizard</display-name>
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp?rev=371785&r1=371784&r2=371785&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp Mon Jan 23 19:01:27 2006
@@ -6,7 +6,7 @@
<p><b>Create Database Pool</b> -- Step 2: Select Driver, JAR, Parameters</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>">
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
<input type="hidden" name="mode" value="process-params" />
<input type="hidden" name="name" value="${pool.name}" />
<input type="hidden" name="dbtype" value="${pool.dbtype}" />
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp?rev=371785&r1=371784&r2=371785&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp Mon Jan 23 19:01:27 2006
@@ -5,7 +5,7 @@
<p><b>Create Database Pool</b> -- Step 3: Final Pool Configuration</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>">
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
<input type="hidden" name="mode" value="process-url" />
<input type="hidden" name="test" value="true" />
<input type="hidden" name="name" value="${pool.name}" />
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp?rev=371785&r1=371784&r2=371785&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp Mon Jan 23 19:01:27 2006
@@ -6,7 +6,7 @@
<p>This page edits a new or existing database pool.</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>">
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
<input type="hidden" name="mode" value="process-url" />
<input type="hidden" name="test" value="true" />
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp?rev=371785&r1=371784&r2=371785&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp Mon Jan 23 19:01:27 2006
@@ -5,7 +5,7 @@
<p><b>Create Database Pool</b> -- Step 1: Select Name and Database</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>" action="<portlet:actionURL/>">
+<form name="<portlet:namespace/>" action="<portlet:actionURL/>" method="POST">
<input type="hidden" name="mode" value="process-rdbms" />
<input type="hidden" name="user" value="${pool.user}" />
<input type="hidden" name="password" value="${pool.password}" />
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp?rev=371785&r1=371784&r2=371785&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp Mon Jan 23 19:01:27 2006
@@ -13,7 +13,7 @@
install the driver by hand (copy it to a directory under geronimo/repository/)</i></p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>">
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
<input type="hidden" name="mode" value="process-download" />
<input type="hidden" name="name" value="${pool.name}" />
<input type="hidden" name="dbtype" value="${pool.dbtype}" />
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp?rev=371785&r1=371784&r2=371785&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp Mon Jan 23 19:01:27 2006
@@ -5,7 +5,7 @@
<p><b>Create Database Pool</b> -- Show Deployment Plan</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>">
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
<input type="hidden" name="mode" value="save" />
<input type="hidden" name="user" value="${pool.user}" />
<input type="hidden" name="name" value="${pool.name}" />
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp?rev=371785&r1=371784&r2=371785&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp Mon Jan 23 19:01:27 2006
@@ -5,7 +5,7 @@
<p><b>Create Database Pool</b> -- Step 4: Test Connection</p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>">
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
<input type="hidden" name="mode" value="save" />
<input type="hidden" name="user" value="${pool.user}" />
<input type="hidden" name="name" value="${pool.name}" />
Added: 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=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp (added)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp Mon Jan 23 19:01:27 2006
@@ -0,0 +1,133 @@
+<%@ 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>Create JMS Resource</b> -- Add Connection Factory</p>
+
+<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
+<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
+ <input type="hidden" name="mode" value="destination-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}" />
+ <c:if test="${status.index != data.currentDestinationID}">
+ <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:if>
+ </c:forEach>
+ <table border="0">
+ <!-- ENTRY FIELD: Admin Object Name -->
+ <tr>
+ <th><div align="right">Message Destination Name:</div></th>
+ <td><input name="destination.${data.currentDestinationID}.name" type="text" size="20" value="${data.currentDestination.name}" /></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>A unique name for the connection factory; used to refer to this connection
+ factory when mapping resource references from application components.</td>
+ </tr>
+
+ <!-- ENTRY FIELD: Config Properties -->
+<c:if test="${!empty(provider.adminObjectDefinitions[data.destinationType].configProperties)}">
+ <tr>
+ <th colspan="2">Destination Configuration Settings</th>
+ </tr>
+ <c:forEach var="prop" items="${provider.adminObjectDefinitions[data.destinationType].configProperties}" varStatus="status">
+ <c:set var="index" value="instance-config-${status.index}" />
+ <tr>
+ <th><div align="right">${prop.name}:</div></th>
+ <td><input name="destination.${data.currentDestinationID}.instance-config-${status.index}" type="text" size="20" value="${data.currentDestination.instanceProps[index] == null ? prop.defaultValue : data.currentDestination.instanceProps[index]}" /></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><c:out value="${prop.description}" /></td>
+ </tr>
+ </c:forEach>
+</c:if>
+ <!-- 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;" />
+ <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;" />
+ </td>
+ </tr>
+ </table>
+</form>
+<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
+
+
+<p><b>Current Status for JMS Resource <c:out value="${data.instanceName}" /></b></p>
+<ul>
+ <li><c:out value="${data.connectionFactoryCount}" /> Connection Factories
+ <c:if test="${data.connectionFactoryCount > 0}">
+ <ul>
+ <c:forEach var="factory" items="${data.connectionFactories}">
+ <li>
+ <c:choose>
+ <c:when test="${empty(factory.instanceName)}">
+ <i>In Process</i>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${factory.instanceName}" />
+ </c:otherwise>
+ </c:choose>
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
+ </li>
+ <li><c:out value="${data.destinationCount}" /> Destinations
+ <c:if test="${data.destinationCount > 0}">
+ <ul>
+ <c:forEach var="dest" items="${data.adminObjects}">
+ <li>
+ <c:choose>
+ <c:when test="${empty(dest.name)}">
+ <i>In Process</i>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${dest.name}" />
+ </c:otherwise>
+ </c:choose>
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
+ </li>
+</ul>
+
+
+<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/destination.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp (added)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp Mon Jan 23 19:01:27 2006
@@ -0,0 +1,113 @@
+<%@ 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>Create JMS Resource</b> -- Select JMS Provider RAR</p>
+
+<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
+<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
+ <input type="hidden" name="mode" value="destinationType-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}" />
+ <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">
+ <!-- ENTRY FIELD: Destination Type -->
+ <tr>
+ <th><div align="right">JMS Destination Type:</div></th>
+ <td>
+ <select name="destinationType">
+ <c:forEach var="dest" items="${provider.adminObjectDefinitions}" varStatus="status">
+ <option <c:if test="${status.index == data.destinationType}">selected</c:if> value="${status.index}">${dest.adminObjectInterface}</option>
+ </c:forEach>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>This resource adapter declares several possible destination interfaces.
+ Select the desired interface type for this destination.
+ </td>
+ </tr>
+ <!-- SUBMIT BUTTON -->
+ <tr>
+ <td></td>
+ <td><input type="submit" value="Next" /></td>
+ </tr>
+ </table>
+</form>
+<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
+
+
+<p><b>Current Status for JMS Resource <c:out value="${data.instanceName}" /></b></p>
+<ul>
+ <li><c:out value="${data.connectionFactoryCount}" /> Connection Factories
+ <c:if test="${data.connectionFactoryCount > 0}">
+ <ul>
+ <c:forEach var="factory" items="${data.connectionFactories}">
+ <li>
+ <c:choose>
+ <c:when test="${empty(factory.instanceName)}">
+ <i>In Process</i>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${factory.instanceName}" />
+ </c:otherwise>
+ </c:choose>
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
+ </li>
+ <li><c:out value="${data.destinationCount}" /> Destinations
+ <c:if test="${data.destinationCount > 0}">
+ <ul>
+ <c:forEach var="dest" items="${data.adminObjects}">
+ <li>
+ <c:choose>
+ <c:when test="${empty(dest.name)}">
+ <i>In Process</i>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${dest.name}" />
+ </c:otherwise>
+ </c:choose>
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
+ </li>
+</ul>
+
+
+<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/destinationType.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp (added)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp Mon Jan 23 19:01:27 2006
@@ -0,0 +1,189 @@
+<%@ 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>Create JMS Resource</b> -- Add Connection Factory</p>
+
+<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
+<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
+ <input type="hidden" name="mode" value="factory-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}" />
+ <c:if test="${status.index != data.currentFactoryID}">
+ <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:if>
+ </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">
+ <!-- ENTRY FIELD: Factory Instance Name -->
+ <tr>
+ <th><div align="right">Connection Factory Name:</div></th>
+ <td><input name="factory.${data.currentFactoryID}.instanceName" type="text" size="20" value="${data.currentFactory.instanceName}" /></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>A unique name for the connection factory; used to refer to this connection
+ factory when mapping resource references from application components.</td>
+ </tr>
+
+ <!-- ENTRY FIELD: Transactions -->
+ <tr>
+ <th><div align="right">Transaction Support:</div></th>
+ <td>
+ <select name="factory.${data.currentFactoryID}.transaction">
+ <option value="none"<c:if test="${data.currentFactory.transaction eq 'none'}"> selected</c:if>>None</option>
+ <option value="local"<c:if test="${data.currentFactory.transaction eq 'local'}"> selected</c:if>>Local</option>
+ <option value="xa"<c:if test="${data.currentFactory.transaction eq 'xa'}"> selected</c:if>>XA</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>Which JMS interface this connection factory should support.</td>
+ </tr>
+
+ <tr>
+ <th colspan="2">Connection Pool Parameters</th>
+ </tr>
+ <!-- ENTRY FIELD: Min Size -->
+ <tr>
+ <th><div align="right">Pool Min Size:</div></th>
+ <td><input name="factory.${data.currentFactoryID}.poolMinSize" type="text" size="5" value="${data.currentFactory.poolMinSize}"></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>The minimum number of connections in the pool. Leave blank for default.</td>
+ </tr>
+ <!-- ENTRY FIELD: Max Size -->
+ <tr>
+ <th><div align="right">Pool Max Size:</div></th>
+ <td><input name="factory.${data.currentFactoryID}.poolMaxSize" type="text" size="5" value="${data.currentFactory.poolMaxSize}"></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>The maximum number of connections in the pool. Leave blank for default.</td>
+ </tr>
+ <!-- ENTRY FIELD: Blocking Timeout -->
+ <tr>
+ <th><div align="right">Blocking Timeout:</div></th>
+ <td><input name="factory.${data.currentFactoryID}.poolBlockingTimeout" type="text" size="7" value="${data.currentFactory.poolBlockingTimeout}"> (in milliseconds)</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>The length of time a caller will wait for a connection. Leave blank for default.</td>
+ </tr>
+ <!-- ENTRY FIELD: Idle timeout -->
+ <tr>
+ <th><div align="right">Idle Timeout:</div></th>
+ <td><input name="factory.${data.currentFactoryID}.poolIdleTimeout" type="text" size="5" value="${data.currentFactory.poolIdleTimeout}"> (in minutes)</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>How long a connection can be idle before being closed. Leave blank for default.</td>
+ </tr>
+
+ <!-- ENTRY FIELD: Config Properties -->
+<c:if test="${!empty(provider.connectionDefinitions[data.factoryType].configProperties)}">
+ <tr>
+ <th colspan="2">Connection Factory Configuration Settings</th>
+ </tr>
+ <c:forEach var="prop" items="${provider.connectionDefinitions[data.factoryType].configProperties}" varStatus="status">
+ <c:set var="index" value="instance-config-${status.index}" />
+ <tr>
+ <th><div align="right">${prop.name}:</div></th>
+ <td><input name="factory.${data.currentFactoryID}.instance-config-${status.index}" type="text" size="20" value="${data.currentFactory.instanceProps[index] == null ? prop.defaultValue : data.currentFactory.instanceProps[index]}" /></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><c:out value="${prop.description}" /></td>
+ </tr>
+ </c:forEach>
+</c:if>
+ <!-- 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;" />
+ <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;" />
+ </td>
+ </tr>
+ </table>
+</form>
+<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
+
+
+<p><b>Current Status for JMS Resource <c:out value="${data.instanceName}" /></b></p>
+<ul>
+ <li><c:out value="${data.connectionFactoryCount}" /> Connection Factories
+ <c:if test="${data.connectionFactoryCount > 0}">
+ <ul>
+ <c:forEach var="factory" items="${data.connectionFactories}">
+ <li>
+ <c:choose>
+ <c:when test="${empty(factory.instanceName)}">
+ <i>In Process</i>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${factory.instanceName}" />
+ </c:otherwise>
+ </c:choose>
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
+ </li>
+ <li><c:out value="${data.destinationCount}" /> Destinations
+ <c:if test="${data.destinationCount > 0}">
+ <ul>
+ <c:forEach var="dest" items="${data.adminObjects}">
+ <li>
+ <c:choose>
+ <c:when test="${empty(dest.name)}">
+ <i>In Process</i>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${dest.name}" />
+ </c:otherwise>
+ </c:choose>
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
+ </li>
+</ul>
+
+
+<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/factory.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp (added)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp Mon Jan 23 19:01:27 2006
@@ -0,0 +1,113 @@
+<%@ 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>Create JMS Resource</b> -- Select JMS Provider RAR</p>
+
+<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
+<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
+ <input type="hidden" name="mode" value="factoryType-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="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">
+ <!-- ENTRY FIELD: Connection Factory Type -->
+ <tr>
+ <th><div align="right">JMS Factory Type:</div></th>
+ <td>
+ <select name="factoryType">
+ <c:forEach var="factory" items="${provider.connectionDefinitions}" varStatus="status">
+ <option <c:if test="${status.index == data.factoryType}">selected</c:if> value="${status.index}">${factory.connectionFactoryInterface}</option>
+ </c:forEach>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>This resource adapter declares several possible connection factory interfaces.
+ Select the desired interface type for this connection factory.
+ </td>
+ </tr>
+ <!-- SUBMIT BUTTON -->
+ <tr>
+ <td></td>
+ <td><input type="submit" value="Next" /></td>
+ </tr>
+ </table>
+</form>
+<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
+
+
+<p><b>Current Status for JMS Resource <c:out value="${data.instanceName}" /></b></p>
+<ul>
+ <li><c:out value="${data.connectionFactoryCount}" /> Connection Factories
+ <c:if test="${data.connectionFactoryCount > 0}">
+ <ul>
+ <c:forEach var="factory" items="${data.connectionFactories}">
+ <li>
+ <c:choose>
+ <c:when test="${empty(factory.instanceName)}">
+ <i>In Process</i>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${factory.instanceName}" />
+ </c:otherwise>
+ </c:choose>
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
+ </li>
+ <li><c:out value="${data.destinationCount}" /> Destinations
+ <c:if test="${data.destinationCount > 0}">
+ <ul>
+ <c:forEach var="dest" items="${data.adminObjects}">
+ <li>
+ <c:choose>
+ <c:when test="${empty(dest.name)}">
+ <i>In Process</i>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${dest.name}" />
+ </c:otherwise>
+ </c:choose>
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
+ </li>
+</ul>
+
+
+<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/factoryType.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/list.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/list.jsp?rev=371785&view=auto
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/list.jsp (added)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/list.jsp Mon Jan 23 19:01:27 2006
@@ -0,0 +1,122 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p>This page lists all the available JMS Resource Groups.</p>
+
+<c:choose>
+ <c:when test="${empty(resources)}"><p><i>There are no JMS Resource Groups defined</i></p></c:when>
+ <c:otherwise>
+<!--
+<p>For each resource listed, you can click the <b>usage</b> link to see examples of how
+ to use the connection factories and destinations from your application.</p>
+-->
+ <table width="100%">
+ <c:forEach var="resource" items="${resources}">
+ <tr>
+ <td colspan="5" style="padding-top: 10px"><b><c:out value="${resource.name}"/> (<c:out value="${resource.configurationName}"/>)</b></td>
+ </tr>
+ <tr>
+ <td class="DarkBackground">Type</td>
+ <td class="DarkBackground">Name</td>
+ <td class="DarkBackground" align="center">Deployed As</td>
+ <td class="DarkBackground" align="center">State</td>
+ <td class="DarkBackground" align="center">Actions</td>
+ </tr>
+ <c:forEach var="factory" items="${resource.connectionFactories}">
+ <tr>
+ <td>Connection Factory</td>
+ <td>${factory.name}</td>
+ <td>
+ <c:choose>
+ <c:when test="${empty resource.parentName}">
+ Server-wide
+ </c:when>
+ <c:otherwise>
+ Application-scoped
+ </c:otherwise>
+ </c:choose>
+ </td>
+ <td>${factory.stateName}</td>
+ <td>
+ <%--
+ <a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="editExisting" />
+ <portlet:param name="adapterObjectName" value="${pool.adapterObjectName}" />
+ <portlet:param name="objectName" value="${pool.factoryObjectName}" />
+ </portlet:actionURL>">edit</a>
+ <a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="usage" />
+ <portlet:param name="name" value="${pool.name}" />
+ <portlet:param name="objectName" value="${pool.factoryObjectName}" />
+ </portlet:actionURL>">usage</a>
+ Test
+ Statistics
+ --%>
+ </td>
+ </tr>
+ </c:forEach>
+ <c:forEach var="admin" items="${resource.adminObjects}">
+ <tr>
+ <td>${admin.type}</td>
+ <td>${admin.name}</td>
+ <td>
+ <c:choose>
+ <c:when test="${empty resource.parentName}">
+ Server-wide
+ </c:when>
+ <c:otherwise>
+ Application-scoped
+ </c:otherwise>
+ </c:choose>
+ </td>
+ <td>${admin.stateName}</td>
+ <td>
+ <%--
+ <a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="editExisting" />
+ <portlet:param name="adapterObjectName" value="${pool.adapterObjectName}" />
+ <portlet:param name="objectName" value="${pool.factoryObjectName}" />
+ </portlet:actionURL>">edit</a>
+ <a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="usage" />
+ <portlet:param name="name" value="${pool.name}" />
+ <portlet:param name="objectName" value="${pool.factoryObjectName}" />
+ </portlet:actionURL>">usage</a>
+ Test
+ Statistics
+ --%>
+ </td>
+ </tr>
+ </c:forEach>
+ </c:forEach>
+ </table>
+ </c:otherwise>
+</c:choose>
+
+
+<p><b>Create a new JMS Resource Group:</b></p>
+<ul>
+<c:forEach var="provider" items="${providers}">
+
+ <li><a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="list-after" />
+ <portlet:param name="provider" value="${provider.name}" />
+ </portlet:actionURL>">For <c:out value="${provider.name}" /></a></li>
+</c:forEach>
+ <li><a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="list-after" />
+ </portlet:actionURL>">For another JMS provider...</a></li>
+<%--
+ <li><a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="startImport" />
+ <portlet:param name="importSource" value="JBoss 4" />
+ <portlet:param name="from" value="<tt>*-ds.xml</tt> file from the <tt>jboss4/server/name/deploy</tt> directory" />
+ </portlet:actionURL>">Import from JBoss 4</a></li>
+ <li><a href="<portlet:actionURL portletMode="view">
+ <portlet:param name="mode" value="startImport" />
+ <portlet:param name="importSource" value="WebLogic 8.1" />
+ <portlet:param name="from" value="<tt>config.xml</tt> file from the WebLogic domain directory" />
+ </portlet:actionURL>">Import from WebLogic 8.1</a></li>
+--%>
+</ul>
Propchange: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/list.jsp
------------------------------------------------------------------------------
svn:eol-style = native