Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 35490 invoked from network); 27 Mar 2006 21:50:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Mar 2006 21:50:42 -0000 Received: (qmail 47384 invoked by uid 500); 27 Mar 2006 21:50:41 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 47355 invoked by uid 500); 27 Mar 2006 21:50:41 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 47344 invoked by uid 99); 27 Mar 2006 21:50:41 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Mar 2006 13:50:41 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 27 Mar 2006 13:50:39 -0800 Received: (qmail 35207 invoked by uid 65534); 27 Mar 2006 21:50:19 -0000 Message-ID: <20060327215019.35206.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r389296 - in /geronimo/trunk: applications/console-framework/ applications/console-framework/src/java/ applications/console-framework/src/java/org/ applications/console-framework/src/java/org/apache/ applications/console-framework/src/java/... Date: Mon, 27 Mar 2006 21:50:13 -0000 To: scm@geronimo.apache.org From: jgenender@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jgenender Date: Mon Mar 27 13:50:11 2006 New Revision: 389296 URL: http://svn.apache.org/viewcvs?rev=389296&view=rev Log: GERONIMO-1705 and GERONIMO-973 Added: geronimo/trunk/applications/console-framework/src/java/ geronimo/trunk/applications/console-framework/src/java/org/ geronimo/trunk/applications/console-framework/src/java/org/apache/ geronimo/trunk/applications/console-framework/src/java/org/apache/geronimo/ geronimo/trunk/applications/console-framework/src/java/org/apache/geronimo/console/ geronimo/trunk/applications/console-framework/src/java/org/apache/geronimo/console/servlet/ geronimo/trunk/applications/console-framework/src/java/org/apache/geronimo/console/servlet/ContextForwardServlet.java geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DownloadInfo.java geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DownloadMonitor.java geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servlet/ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servlet/ForwardDispatchFilter.java Modified: geronimo/trunk/applications/console-framework/project.xml geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/web.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/databasemanager/wizard/DriverDownloader.java geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/dwr.xml geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/web.xml geronimo/trunk/configs/console-jetty/src/plan/plan.xml geronimo/trunk/configs/console-tomcat/src/plan/plan.xml Modified: geronimo/trunk/applications/console-framework/project.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/project.xml?rev=389296&r1=389295&r2=389296&view=diff ============================================================================== --- geronimo/trunk/applications/console-framework/project.xml (original) +++ geronimo/trunk/applications/console-framework/project.xml Mon Mar 27 13:50:11 2006 @@ -103,5 +103,11 @@ + + + src/java + + + Added: geronimo/trunk/applications/console-framework/src/java/org/apache/geronimo/console/servlet/ContextForwardServlet.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/java/org/apache/geronimo/console/servlet/ContextForwardServlet.java?rev=389296&view=auto ============================================================================== --- geronimo/trunk/applications/console-framework/src/java/org/apache/geronimo/console/servlet/ContextForwardServlet.java (added) +++ geronimo/trunk/applications/console-framework/src/java/org/apache/geronimo/console/servlet/ContextForwardServlet.java Mon Mar 27 13:50:11 2006 @@ -0,0 +1,73 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.geronimo.console.servlet; + +import java.io.IOException; + +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.UnavailableException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * Servlet that forwards GET and POST requests to a servlet + * in an alternate context. The servlet path and alternate + * context are passed in as configuration parameters (e.g. + * via elements in the web.xml). + */ +public class ContextForwardServlet extends HttpServlet { + + // name of the configuration parameter containing the context path + public static final String CONTEXT_PATH = "context-path"; + // name of the configuration parameter containing the servlet path + public static final String SERVLET_PATH = "servlet-path"; + + private ServletContext forwardContext; + private String servletPath; + + public void init(ServletConfig config) throws ServletException { + super.init(config); + String contextPath = config.getInitParameter(CONTEXT_PATH); + servletPath = config.getInitParameter(SERVLET_PATH); + if (contextPath == null || servletPath == null) { + throw new UnavailableException("context-path and servlet-path " + + "must be provided as configuration parameters"); + } + forwardContext = getServletContext().getContext(contextPath); + } + + public void doGet(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + doPost(req, resp); + } + + public void doPost(HttpServletRequest req, HttpServletResponse resp) + throws ServletException, IOException { + String dispatchURI = servletPath + req.getPathInfo(); + String queryString = req.getQueryString(); + if (queryString != null) { + dispatchURI += "?" + queryString; + } + RequestDispatcher dispatcher = forwardContext.getRequestDispatcher(dispatchURI); + dispatcher.forward(req, resp); + } +} Modified: geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/web.xml?rev=389296&r1=389295&r2=389296&view=diff ============================================================================== --- geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/web.xml (original) +++ geronimo/trunk/applications/console-framework/src/webapp/WEB-INF/web.xml Mon Mar 27 13:50:11 2006 @@ -30,6 +30,20 @@ org.apache.pluto.portalImpl.Servlet + + DWR Forward Servlet + dwr-forward + org.apache.geronimo.console.servlet.ContextForwardServlet + + context-path + /console-standard + + + servlet-path + /dwr + + + se-console /portal/* @@ -38,10 +52,15 @@ se-console /secure/* + + dwr-forward + /dwr/* + + /dwr/* /portal/* GET POST 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=389296&r1=389295&r2=389296&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 Mar 27 13:50:11 2006 @@ -276,19 +276,28 @@ DriverDownloader downloader = new DriverDownloader(); WriteableRepository repo = PortletManager.getWritableRepositories(actionRequest)[0]; try { - downloader.loadDriver(repo, found, new FileWriteMonitor() { + DownloadInfo downloadInfo = new DownloadInfo(); + final PortletSession session = actionRequest.getPortletSession(); + session.setAttribute(DownloadInfo.DOWNLOAD_INFO_KEY, downloadInfo, PortletSession.APPLICATION_SCOPE); + downloader.loadDriver(repo, found, downloadInfo, new FileWriteMonitor() { public void writeStarted(String fileDescription) { System.out.println("Downloading "+fileDescription); + DownloadInfo downloadInfo = (DownloadInfo)session.getAttribute(DownloadInfo.DOWNLOAD_INFO_KEY); + downloadInfo.setDownloadStarted(true); } public void writeProgress(int bytes) { System.out.print("\rDownload progress: "+(bytes/1024)+"kB"); System.out.flush(); + DownloadInfo downloadInfo = (DownloadInfo)session.getAttribute(DownloadInfo.DOWNLOAD_INFO_KEY); + downloadInfo.setBytesDownloaded(bytes); } public void writeComplete(int bytes) { System.out.println(); System.out.println("Finished downloading "+bytes+"b"); + DownloadInfo downloadInfo = (DownloadInfo)session.getAttribute(DownloadInfo.DOWNLOAD_INFO_KEY); + downloadInfo.setDownloadFinished(true); } }); data.jar1 = found.getRepositoryURI(); Added: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DownloadInfo.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DownloadInfo.java?rev=389296&view=auto ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DownloadInfo.java (added) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DownloadInfo.java Mon Mar 27 13:50:11 2006 @@ -0,0 +1,56 @@ +/** + * + * Copyright 2005 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.geronimo.console.databasemanager.wizard; + +public class DownloadInfo +{ + public static final String DOWNLOAD_INFO_KEY = "downloadInfo"; + private boolean downloadStarted = false; + private boolean downloadFinished = false; + private long bytesDownloaded = 0; + private long totalBytes = -1; + + public DownloadInfo() + { + } + public boolean isDownloadFinished() { + return downloadFinished; + } + public void setDownloadFinished(boolean downloadFinished) { + this.downloadFinished = downloadFinished; + } + public boolean isDownloadStarted() { + return downloadStarted; + } + public void setDownloadStarted(boolean downloadStarted) { + this.downloadStarted = downloadStarted; + } + public long getBytesDownloaded() { + return bytesDownloaded; + } + public void setBytesDownloaded(long bytesDownloaded) { + this.bytesDownloaded = bytesDownloaded; + } + public long getTotalBytes() { + return totalBytes; + } + public void setTotalBytes(long totalBytes) { + this.totalBytes = totalBytes; + } +} + Added: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DownloadMonitor.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DownloadMonitor.java?rev=389296&view=auto ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DownloadMonitor.java (added) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DownloadMonitor.java Mon Mar 27 13:50:11 2006 @@ -0,0 +1,37 @@ +/** + * + * Copyright 2005 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.geronimo.console.databasemanager.wizard; + +import javax.servlet.http.HttpSession; + +import uk.ltd.getahead.dwr.ExecutionContext; + +public class DownloadMonitor +{ + public DownloadInfo getDownloadInfo() + { + HttpSession session = ExecutionContext.get().getSession(); + + if (session.getAttribute(DownloadInfo.DOWNLOAD_INFO_KEY) != null) { + return (DownloadInfo) session.getAttribute(DownloadInfo.DOWNLOAD_INFO_KEY); + } else { + return new DownloadInfo(); + } + } +} + Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java?rev=389296&r1=389295&r2=389296&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java (original) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java Mon Mar 27 13:50:11 2006 @@ -26,6 +26,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.net.URLConnection; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -116,7 +117,7 @@ /** * Downloads a driver and loads it into the local repository. */ - public void loadDriver(WriteableRepository repo, DriverInfo driver, FileWriteMonitor monitor) throws IOException { + public void loadDriver(WriteableRepository repo, DriverInfo driver, DownloadInfo downloadInfo, FileWriteMonitor monitor) throws IOException { try { int urlIndex = 0; if(driver.urls.length > 1) { @@ -133,7 +134,9 @@ int size; int total = 0; int threshold = 10240; - InputStream net = url.openStream(); + URLConnection uc = url.openConnection(); + downloadInfo.setTotalBytes(uc.getContentLength()); + InputStream net = uc.getInputStream(); JarFile jar = null; File download = null; try { Added: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servlet/ForwardDispatchFilter.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servlet/ForwardDispatchFilter.java?rev=389296&view=auto ============================================================================== --- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servlet/ForwardDispatchFilter.java (added) +++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/servlet/ForwardDispatchFilter.java Mon Mar 27 13:50:11 2006 @@ -0,0 +1,98 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.geronimo.console.servlet; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + +/** + * Filter that wrappers HTTP requests forwarded from a separate + * context via a named request dispatcher. The wrapped HTTP + * requests return attributes from the original request instead + * of the forwarded instance of the request. Deployment + * descriptors that use this filter should specify "FORWARD" as + * the dispatcher type in their filter-mapping elements, as per + * the 2.4 Servlet Specification. e.g. + * + * 
+ *     
+ *        myfilter
+ *        myservlet
+ *        FORWARD
+ *     
+ *
+ * + */ +public class ForwardDispatchFilter implements Filter { + + protected FilterConfig filterConfig; + + public void init(FilterConfig config) throws ServletException { + filterConfig = config; + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + if (request instanceof HttpServletRequest) { + chain.doFilter(new ForwardRequest((HttpServletRequest)request), response); + } else { + throw new ServletException("ServletRequest is not an instance of HttpServletRequest"); + } + } + + public void destroy() {} + + /* An HTTP servlet request wrapper that maps the following + * attributes from the original request + * + * # javax.servlet.forward.request_uri + * # javax.servlet.forward.context_path + * # javax.servlet.forward.servlet_path + * # javax.servlet.forward.path_info + * # javax.servlet.forward.query_string + */ + protected class ForwardRequest extends HttpServletRequestWrapper { + HttpServletRequest request; + public ForwardRequest(HttpServletRequest req) { + super(req); + request = req; + } + public String getRequestURI() { + return String.valueOf(request.getAttribute("javax.servlet.forward.request_uri")); + } + public String getContextPath() { + return String.valueOf(request.getAttribute("javax.servlet.forward.context_path")); + } + public String getServletPath() { + return String.valueOf(request.getAttribute("javax.servlet.forward.servlet_path")); + } + public String getPathInfo() { + return String.valueOf(request.getAttribute("javax.servlet.forward.path_info")); + } + public String getQueryString() { + return String.valueOf(request.getAttribute("javax.servlet.forward.query_string")); + } + } +} Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/dwr.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/dwr.xml?rev=389296&r1=389295&r2=389296&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/dwr.xml (original) +++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/dwr.xml Mon Mar 27 13:50:11 2006 @@ -1,12 +1,15 @@ - + + + + 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=389296&r1=389295&r2=389296&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 Mar 27 13:50:11 2006 @@ -1,5 +1,49 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%> +<%@ page import="org.apache.geronimo.console.util.PortletManager" %> + +<% String dwrForwarderServlet = PortletManager.getConsoleFrameworkServletPath(request) + "/../dwr"; %> + + + + + +

