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:10:55 UTC
svn commit: r371787 - in /geronimo/trunk/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/java/org/apac...
Author: ammulder
Date: Mon Jan 23 19:10:32 2006
New Revision: 371787
URL: http://svn.apache.org/viewcvs?rev=371787&view=rev
Log:
Merge new JMS portlet change from branch
Added:
geronimo/trunk/applications/console-standard/src/conf/
- copied from r371785, geronimo/branches/1.0/applications/console-standard/src/conf/
geronimo/trunk/applications/console-standard/src/conf/jms-resource-providers.properties (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/conf/jms-resource-providers.properties
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/
- copied from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ConfigureRAInstanceHandler.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ConfigureRAInstanceHandler.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/CreateConnectionFactoryHandler.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/CreateConnectionFactoryHandler.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/CreateDestinationHandler.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/CreateDestinationHandler.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/DeployHandler.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/DeployHandler.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectConnectionFactoryTypeHandler.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectConnectionFactoryTypeHandler.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectDestinationTypeHandler.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectDestinationTypeHandler.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/
- copied from r371785, geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/list.jsp (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/list.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp (props changed)
- copied unchanged from r371785, geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp
Modified:
geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java
geronimo/trunk/applications/console-framework/maven.xml
geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml
geronimo/trunk/applications/console-standard/maven.xml
geronimo/trunk/applications/console-standard/project.xml
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp
geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml
Modified: geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java (original)
+++ geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java Mon Jan 23 19:10:32 2006
@@ -16,6 +16,24 @@
*/
package org.apache.geronimo.console.util;
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.NameCallback;
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanQuery;
@@ -23,6 +41,7 @@
import org.apache.geronimo.j2ee.management.impl.Util;
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.proxy.ProxyManager;
import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.management.AppClientModule;
@@ -33,7 +52,6 @@
import org.apache.geronimo.management.J2EEModule;
import org.apache.geronimo.management.J2EEResource;
import org.apache.geronimo.management.JCAConnectionFactory;
-import org.apache.geronimo.management.JCAResource;
import org.apache.geronimo.management.JDBCDataSource;
import org.apache.geronimo.management.JDBCDriver;
import org.apache.geronimo.management.JDBCResource;
@@ -45,7 +63,9 @@
import org.apache.geronimo.management.geronimo.EJBManager;
import org.apache.geronimo.management.geronimo.J2EEApplication;
import org.apache.geronimo.management.geronimo.J2EEServer;
+import org.apache.geronimo.management.geronimo.JCAAdminObject;
import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
+import org.apache.geronimo.management.geronimo.JCAResource;
import org.apache.geronimo.management.geronimo.JMSBroker;
import org.apache.geronimo.management.geronimo.JMSConnector;
import org.apache.geronimo.management.geronimo.JMSManager;
@@ -62,24 +82,6 @@
import org.apache.geronimo.system.logging.SystemLog;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* An implementation of the ManagementHelper interface that uses a Geronimo
* kernel. That may be an in-VM kernel or a remote kernel, we don't really
@@ -304,6 +306,44 @@
return (ResourceAdapterModule[]) list.toArray(new ResourceAdapterModule[list.size()]);
}
+ public ResourceAdapterModule[] getAdminObjectModules(J2EEServer server, String[] adminObjectInterfaces) {
+ List list = new ArrayList();
+ try {
+ String[] names = server.getDeployedObjects();
+ for (int i = 0; i < names.length; i++) {
+ ObjectName name = ObjectName.getInstance(names[i]);
+ String type = name.getKeyProperty(NameFactory.J2EE_TYPE);
+ if(type.equals(NameFactory.RESOURCE_ADAPTER_MODULE)) {
+ ResourceAdapterModule module = (ResourceAdapterModule) pm.createProxy(name, KernelManagementHelper.class.getClassLoader());
+ ResourceAdapter[] adapters = getResourceAdapters(module);
+ outer:
+ for (int j = 0; j < adapters.length; j++) {
+ ResourceAdapter adapter = adapters[j];
+ JCAResource[] resources = getRAResources(adapter);
+ for (int k = 0; k < resources.length; k++) {
+ JCAResource resource = resources[k];
+ JCAAdminObject[] admins = getAdminObjects(resource);
+ for (int l = 0; l < admins.length; l++) {
+ JCAAdminObject admin = admins[l];
+ String adminIface = admin.getAdminObjectInterface();
+ for (int m = 0; m < adminObjectInterfaces.length; m++) {
+ if(adminIface.equals(adminObjectInterfaces[m])) {
+ list.add(module);
+ break outer;
+ }
+
+ }
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("Unable to look up related GBean", e);
+ }
+ return (ResourceAdapterModule[]) list.toArray(new ResourceAdapterModule[list.size()]);
+ }
+
public JCAManagedConnectionFactory[] getOutboundFactories(ResourceAdapterModule module) {
List list = new ArrayList();
try {
@@ -360,6 +400,34 @@
return (JCAManagedConnectionFactory[]) list.toArray(new JCAManagedConnectionFactory[list.size()]);
}
+ public JCAAdminObject[] getAdminObjects(ResourceAdapterModule module, String[] adminObjectInterfaces) {
+ List list = new ArrayList();
+ try {
+ ResourceAdapter[] adapters = getResourceAdapters(module);
+ for (int j = 0; j < adapters.length; j++) {
+ ResourceAdapter adapter = adapters[j];
+ JCAResource[] resources = getRAResources(adapter);
+ for (int k = 0; k < resources.length; k++) {
+ JCAResource resource = resources[k];
+ JCAAdminObject[] admins = getAdminObjects(resource);
+ for (int l = 0; l < admins.length; l++) {
+ JCAAdminObject admin = admins[l];
+ String adminIface = admin.getAdminObjectInterface();
+ for (int m = 0; m < adminObjectInterfaces.length; m++) {
+ if(adminIface.equals(adminObjectInterfaces[m])) {
+ list.add(admin);
+ break;
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.error("Unable to look up related GBean", e);
+ }
+ return (JCAAdminObject[]) list.toArray(new JCAAdminObject[list.size()]);
+ }
+
public J2EEResource[] getResources(J2EEServer server) {
J2EEResource[] result = new J2EEResource[0];
try {
@@ -886,6 +954,28 @@
return result;
}
+ public JCAAdminObject[] getAdminObjects(JCAResource resource) {
+ JCAAdminObject[] result = new JCAAdminObject[0];
+ String objectName = resource.getObjectName();
+ try {
+ String name = ObjectName.getInstance(objectName).getKeyProperty(NameFactory.J2EE_NAME);
+ String query = "*:JCAResource="+name+",j2eeType=JCAAdminObject,*";
+ Set results = kernel.listGBeans(ObjectName.getInstance(query));
+ String[] names = new String[results.size()];
+ int i = 0;
+ for (Iterator it = results.iterator(); it.hasNext();) {
+ ObjectName next = (ObjectName) it.next();
+ names[i++] = next.getCanonicalName();
+ }
+ Object[] temp = pm.createProxies(names, KernelManagementHelper.class.getClassLoader());
+ result = new JCAAdminObject[temp.length];
+ System.arraycopy(temp, 0, result, 0, temp.length);
+ } catch (MalformedObjectNameException e) {
+ log.error("Unable to look up admin objects for resource adapter", e);
+ }
+ return result;
+ }
+
public JCAManagedConnectionFactory getManagedConnectionFactory(JCAConnectionFactory factory) {
try {
String name = factory.getManagedConnectionFactory();
@@ -903,6 +993,24 @@
log.error("Unable to look up related GBean", e);
return null;
}
+ }
+
+ public URI getConfigurationNameFor(String objectName) {
+ try {
+ Set parents = kernel.getDependencyManager().getParents(ObjectName.getInstance(objectName));
+ if(parents.size() == 0) {
+ throw new IllegalStateException("No parents for GBean '"+objectName+"'");
+ }
+ for (Iterator it = parents.iterator(); it.hasNext();) {
+ ObjectName name = (ObjectName) it.next();
+ if(Configuration.isConfigurationObjectName(name)) {
+ return Configuration.getConfigurationID(name);
+ }
+ }
+ } catch (Exception e) {
+ log.error("Unable to look up related GBean", e);
+ }
+ return null;
}
public String getGBeanDescription(String objectName) {
Modified: geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java (original)
+++ geronimo/trunk/applications/console-core/src/java/org/apache/geronimo/console/util/ManagementHelper.java Mon Jan 23 19:10:32 2006
@@ -16,6 +16,11 @@
*/
package org.apache.geronimo.console.util;
+import java.net.URI;
+import java.util.Map;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.management.AppClientModule;
import org.apache.geronimo.management.EJB;
@@ -25,7 +30,6 @@
import org.apache.geronimo.management.J2EEModule;
import org.apache.geronimo.management.J2EEResource;
import org.apache.geronimo.management.JCAConnectionFactory;
-import org.apache.geronimo.management.JCAResource;
import org.apache.geronimo.management.JDBCDataSource;
import org.apache.geronimo.management.JDBCDriver;
import org.apache.geronimo.management.JDBCResource;
@@ -37,7 +41,9 @@
import org.apache.geronimo.management.geronimo.EJBManager;
import org.apache.geronimo.management.geronimo.J2EEApplication;
import org.apache.geronimo.management.geronimo.J2EEServer;
+import org.apache.geronimo.management.geronimo.JCAAdminObject;
import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
+import org.apache.geronimo.management.geronimo.JCAResource;
import org.apache.geronimo.management.geronimo.JMSBroker;
import org.apache.geronimo.management.geronimo.JMSConnector;
import org.apache.geronimo.management.geronimo.JMSManager;
@@ -53,11 +59,6 @@
import org.apache.geronimo.system.logging.SystemLog;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-import java.util.Map;
-
/**
* A helper interface to navigate between management objects. This is not
* complete; it will be expanded as necessary.
@@ -80,6 +81,7 @@
EJBModule[] getEJBModules(J2EEServer server);
ResourceAdapterModule[] getRAModules(J2EEServer server);
ResourceAdapterModule[] getOutboundRAModules(J2EEServer server, String connectionFactoryInterface);
+ ResourceAdapterModule[] getAdminObjectModules(J2EEServer server, String[] adminObjectInterfaces);
JCAManagedConnectionFactory[] getOutboundFactories(J2EEServer server, String connectionFactoryInterface);
J2EEResource[] getResources(J2EEServer server);
JCAResource[] getJCAResources(J2EEServer server);
@@ -137,6 +139,8 @@
ResourceAdapter[] getResourceAdapters(ResourceAdapterModule module);
JCAManagedConnectionFactory[] getOutboundFactories(ResourceAdapterModule module);
JCAManagedConnectionFactory[] getOutboundFactories(ResourceAdapterModule module, String connectionFactoryInterface);
+ //todo: create an interface for admin objects
+ JCAAdminObject[] getAdminObjects(ResourceAdapterModule module, String[] adminObjectInterfaces);
// resource adapter properties
JCAResource[] getRAResources(ResourceAdapter adapter);
@@ -149,6 +153,7 @@
// Generic utility methods
Object getObject(String objectName);
+ URI getConfigurationNameFor(String objectName);
String getGBeanDescription(String objectName);
// Misc
Modified: geronimo/trunk/applications/console-framework/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/maven.xml?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/maven.xml (original)
+++ geronimo/trunk/applications/console-framework/maven.xml Mon Jan 23 19:10:32 2006
@@ -6,7 +6,7 @@
xmlns:velocity="jelly:velocity"
xmlns:util="jelly:util">
- <preGoal name="war:install">
+ <preGoal name="war:war">
<attainGoal name="preCompile"/>
</preGoal>
Modified: geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/pageregistry.xml Mon Jan 23 19:10:32 2006
@@ -262,17 +262,24 @@
<fragment name="jms" type="page">
<navigation>
- <title>JMS</title>
+ <title>JMS Resources</title>
<description>ico_beanjar_16x16.gif Configure Java Message Service</description>
</navigation>
<fragment name="row1" type="row">
<fragment name="col1" type="column">
<fragment name="p1" type="portlet">
- <property name="portlet" value="5.31"/>
+ <property name="portlet" value="5.67"/>
</fragment>
</fragment>
</fragment>
<fragment name="row2" type="row">
+ <fragment name="col1" type="column">
+ <fragment name="p1" type="portlet">
+ <property name="portlet" value="5.31"/>
+ </fragment>
+ </fragment>
+ </fragment>
+ <fragment name="row3" type="row">
<fragment name="col1" type="column">
<fragment name="p1" type="portlet">
<property name="portlet" value="5.17"/>
Modified: geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml (original)
+++ geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml Mon Jan 23 19:10:32 2006
@@ -136,5 +136,8 @@
<portlet id="66">
<definition-id>console-standard.RealmWizard</definition-id>
</portlet>
+ <portlet id="67">
+ <definition-id>console-standard.JMSWizard</definition-id>
+ </portlet>
</application>
</portlet-entity-registry>
Modified: geronimo/trunk/applications/console-standard/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/maven.xml?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/maven.xml (original)
+++ geronimo/trunk/applications/console-standard/maven.xml Mon Jan 23 19:10:32 2006
@@ -6,8 +6,9 @@
xmlns:velocity="jelly:velocity"
xmlns:util="jelly:util">
- <preGoal name="war:install">
+ <preGoal name="war:war">
<attainGoal name="preCompile"/>
+ <attainGoal name="substitute"/>
</preGoal>
<!-- Output folder for compiled jsps. -->
@@ -20,6 +21,12 @@
<attainGoal name="war:install"/>
</goal>
+ <goal name="substitute">
+ <velocity:merge basedir="${basedir}/src/conf"
+ template="jms-resource-providers.properties"
+ name="${basedir}/target/${pom.artifactId}/WEB-INF/classes/jms-resource-providers.properties"/>
+ </goal>
+
<!-- ==================================================== -->
<!-- Pre compile JSPs -->
<!-- ==================================================== -->
Modified: geronimo/trunk/applications/console-standard/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/project.xml?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/project.xml (original)
+++ geronimo/trunk/applications/console-standard/project.xml Mon Jan 23 19:10:32 2006
@@ -107,6 +107,11 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>geronimo-naming-builder</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-connector-builder</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
Propchange: geronimo/trunk/applications/console-standard/src/conf/jms-resource-providers.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Mon Jan 23 19:10:32 2006
@@ -816,8 +816,7 @@
final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();
Connector15DCBRoot root = (Connector15DCBRoot) config.getDConfigBeanRoot(ddBeanRoot);
ConnectorDCB connector = (ConnectorDCB) root.getDConfigBean(ddBeanRoot.getChildBean(root.getXpaths()[0])[0]);
- connector.setConfigID("user/database-pool"+data.getName() + "/1/car");
- connector.setParentID("geronimo/j2ee-server/" + GeronimoVersion.GERONIMO_VERSION + "/car");
+ connector.setConfigID("console-db-pool-"+data.getName());
if(data.jar1 != null && !data.jar1.equals("")) {
Dependency dep = new Dependency();
connector.setDependency(new Dependency[]{dep});
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ConfigureRAInstanceHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/CreateConnectionFactoryHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/CreateDestinationHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/DeployHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSProviderData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/JMSResourcePortlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectConnectionFactoryTypeHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectDestinationTypeHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/SelectProviderHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/wizard/ShowPlanHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java Mon Jan 23 19:10:32 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/trunk/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java Mon Jan 23 19:10:32 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/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/portlet.xml Mon Jan 23 19:10:32 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/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp Mon Jan 23 19:10:32 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/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp Mon Jan 23 19:10:32 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/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp Mon Jan 23 19:10:32 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/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp Mon Jan 23 19:10:32 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/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp Mon Jan 23 19:10:32 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/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp Mon Jan 23 19:10:32 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/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp Mon Jan 23 19:10:32 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}" />
Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destination.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/destinationType.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factory.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/factoryType.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/list.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml?rev=371787&r1=371786&r2=371787&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml Mon Jan 23 19:10:32 2006
@@ -251,6 +251,20 @@
</servlet>
<servlet>
<description>Automated generated Portlet Wrapper</description>
+ <display-name>Pluto Wrapper for JMS Wizard Portlet</display-name>
+ <servlet-name>JMSWizard</servlet-name>
+ <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+ <init-param>
+ <param-name>portlet-class</param-name>
+ <param-value>org.apache.geronimo.console.jmsmanager.wizard.JMSResourcePortlet</param-value>
+ </init-param>
+ <init-param>
+ <param-name>portlet-guid</param-name>
+ <param-value>console-standard.JMSWizard</param-value>
+ </init-param>
+ </servlet>
+ <servlet>
+ <description>Automated generated Portlet Wrapper</description>
<display-name>Pluto Wrapper for Security Realm Wizard Portlet</display-name>
<servlet-name>RealmWizard</servlet-name>
<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
@@ -763,6 +777,10 @@
<servlet-mapping>
<servlet-name>DBWizard</servlet-name>
<url-pattern>/DBWizard/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>JMSWizard</servlet-name>
+ <url-pattern>/JMSWizard/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>RealmWizard</servlet-name>