You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/01/12 01:42:28 UTC
svn commit: r611338 - in /geronimo/server/trunk:
plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/
plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/
plugins/console/co...
Author: djencks
Date: Fri Jan 11 16:42:22 2008
New Revision: 611338
URL: http://svn.apache.org/viewvc?rev=611338&view=rev
Log:
GERONIMO-3732. Move the rest of deployment functionality out of console base and (mostly) into plugin-portlets. Revert the accidental menu name change for looking at web apps
Added:
geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java (with props)
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/
- copied from r611059, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/MasterLoginModuleInfo.java
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
- copied, changed from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/classes/login-modules.properties
- copied unchanged from r611059, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/classes/login-modules.properties
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/
- copied from r611059, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/edit.jsp
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/showPlan.jsp
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/showPlan.jsp
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testResults.jsp
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/testResults.jsp
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp
- copied unchanged from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/usage.jsp
geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java (with props)
Removed:
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/classes/login-modules.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/realmwizard/
Modified:
geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java
geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java
geronimo/server/trunk/plugins/console/console-jetty/pom.xml
geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DisplayPlanHandler.java
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java
geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java
Added: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java?rev=611338&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java (added)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java Fri Jan 11 16:42:22 2008
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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;
+
+import javax.enterprise.deploy.spi.DeploymentManager;
+import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
+import javax.enterprise.deploy.spi.factories.DeploymentFactory;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSession;
+
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel;
+import org.apache.geronimo.kernel.Kernel;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class ManagementHelper {
+ private final static String PLUGIN_HELPER_KEY = "org.apache.geronimo.console.activemq.ManagementHelper";
+ private final Kernel kernel;
+
+ public static ManagementHelper getManagementHelper(PortletRequest request) {
+ ManagementHelper helper = (ManagementHelper) request.getPortletSession(true).getAttribute(PLUGIN_HELPER_KEY, PortletSession.APPLICATION_SCOPE);
+ if (helper == null) {
+ Kernel kernel = PortletManager.getKernel();
+ helper = new ManagementHelper(kernel);
+ request.getPortletSession().setAttribute(PLUGIN_HELPER_KEY, helper, PortletSession.APPLICATION_SCOPE);
+ }
+ return helper;
+ }
+
+ public ManagementHelper(Kernel kernel) {
+ this.kernel = kernel;
+ }
+
+ public DeploymentManager getDeploymentManager() {
+ DeploymentFactory factory = new DeploymentFactoryWithKernel(kernel);
+ try {
+ return factory.getDeploymentManager("deployer:geronimo:inVM", null, null);
+ } catch (DeploymentManagerCreationException e) {
+ // log.error(e.getMessage(), e);
+ return null;
+ }
+ }
+}
+
Propchange: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/ManagementHelper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java Fri Jan 11 16:42:22 2008
@@ -49,6 +49,7 @@
import org.apache.geronimo.connector.deployment.jsr88.SinglePool;
import org.apache.geronimo.console.MultiPageAbstractHandler;
import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.console.jmsmanager.ManagementHelper;
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.deployment.service.jsr88.EnvironmentData;
import org.apache.geronimo.deployment.tools.loader.ConnectorDeployable;
@@ -464,7 +465,7 @@
JMSProviderData provider = JMSProviderData.getProviderData(data.rarURI, request);
if(data.objectName == null || data.objectName.equals("")) { // we're creating a new pool
//data.instanceName = data.instanceName.replaceAll("\\s", "");
- DeploymentManager mgr = PortletManager.getDeploymentManager(request);
+ DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
try {
File rarFile = PortletManager.getRepositoryEntry(request, data.getRarURI());
ConnectorDeployable deployable = new ConnectorDeployable(rarFile.toURL());
@@ -647,6 +648,17 @@
}
return null;
}
+
+ protected static void waitForProgress(ProgressObject po) {
+ while(po.getDeploymentStatus().isRunning()) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml Fri Jan 11 16:42:22 2008
@@ -232,24 +232,6 @@
</portlet>
<portlet>
- <description>Portlet for managing security realms</description>
- <portlet-name>RealmWizard</portlet-name>
- <display-name>Security Realm Wizard</display-name>
- <portlet-class>org.apache.geronimo.console.securitymanager.realm.SecurityRealmPortlet</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>Security Realms</title>
- <short-title>Security Realms</short-title>
- <keywords>Security Realm Wizard</keywords>
- </portlet-info>
- </portlet>
-
- <portlet>
<description>Portlet for configuring Geronimo with Apache via mod_jk</description>
<portlet-name>ApacheJK</portlet-name>
<display-name>Apache mod_jk Wizard</display-name>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml Fri Jan 11 16:42:22 2008
@@ -136,15 +136,6 @@
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>RealmWizard</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
- <init-param>
- <param-name>portlet-name</param-name>
- <param-value>RealmWizard</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
<servlet-name>ApacheJK</servlet-name>
<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
<init-param>
@@ -309,10 +300,6 @@
<servlet-mapping>
<servlet-name>RepositoryViewer</servlet-name>
<url-pattern>/PlutoInvoker/RepositoryViewer</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>RealmWizard</servlet-name>
- <url-pattern>/PlutoInvoker/RealmWizard</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>ApacheJK</servlet-name>
Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPageAbstractHandler.java Fri Jan 11 16:42:22 2008
@@ -16,20 +16,18 @@
*/
package org.apache.geronimo.console;
-import org.apache.commons.fileupload.portlet.PortletFileUpload;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import javax.enterprise.deploy.spi.status.ProgressObject;
-import java.io.IOException;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
/**
* Base class for handlers for the multi page portlet. Each one is expected
@@ -92,16 +90,6 @@
public Properties getUploadFields() {
return uploadFields;
- }
-
- protected static void waitForProgress(ProgressObject po) {
- while(po.getDeploymentStatus().isRunning()) {
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
}
}
Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/PortletManager.java Fri Jan 11 16:42:22 2008
@@ -18,25 +18,18 @@
import java.io.File;
import java.util.Map;
-import java.util.regex.Pattern;
-import javax.enterprise.deploy.spi.DeploymentManager;
-import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
-import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
-import javax.portlet.RenderResponse;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.Kernel;
@@ -61,7 +54,6 @@
import org.apache.geronimo.management.geronimo.ResourceAdapter;
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.system.logging.SystemLog;
@@ -98,17 +90,6 @@
kernel = KernelRegistry.getSingleKernel();
}
return kernel;
- }
-
- public static DeploymentManager getDeploymentManager(PortletRequest request) {
- Kernel kernel = getKernel();
- DeploymentFactory factory = new DeploymentFactoryWithKernel(kernel);
- try {
- return factory.getDeploymentManager("deployer:geronimo:inVM", null, null);
- } catch (DeploymentManagerCreationException e) {
- log.error(e.getMessage(), e);
- return null;
- }
}
public static ConfigurationManager getConfigurationManager() {
Modified: geronimo/server/trunk/plugins/console/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/pom.xml?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Fri Jan 11 16:42:22 2008
@@ -57,12 +57,14 @@
<type>car</type>
</dependency>
<!-- TODO temporary? for realm wizard-->
+<!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
+-->
<dependency>
<groupId>commons-fileupload</groupId>
Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml Fri Jan 11 16:42:22 2008
@@ -158,7 +158,7 @@
</reference>
</gbean>
<gbean name="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Web Apps</attribute>
+ <attribute name="pageTitle">Applications/Web App WARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[WARModules]</attribute>
<reference name="PortalContainerServices">
@@ -209,14 +209,6 @@
<attribute name="pageTitle">Security/Users and Groups</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[SEUsers, SEGroups]</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
- <gbean name="RealmWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Security/Security Realms</attribute>
- <attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[RealmWizard]</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml Fri Jan 11 16:42:22 2008
@@ -215,14 +215,6 @@
<name>PlutoPortalServices</name>
</reference>
</gbean>
- <gbean name="RealmWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Security/Security Realms</attribute>
- <attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[RealmWizard]</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
<gbean name="Keystores" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
<attribute name="pageTitle">Security/Keystores</attribute>
<attribute name="portletContext">/console-base</attribute>
Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml Fri Jan 11 16:42:22 2008
@@ -50,6 +50,15 @@
</reference>
</gbean>
+ <gbean name="RealmWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">Security/Security Realms</attribute>
+ <attribute name="portletContext">/plugin</attribute>
+ <attribute name="portletList">[RealmWizard]</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
+
<!-- Deployment factory for use inside server -->
<gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
</web-app>
Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml Fri Jan 11 16:42:22 2008
@@ -50,6 +50,15 @@
</reference>
</gbean>
+ <gbean name="RealmWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">Security/Security Realms</attribute>
+ <attribute name="portletContext">/plugin</attribute>
+ <attribute name="portletList">[RealmWizard]</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
+
<!-- Deployment factory for use inside server -->
<gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
</web-app>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java Fri Jan 11 16:42:22 2008
@@ -20,20 +20,24 @@
package org.apache.geronimo.console.car;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import java.util.Set;
+import javax.enterprise.deploy.spi.DeploymentManager;
+import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
+import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import javax.portlet.PortletRequest;
import javax.portlet.PortletSession;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.system.plugin.PluginInstaller;
import org.apache.geronimo.system.plugin.PluginRepositoryList;
-import org.apache.geronimo.console.util.PortletManager;
/**
* @version $Rev$ $Date$
@@ -78,9 +82,9 @@
if (this.pluginRepositoryLists == null) {
Set<AbstractName> names = kernel.listGBeans(new AbstractNameQuery(PluginRepositoryList.class.getName()));
List<PluginRepositoryList> pluginRepositoryLists = new ArrayList<PluginRepositoryList>(names.size());
- for (AbstractName name: names) {
+ for (AbstractName name : names) {
try {
- pluginRepositoryLists.add((PluginRepositoryList)kernel.getGBean(name));
+ pluginRepositoryLists.add((PluginRepositoryList) kernel.getGBean(name));
} catch (GBeanNotFoundException e) {
//ignore?
}
@@ -89,4 +93,15 @@
}
return this.pluginRepositoryLists;
}
+
+ public DeploymentManager getDeploymentManager() {
+ DeploymentFactory factory = new DeploymentFactoryWithKernel(kernel);
+ try {
+ return factory.getDeploymentManager("deployer:geronimo:inVM", null, null);
+ } catch (DeploymentManagerCreationException e) {
+ // log.error(e.getMessage(), e);
+ return null;
+ }
+ }
+
}
Copied: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (from r611336, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?p2=geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java&p1=geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java&r1=611336&r2=611338&rev=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Fri Jan 11 16:42:22 2008
@@ -63,6 +63,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.car.ManagementHelper;
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.deployment.xbeans.AbstractServiceType;
import org.apache.geronimo.deployment.xbeans.ArtifactType;
@@ -83,7 +84,6 @@
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.ListableRepository;
import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
@@ -493,7 +493,7 @@
try {
XmlObject plan = actionGeneratePlan(request, data);
data.name = data.name.replaceAll("\\s", "");
- DeploymentManager mgr = PortletManager.getDeploymentManager(request);
+ DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
File tempFile = File.createTempFile("console-deployment", ".xml");
tempFile.deleteOnExit();
log.debug("Writing security realm deployment plan to " + tempFile.getAbsolutePath());
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml Fri Jan 11 16:42:22 2008
@@ -61,4 +61,22 @@
</portlet-info>
</portlet>
+ <portlet>
+ <description>Portlet for managing security realms</description>
+ <portlet-name>RealmWizard</portlet-name>
+ <display-name>Security Realm Wizard</display-name>
+ <portlet-class>org.apache.geronimo.console.securitymanager.realm.SecurityRealmPortlet</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>Security Realms</title>
+ <short-title>Security Realms</short-title>
+ <keywords>Security Realm Wizard</keywords>
+ </portlet-info>
+ </portlet>
+
</portlet-app>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml Fri Jan 11 16:42:22 2008
@@ -61,14 +61,29 @@
<servlet-name>car-export</servlet-name>
<servlet-class>org.apache.geronimo.console.car.CARExportServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>car-export</servlet-name>
+ <url-pattern>/car-export</url-pattern>
+ </servlet-mapping>
+
<servlet>
<servlet-name>maven-repo</servlet-name>
<servlet-class>org.apache.geronimo.console.car.GeronimoAsMavenServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>maven-repo</servlet-name>
+ <url-pattern>/maven-repo/*</url-pattern>
+ </servlet-mapping>
+
<servlet>
<servlet-name>plan-export</servlet-name>
<servlet-class>org.apache.geronimo.console.configmanager.PlanExportServlet</servlet-class>
</servlet>
+ <servlet-mapping>
+ <servlet-name>plan-export</servlet-name>
+ <url-pattern>/plan-export</url-pattern>
+ </servlet-mapping>
+
<servlet>
<servlet-name>Deployment</servlet-name>
<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
@@ -78,6 +93,11 @@
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
+ <servlet-mapping>
+ <servlet-name>Deployment</servlet-name>
+ <url-pattern>/PlutoInvoker/Deployment</url-pattern>
+ </servlet-mapping>
+
<servlet>
<servlet-name>ImportExport</servlet-name>
<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
@@ -87,26 +107,23 @@
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
-
- <servlet-mapping>
- <servlet-name>car-export</servlet-name>
- <url-pattern>/car-export</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>maven-repo</servlet-name>
- <url-pattern>/maven-repo/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>plan-export</servlet-name>
- <url-pattern>/plan-export</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Deployment</servlet-name>
- <url-pattern>/PlutoInvoker/Deployment</url-pattern>
- </servlet-mapping>
<servlet-mapping>
<servlet-name>ImportExport</servlet-name>
<url-pattern>/PlutoInvoker/ImportExport</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>RealmWizard</servlet-name>
+ <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+ <init-param>
+ <param-name>portlet-name</param-name>
+ <param-value>RealmWizard</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>RealmWizard</servlet-name>
+ <url-pattern>/PlutoInvoker/RealmWizard</url-pattern>
</servlet-mapping>
<security-constraint>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DisplayPlanHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DisplayPlanHandler.java?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DisplayPlanHandler.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/DisplayPlanHandler.java Fri Jan 11 16:42:22 2008
@@ -22,6 +22,7 @@
import javax.enterprise.deploy.model.exceptions.DDBeanCreateException;
import javax.enterprise.deploy.spi.exceptions.ConfigurationException;
import javax.enterprise.deploy.spi.exceptions.InvalidModuleException;
+import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
@@ -60,6 +61,8 @@
} catch (InvalidModuleException e) {
log.error(e.getMessage(), e);
} catch (ConfigurationException e) {
+ log.error(e.getMessage(), e);
+ } catch (DeploymentManagerCreationException e) {
log.error(e.getMessage(), e);
}
request.setAttribute(DATA_PARAMETER, data);
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/JSR88_Util.java Fri Jan 11 16:42:22 2008
@@ -32,7 +32,9 @@
import javax.enterprise.deploy.spi.DeploymentManager;
import javax.enterprise.deploy.spi.Target;
import javax.enterprise.deploy.spi.exceptions.ConfigurationException;
+import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
import javax.enterprise.deploy.spi.exceptions.InvalidModuleException;
+import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import javax.enterprise.deploy.spi.status.ProgressObject;
import javax.management.ObjectName;
import javax.portlet.PortletException;
@@ -47,6 +49,7 @@
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.deployment.ConfigurationBuilder;
import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel;
import org.apache.geronimo.deployment.plugin.jmx.JMXDeploymentManager;
import org.apache.geronimo.deployment.service.jsr88.EnvironmentData;
import org.apache.geronimo.deployment.tools.loader.WebDeployable;
@@ -62,6 +65,7 @@
import org.apache.geronimo.j2ee.deployment.annotation.SecurityAnnotationHelper;
import org.apache.geronimo.j2ee.deployment.annotation.WebServiceRefAnnotationHelper;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.naming.deployment.EnvironmentEntryBuilder.EnvEntryRefProcessor;
@@ -285,12 +289,14 @@
}
public static String createDeploymentPlan(PortletRequest request, WARConfigData data, URL WarUrl)
- throws IOException, DDBeanCreateException, InvalidModuleException, ConfigurationException {
+ throws IOException, DDBeanCreateException, InvalidModuleException, ConfigurationException, DeploymentManagerCreationException {
WebDeployable webDeployable = new WebDeployable(WarUrl);
DDBeanRoot ddBeanRoot = webDeployable.getDDBeanRoot();
DDBean ddBean = ddBeanRoot.getChildBean("web-app")[0];
- DeploymentManager deploymentManager = PortletManager.getDeploymentManager(request);
+ Kernel kernel = PortletManager.getKernel();
+ DeploymentFactory factory = new DeploymentFactoryWithKernel(kernel);
+ DeploymentManager deploymentManager = factory.getDeploymentManager("deployer:geronimo:inVM", null, null);
DeploymentConfiguration deploymentConfiguration = deploymentManager.createConfiguration(webDeployable);
WebAppDConfigRoot configRoot = (WebAppDConfigRoot) deploymentConfiguration.getDConfigBeanRoot(ddBeanRoot);
WebAppDConfigBean webApp = (WebAppDConfigBean) configRoot.getDConfigBean(ddBean);
Added: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java?rev=611338&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java (added)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java Fri Jan 11 16:42:22 2008
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.databasemanager;
+
+import javax.enterprise.deploy.spi.DeploymentManager;
+import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
+import javax.enterprise.deploy.spi.factories.DeploymentFactory;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSession;
+
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel;
+import org.apache.geronimo.kernel.Kernel;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class ManagementHelper {
+ private final static String PLUGIN_HELPER_KEY = "org.apache.geronimo.console.systemdb.ManagementHelper";
+ private final Kernel kernel;
+
+ public static ManagementHelper getManagementHelper(PortletRequest request) {
+ ManagementHelper helper = (ManagementHelper) request.getPortletSession(true).getAttribute(PLUGIN_HELPER_KEY, PortletSession.APPLICATION_SCOPE);
+ if (helper == null) {
+ Kernel kernel = PortletManager.getKernel();
+ helper = new ManagementHelper(kernel);
+ request.getPortletSession().setAttribute(PLUGIN_HELPER_KEY, helper, PortletSession.APPLICATION_SCOPE);
+ }
+ return helper;
+ }
+
+ public ManagementHelper(Kernel kernel) {
+ this.kernel = kernel;
+ }
+
+ public DeploymentManager getDeploymentManager() {
+ DeploymentFactory factory = new DeploymentFactoryWithKernel(kernel);
+ try {
+ return factory.getDeploymentManager("deployer:geronimo:inVM", null, null);
+ } catch (DeploymentManagerCreationException e) {
+ // log.error(e.getMessage(), e);
+ return null;
+ }
+ }
+}
Propchange: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Fri Jan 11 16:42:22 2008
@@ -85,6 +85,7 @@
import org.apache.geronimo.connector.deployment.jsr88.SinglePool;
import org.apache.geronimo.connector.outbound.PoolingAttributes;
import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.databasemanager.ManagementHelper;
import org.apache.geronimo.console.ajax.ProgressInfo;
import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.converter.DatabaseConversionStatus;
@@ -534,7 +535,7 @@
}
private ResourceAdapterParams loadConfigPropertiesByPath(PortletRequest request, String rarPath) {
- DeploymentManager mgr = PortletManager.getDeploymentManager(request);
+ DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
try {
URL url = getRAR(request, rarPath).toURL();
ConnectorDeployable deployable = new ConnectorDeployable(url);
@@ -913,7 +914,7 @@
boolean isSystemDatabasePool = (data.getAbstractName().indexOf("org.apache.geronimo.configs") == 0);
if (!isSystemDatabasePool) {
- DeploymentManager mgr = PortletManager.getDeploymentManager(request);
+ DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
try {
// retrieve all running modules
TargetModuleID[] runningIds = mgr.getRunningModules(ModuleType.RAR, mgr.getTargets());
@@ -950,7 +951,7 @@
ImportStatus status = getImportStatus(request);
if (data.abstractName == null || data.abstractName.equals("")) { // we're creating a new pool
data.name = data.name.replaceAll("\\s", "");
- DeploymentManager mgr = PortletManager.getDeploymentManager(request);
+ DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
try {
File rarFile = getRAR(request, data.getRarPath());
ConnectorDeployable deployable = new ConnectorDeployable(rarFile.toURL());
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java?rev=611338&r1=611337&r2=611338&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java Fri Jan 11 16:42:22 2008
@@ -33,7 +33,7 @@
{
@Test
public void testConfigManagerWARLink() throws Exception {
- selenium.click("link=Web Apps");
+ selenium.click("link=Web App WARs");
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
assertEquals("Installed Web Applications",