Create Database Pool -- Step 2: Select Driver, JAR, Parameters

@@ -13,7 +57,8 @@ install the driver by hand (copy it to a directory under geronimo/repository/)

-
+ @@ -57,12 +102,23 @@ - - + + +
+ + <%-- @@ -92,4 +148,4 @@
  • Pointbase
  • Progress
  • Microsoft SQL Server
    • - \ No newline at end of file + Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?rev=389296&r1=389295&r2=389296&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp (original) +++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp Mon Mar 27 13:50:11 2006 @@ -1,9 +1,12 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%> +<%@ page import="org.apache.geronimo.console.util.PortletManager" %> + +<% String dwrForwarderServlet = PortletManager.getConsoleFrameworkServletPath(request) + "/../dwr"; %> + + + - - - 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=389296&r1=389295&r2=389296&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 Mar 27 13:50:11 2006 @@ -967,6 +967,27 @@ RunSQL /RunSQL/* + + + + + / + GET + POST + PUT + + + admin + + + + BASIC + geronimo-properties-realm + + + admin + + ImportExport /ImportExport/* @@ -1012,5 +1033,23 @@ javax.sql.DataSource Container --> + + + + dwr-filter + org.apache.geronimo.console.servlet.ForwardDispatchFilter + + + dwr-filter + dwr-invoker + FORWARD + Modified: geronimo/trunk/configs/console-jetty/src/plan/plan.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/src/plan/plan.xml?rev=389296&r1=389295&r2=389296&view=diff ============================================================================== --- geronimo/trunk/configs/console-jetty/src/plan/plan.xml (original) +++ geronimo/trunk/configs/console-jetty/src/plan/plan.xml Mon Mar 27 13:50:11 2006 @@ -29,18 +29,6 @@ /console false geronimo-properties-realm - - - - - - - - - - - - @@ -49,8 +37,22 @@ /console-standard false + geronimo-properties-realm + + + + + + + + + + + + + Modified: geronimo/trunk/configs/console-tomcat/src/plan/plan.xml URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-tomcat/src/plan/plan.xml?rev=389296&r1=389295&r2=389296&view=diff ============================================================================== --- geronimo/trunk/configs/console-tomcat/src/plan/plan.xml (original) +++ geronimo/trunk/configs/console-tomcat/src/plan/plan.xml Mon Mar 27 13:50:11 2006 @@ -30,18 +30,6 @@ false geronimo-properties-realm - - - - - - - - - - - - @@ -51,9 +39,27 @@ /console-standard false + geronimo-properties-realm + + + + + + + + + + + + + @@ -84,4 +90,4 @@ - + \ No newline at end of file