geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r474975 - in /geronimo/server/trunk: applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ applications/console/geronimo-console-framework/ applications/console/geronimo-console-framework/src/main/java/...
Date Tue, 14 Nov 2006 20:58:13 GMT
Author: pmcmahan
Date: Tue Nov 14 12:58:12 2006
New Revision: 474975

URL: http://svn.apache.org/viewvc?view=rev&rev=474975
Log:
GERONIMO-2478 ContextForwardServlet should have a registration mechanism.  Merging rev 469724 from branches/1.1.

Added:
    geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/
    geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForward.java   (with props)
    geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java   (with props)
    geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java   (with props)
Modified:
    geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml
    geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/confirmExport.jsp
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/graphs/memoryGraphSVG.jsp
    geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
    geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml

Added: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForward.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForward.java?view=auto&rev=474975
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForward.java (added)
+++ geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForward.java Tue Nov 14 12:58:12 2006
@@ -0,0 +1,53 @@
+/**
+ *
+ * Copyright 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.gbean;
+
+/**
+ * Interface for a GBean that describes a context forward (that is, a
+ * certain URL pattern in the console should be forwarded to a similar URL in
+ * one of the portlet web applications without requiring a separate login).
+ *
+ * This is managed by a single servlet in the portal web app (say, mapped to
+ * /forwards/*).  Therefore each ContextForward must specify three pieces of
+ * information -- the prefix under the portal servlet that should be forwarded,
+ * the context to forward to, and the path to forward to within the context.
+ * For example, if it specified "myimages/", "myportlet", and "images" then a
+ * request to /console/forwards/myimages/foo.png would be forwarded to
+ * /myportlet/images/foo.png
+ *
+ * @version $Rev$ $Date$
+ */
+public interface ContextForward {
+    /**
+     * Gets the prefix for the portal servlet's path that should be forwarded
+     * according to this definition.  This is "myimages/" in the example above.
+     */
+    String getPortalPathPrefix();
+    /**
+     * Gets the context root that this request should forward to ("myportlet"
+     * in the example above).
+     */
+    String getPortletContextPath();
+
+    /**
+     * Gets the servlet path that this request should forward to in the
+     * destination context.  Any data after the servlet path and portal path
+     * prefix in the original URL will be appended to the portlet context
+     * path and servlet path to construct the destination URL.
+     */
+    String getPortletServletPath();
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForward.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForward.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForward.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java?view=auto&rev=474975
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java (added)
+++ geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java Tue Nov 14 12:58:12 2006
@@ -0,0 +1,64 @@
+/**
+ *
+ * Copyright 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.gbean;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+
+/**
+ * A GBean that implements ContextForward.  This way any Geronimo module can
+ * add forwards to the console.
+ *
+ * @version $Rev$ $Date$
+ */
+public class ContextForwardGBean implements ContextForward {
+    private String portalPathPrefix;
+    private String portletContextPath;
+    private String portletServletPath;
+
+    public ContextForwardGBean(String portalPathPrefix, String portletContextPath, String portletServletPath) {
+        this.portalPathPrefix = portalPathPrefix;
+        this.portletContextPath = portletContextPath;
+        this.portletServletPath = portletServletPath;
+    }
+
+    public String getPortalPathPrefix() {
+        return portalPathPrefix;
+    }
+
+    public String getPortletContextPath() {
+        return portletContextPath;
+    }
+
+    public String getPortletServletPath() {
+        return portletServletPath;
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(ContextForwardGBean.class);
+        infoFactory.addAttribute("portalPathPrefix", String.class, true, true);
+        infoFactory.addAttribute("portletContextPath", String.class, true, true);
+        infoFactory.addAttribute("portletServletPath", String.class, true, true);
+        infoFactory.addInterface(ContextForward.class);
+        infoFactory.setConstructor(new String[]{"portalPathPrefix","portletContextPath","portletServletPath"});
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/applications/console/geronimo-console-core/src/main/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml?view=diff&rev=474975&r1=474974&r2=474975
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml Tue Nov 14 12:58:12 2006
@@ -70,7 +70,21 @@
             <artifactId>jasper-runtime</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications.console</groupId>
+            <artifactId>geronimo-console-core</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
     
     <build>

Added: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java?view=auto&rev=474975
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java (added)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java Tue Nov 14 12:58:12 2006
@@ -0,0 +1,173 @@
+/**
+ *
+ * Copyright 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 org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.gbean.ContextForward;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.lifecycle.LifecycleAdapter;
+import org.apache.geronimo.kernel.lifecycle.LifecycleListener;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Servlet that forwards GET and POST requests to a servlet in an alternate
+ * context. The servlet path and alternate context are defined in GBeans of
+ * type ContextForward, and this one servlet handles the forwarding for all
+ * those different paths.
+ *
+ * NOTE: This does not work for DWR, because it changes the request path info
+ * while forwarding, and DWR requires the exact initial request info in order
+ * to construct URLs in the data that it returns.  It should work to forward
+ * to most typical servlets, JSPs, and static content.
+ */
+public class GenericForwardServlet extends HttpServlet {
+    private final static Log log = LogFactory.getLog(GenericForwardServlet.class);
+    private Map forwards = new HashMap(); // Maps a prefix String to ForwardData
+    private Kernel kernel;
+    private LifecycleListener listener;
+
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+
+        kernel = KernelRegistry.getSingleKernel();
+        AbstractNameQuery query = new AbstractNameQuery(ContextForward.class.getName());
+        Set set = kernel.listGBeans(query);
+        for (Iterator it = set.iterator(); it.hasNext();) {
+            AbstractName name = (AbstractName) it.next();
+            addGBean(name);
+        }
+        kernel.getLifecycleMonitor().addLifecycleListener(listener = new LifecycleAdapter() {
+            public void running(AbstractName abstractName) {
+                addGBean(abstractName);
+            }
+
+            public void stopping(AbstractName abstractName) {
+                removeGBean(abstractName);
+            }
+
+            public void stopped(AbstractName abstractName) {
+                removeGBean(abstractName);
+            }
+
+            public void failed(AbstractName abstractName) {
+                removeGBean(abstractName);
+            }
+
+            public void unloaded(AbstractName abstractName) {
+                removeGBean(abstractName);
+            }
+        }, query);
+    }
+
+    public void destroy() {
+        if(listener != null) {
+            kernel.getLifecycleMonitor().removeLifecycleListener(listener);
+            listener = null;
+        }
+    }
+
+    private void addGBean(AbstractName name) {
+        ContextForward forward = (ContextForward) kernel.getProxyManager().createProxy(name, ContextForward.class);
+        forwards.put(forward.getPortalPathPrefix(), new ForwardData(getServletContext().getContext(forward.getPortletContextPath()),
+                                                                    forward.getPortletServletPath(), name));
+    }
+
+    private void removeGBean(AbstractName name) {
+        for (Iterator it = forwards.entrySet().iterator(); it.hasNext();) {
+            Map.Entry entry = (Map.Entry) it.next();
+            ForwardData data = (ForwardData) entry.getValue();
+            if(data.getGbean().equals(name)) {
+                it.remove();
+                break;
+            }
+        }
+    }
+
+    public void doGet(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+        doPost(req, resp);
+    }
+
+    public void doPost(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+        String path = req.getPathInfo();
+        if(path == null) {
+            log.error("Unable to forward request; no path information provided.  Path is used to identify where to forward to.");
+            return;
+        }
+        ForwardData forward = null;
+        for (Iterator it = forwards.keySet().iterator(); it.hasNext();) {
+            String prefix = (String) it.next();
+            if(path.startsWith(prefix)) {
+                forward = (ForwardData) forwards.get(prefix);
+                path = path.substring(prefix.length());
+            }
+        }
+        if(forward == null) {
+            log.error("Unable to forward URL "+path+"; does not match any known ContextForward definitions.");
+            return;
+        }
+        if(!path.equals("") && !path.startsWith("/")) path = "/"+path;
+        String queryString = req.getQueryString();
+        if (queryString != null) {
+            path += "?" + queryString;
+        }
+        path = forward.getServletPath()+path;
+        RequestDispatcher dispatcher = forward.getForwardContext().getRequestDispatcher(path);
+        dispatcher.forward(req, resp);
+    }
+
+    private static class ForwardData {
+        private ServletContext forwardContext;
+        private String servletPath;
+        private AbstractName gbean;
+
+        public ForwardData(ServletContext forwardContext, String servletPath, AbstractName gbean) {
+            this.forwardContext = forwardContext;
+            this.servletPath = servletPath;
+            this.gbean = gbean;
+        }
+
+        public ServletContext getForwardContext() {
+            return forwardContext;
+        }
+
+        public String getServletPath() {
+            return servletPath;
+        }
+
+        public AbstractName getGbean() {
+            return gbean;
+        }
+    }
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/web.xml?view=diff&rev=474975&r1=474974&r2=474975
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/web.xml Tue Nov 14 12:58:12 2006
@@ -31,6 +31,12 @@
     </servlet>
 
     <servlet>
+        <display-name>Generic Context Forward Servlet</display-name>
+        <servlet-name>context-forward</servlet-name>
+        <servlet-class>org.apache.geronimo.console.servlet.GenericForwardServlet</servlet-class>
+    </servlet>
+
+    <servlet>
         <display-name>DWR Forward Servlet</display-name>
         <servlet-name>dwr-forward</servlet-name>
         <servlet-class>org.apache.geronimo.console.servlet.ContextForwardServlet</servlet-class>
@@ -44,6 +50,7 @@
         </init-param>
     </servlet>
 
+    <!--
     <servlet>
         <display-name>CAR Export Forward Servlet</display-name>
         <servlet-name>car-export-forward</servlet-name>
@@ -85,6 +92,7 @@
            <param-value>/plan-export</param-value>
         </init-param>
     </servlet>
+    -->
 
 <!-- [INSERT FRAGMENT HERE] -->
 
@@ -97,9 +105,14 @@
         <url-pattern>/secure/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
+        <servlet-name>context-forward</servlet-name>
+        <url-pattern>/forwards/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
         <servlet-name>dwr-forward</servlet-name>
         <url-pattern>/dwr/*</url-pattern>
     </servlet-mapping>
+    <!--
     <servlet-mapping>
         <servlet-name>car-export-forward</servlet-name>
         <url-pattern>/car-export</url-pattern>
@@ -112,13 +125,13 @@
         <servlet-name>plan-export-forward</servlet-name>
         <url-pattern>/plan-export</url-pattern>
     </servlet-mapping>
+    -->
 
     <security-constraint>
         <web-resource-collection>
-            <web-resource-name></web-resource-name>
+            <web-resource-name>Login Required</web-resource-name>
             <url-pattern>/dwr/*</url-pattern>
-            <url-pattern>/car-export</url-pattern>
-            <url-pattern>/graphs/*</url-pattern>
+            <url-pattern>/forwards/*</url-pattern>
             <url-pattern>/portal/*</url-pattern>
             <http-method>GET</http-method>
             <http-method>POST</http-method>
@@ -130,7 +143,7 @@
     </security-constraint>
     <security-constraint>
         <web-resource-collection>
-            <web-resource-name></web-resource-name>
+            <web-resource-name>Login and HTTPS Required</web-resource-name>
             <url-pattern>/secure/*</url-pattern>
             <http-method>GET</http-method>
             <http-method>POST</http-method>

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/confirmExport.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/confirmExport.jsp?view=diff&rev=474975&r1=474974&r2=474975
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/confirmExport.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/car/confirmExport.jsp Tue Nov 14 12:58:12 2006
@@ -9,7 +9,7 @@
 <p>Use the button below to save the plugin "${name}" to disk.</p>
 
 <%-- todo: calculate the /console prefix somehow --%>
-<form action="/console/car-export" method="GET">
+<form action="/console/forwards/car-export" method="GET">
     <input type="hidden" name="configId" value="${configId}" />
     <input type="submit" value="Export Plugin" />
 </form>

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp?view=diff&rev=474975&r1=474974&r2=474975
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp Tue Nov 14 12:58:12 2006
@@ -45,7 +45,7 @@
 <p/>
 <div id="<portlet:namespace/>migratedPlan" style="display:inline">
 Migrated plan:
-<form method="POST" action="/console/plan-export">
+<form method="POST" action="/console/forwards/plan-export">
     <textarea name="migratedPlan" rows=10 cols=80><c:out escapeXml="true" value="${migratedPlan}"/></textarea>
     <br/>
     <button onclick="<portlet:namespace/>toggleDisplay('originalPlan');<portlet:namespace/>toggleDisplay('migratedPlan');return false;">Show original plan</button>

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?view=diff&rev=474975&r1=474974&r2=474975
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp Tue Nov 14 12:58:12 2006
@@ -138,6 +138,6 @@
 </script>
 
 <%-- todo: calculate the /console prefix somehow --%>
-<embed src="/console/graphs/memoryGraphSVG.jsp"
+<embed src="/console/forwards/graphs/memoryGraphSVG.jsp"
        width="600" height="450" type="image/svg+xml"
        pluginspage="http://www.adobe.com/svg/viewer/install/" />

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/graphs/memoryGraphSVG.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/graphs/memoryGraphSVG.jsp?view=diff&rev=474975&r1=474974&r2=474975
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/graphs/memoryGraphSVG.jsp (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/graphs/memoryGraphSVG.jsp Tue Nov 14 12:58:12 2006
@@ -5,7 +5,7 @@
      onload="initialize(evt, 480, 300, 'callServer()', 'Server Memory Usage')">
     <script type="text/ecmascript" xlink:href="updatingGraphJS.jsp"/>
     <script type="text/ecmascript" xlink:href="memoryGraphJS.jsp"/>
-    <script type='text/ecmascript' xlink:href='../dwr/interface/Jsr77Stats.js' />
-    <script type='text/ecmascript' xlink:href='../dwr/engine.js' />
-    <script type='text/ecmascript' xlink:href='../dwr/util.js' />
+    <script type='text/ecmascript' xlink:href='../../dwr/interface/Jsr77Stats.js' />
+    <script type='text/ecmascript' xlink:href='../../dwr/engine.js' />
+    <script type='text/ecmascript' xlink:href='../../dwr/util.js' />
 </svg>

Modified: geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml?view=diff&rev=474975&r1=474974&r2=474975
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/src/plan/plan.xml Tue Nov 14 12:58:12 2006
@@ -51,6 +51,21 @@
 
             <context-root>/console</context-root>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
+            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <attribute name="portalPathPrefix">/car-export</attribute>
+                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletServletPath">/car-export</attribute>
+            </gbean>
+            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <attribute name="portalPathPrefix">/graphs</attribute>
+                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletServletPath">/graphs</attribute>
+            </gbean>
+            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <attribute name="portalPathPrefix">/plan-export</attribute>
+                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletServletPath">/plan-export</attribute>
+            </gbean>
         </web-app>
     </module>
 
@@ -108,7 +123,7 @@
                     <name>properties-login</name>
                 </reference>
             </gbean>
-            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">DaffodilDB Embedded</attribute>
                 <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
                 <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
@@ -116,7 +131,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">DaffodilDB Server</attribute>
                 <attribute name="URLPrototype">jdbc:daffodilDB://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">in.co.daffodil.db.rmi.RmiDaffodilDBDriver</attribute>
@@ -124,7 +139,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">DB2</attribute>
                 <attribute name="URLPrototype">jdbc:db2://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.ibm.db2.jcc.DB2Driver</attribute>
@@ -132,7 +147,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">DB2 (DataDirect)</attribute>
                 <attribute name="URLPrototype">jdbc:datadirect:db2://{Host}:{Port};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">com.ddtek.jdbc.db2.DB2Driver</attribute>
@@ -140,7 +155,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Derby embedded</attribute>
                 <attribute name="URLPrototype">jdbc:derby:{Database}</attribute>
                 <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
@@ -148,7 +163,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Derby network</attribute>
                 <attribute name="URLPrototype">jdbc:derby://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
@@ -156,7 +171,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Derby embedded XA</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -164,7 +179,7 @@
                 <attribute name="XA">true</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-derby-embed-xa//rar</attribute>
             </gbean>
-            <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Derby network XA</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -172,7 +187,7 @@
                 <attribute name="XA">true</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-derby-client-xa//rar</attribute>
             </gbean>
-            <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">FrontBase</attribute>
                 <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
@@ -180,7 +195,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">HSQLDB embedded</attribute>
                 <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
                 <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
@@ -188,7 +203,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">HSQLDB server</attribute>
                 <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
@@ -196,7 +211,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Informix</attribute>
                 <attribute name="URLPrototype">jdbc:informix-sqli://{Host}:{Port}/{Database}:informixserver={dbservername}</attribute>
                 <attribute name="driverClassName">com.informix.jdbc.IfxDriver</attribute>
@@ -204,7 +219,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Informix (DataDirect)</attribute>
                 <attribute name="URLPrototype">jdbc:datadirect:informix://{Host}:{Port};informixServer={dbservername};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">com.ddtek.jdbc.informix.InformixDriver</attribute>
@@ -212,7 +227,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">InterSystems Cache</attribute>
                 <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
                 <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
@@ -220,7 +235,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">JDataStore</attribute>
                 <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
                 <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
@@ -228,7 +243,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">JDBC/ODBC Bridge</attribute>
                 <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
                 <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
@@ -236,7 +251,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">McKoi embedded</attribute>
                 <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
                 <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
@@ -244,7 +259,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">McKoi server</attribute>
                 <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
                 <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
@@ -252,7 +267,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Mimer</attribute>
                 <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
@@ -260,7 +275,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">MySQL</attribute>
                 <attribute name="URLPrototype">jdbc:mysql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.mysql.jdbc.Driver</attribute>
@@ -268,7 +283,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Oracle Thin</attribute>
                 <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
                 <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
@@ -276,7 +291,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Oracle OCI</attribute>
                 <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
                 <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
@@ -284,7 +299,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Oracle (DataDirect)</attribute>
                 <attribute name="URLPrototype">jdbc:datadirect:oracle://{Host}:{Port};ServiceName={SID}</attribute>
                 <attribute name="driverClassName">com.ddtek.jdbc.oracle.OracleDriver</attribute>
@@ -292,7 +307,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Pervasive</attribute>
                 <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
@@ -300,7 +315,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Pointbase server</attribute>
                 <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
@@ -308,7 +323,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">PostgreSQL</attribute>
                 <attribute name="URLPrototype">jdbc:postgresql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.postgresql.Driver</attribute>
@@ -316,7 +331,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Progress</attribute>
                 <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
                 <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
@@ -324,7 +339,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">MaxDB</attribute>
                 <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
@@ -332,7 +347,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">SQL Server</attribute>
                 <attribute name="URLPrototype">jdbc:microsoft:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">com.microsoft.jdbc.sqlserver.SQLServerDriver</attribute>
@@ -340,7 +355,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">SQL Server (jTDS)</attribute>
                 <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">net.sourceforge.jtds.jdbc.Driver</attribute>
@@ -348,7 +363,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">SQL Server (DataDirect)</attribute>
                 <attribute name="URLPrototype">jdbc:datadirect:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">com.ddtek.jdbc.sqlserver.SQLServerDriver</attribute>
@@ -356,7 +371,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Sybase ASE</attribute>
                 <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
@@ -364,7 +379,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Sybase ASA</attribute>
                 <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
@@ -372,7 +387,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Sybase (DataDirect)</attribute>
                 <attribute name="URLPrototype">jdbc:datadirect:sybase://{Host}:{Port};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">com.ddtek.jdbc.sybase.SybaseDriver</attribute>
@@ -380,7 +395,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Other</attribute>
                 <attribute name="URLPrototype"></attribute>
                 <attribute name="driverClassName"></attribute>
@@ -391,18 +406,17 @@
         </web-app>
     </module>
 
-    <security>
-        <default-principal realm-name="geronimo-properties-realm">
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-1.1">
+        <default-principal>
             <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
         </default-principal>
         <role-mappings>
             <role role-name="admin">
-                <realm realm-name="geronimo-properties-realm">
-                    <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" designated-run-as="true"/>
-                </realm>
+                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" designated-run-as="true"/>
             </role>
         </role-mappings>
     </security>
+    
 
     <!-- Console specific server info -->
     <!--<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">-->
@@ -415,7 +429,7 @@
     <!--</gbean>-->
 
     <!-- Keystore configuration -->
-    <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">
+    <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
         <attribute name="keyStoreType">PKCS12</attribute>
         <attribute name="keyStorePassword">password</attribute>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml?view=diff&rev=474975&r1=474974&r2=474975
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml Tue Nov 14 12:58:12 2006
@@ -52,6 +52,21 @@
             <context-root>/console</context-root>
             <cross-context/>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
+            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <attribute name="portalPathPrefix">/car-export</attribute>
+                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletServletPath">/car-export</attribute>
+            </gbean>
+            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <attribute name="portalPathPrefix">/graphs</attribute>
+                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletServletPath">/graphs</attribute>
+            </gbean>
+            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <attribute name="portalPathPrefix">/plan-export</attribute>
+                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletServletPath">/plan-export</attribute>
+            </gbean>
         </web-app>
     </module>
 
@@ -110,7 +125,7 @@
                     <name>properties-login</name>
                 </reference>
             </gbean>
-            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">DaffodilDB Embedded</attribute>
                 <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
                 <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
@@ -118,7 +133,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">DaffodilDB Server</attribute>
                 <attribute name="URLPrototype">jdbc:daffodilDB://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">in.co.daffodil.db.rmi.RmiDaffodilDBDriver</attribute>
@@ -126,7 +141,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">DB2</attribute>
                 <attribute name="URLPrototype">jdbc:db2://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.ibm.db2.jcc.DB2Driver</attribute>
@@ -134,7 +149,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">DB2 (DataDirect)</attribute>
                 <attribute name="URLPrototype">jdbc:datadirect:db2://{Host}:{Port};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">com.ddtek.jdbc.db2.DB2Driver</attribute>
@@ -142,7 +157,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Derby embedded</attribute>
                 <attribute name="URLPrototype">jdbc:derby:{Database}</attribute>
                 <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
@@ -150,7 +165,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Derby network</attribute>
                 <attribute name="URLPrototype">jdbc:derby://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
@@ -158,7 +173,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Derby embedded XA</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -166,7 +181,7 @@
                 <attribute name="XA">true</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-derby-embed-xa//rar</attribute>
             </gbean>
-            <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Derby network XA</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -174,7 +189,7 @@
                 <attribute name="XA">true</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-derby-client-xa//rar</attribute>
             </gbean>
-            <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">FrontBase</attribute>
                 <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
@@ -182,7 +197,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">HSQLDB embedded</attribute>
                 <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
                 <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
@@ -190,7 +205,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">HSQLDB server</attribute>
                 <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
@@ -198,7 +213,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Informix</attribute>
                 <attribute name="URLPrototype">jdbc:informix-sqli://{Host}:{Port}/{Database}:informixserver={dbservername}</attribute>
                 <attribute name="driverClassName">com.informix.jdbc.IfxDriver</attribute>
@@ -206,7 +221,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Informix (DataDirect)</attribute>
                 <attribute name="URLPrototype">jdbc:datadirect:informix://{Host}:{Port};informixServer={dbservername};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">com.ddtek.jdbc.informix.InformixDriver</attribute>
@@ -214,7 +229,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">InterSystems Cache</attribute>
                 <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
                 <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
@@ -222,7 +237,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">JDataStore</attribute>
                 <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
                 <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
@@ -230,7 +245,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">JDBC/ODBC Bridge</attribute>
                 <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
                 <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
@@ -238,7 +253,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">McKoi embedded</attribute>
                 <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
                 <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
@@ -246,7 +261,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">McKoi server</attribute>
                 <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
                 <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
@@ -254,7 +269,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Mimer</attribute>
                 <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
@@ -262,7 +277,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">MySQL</attribute>
                 <attribute name="URLPrototype">jdbc:mysql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.mysql.jdbc.Driver</attribute>
@@ -270,7 +285,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Oracle Thin</attribute>
                 <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
                 <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
@@ -278,7 +293,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Oracle OCI</attribute>
                 <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
                 <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
@@ -286,7 +301,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Oracle (DataDirect)</attribute>
                 <attribute name="URLPrototype">jdbc:datadirect:oracle://{Host}:{Port};ServiceName={SID}</attribute>
                 <attribute name="driverClassName">com.ddtek.jdbc.oracle.OracleDriver</attribute>
@@ -294,7 +309,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Pervasive</attribute>
                 <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
@@ -302,7 +317,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Pointbase server</attribute>
                 <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
@@ -310,7 +325,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">PostgreSQL</attribute>
                 <attribute name="URLPrototype">jdbc:postgresql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.postgresql.Driver</attribute>
@@ -318,7 +333,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Progress</attribute>
                 <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
                 <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
@@ -326,7 +341,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">MaxDB</attribute>
                 <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
@@ -334,7 +349,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">SQL Server</attribute>
                 <attribute name="URLPrototype">jdbc:microsoft:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">com.microsoft.jdbc.sqlserver.SQLServerDriver</attribute>
@@ -342,7 +357,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">SQL Server (jTDS)</attribute>
                 <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">net.sourceforge.jtds.jdbc.Driver</attribute>
@@ -350,7 +365,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">SQL Server (DataDirect)</attribute>
                 <attribute name="URLPrototype">jdbc:datadirect:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">com.ddtek.jdbc.sqlserver.SQLServerDriver</attribute>
@@ -358,7 +373,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Sybase ASE</attribute>
                 <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
@@ -366,7 +381,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Sybase ASA</attribute>
                 <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
@@ -374,7 +389,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Sybase (DataDirect)</attribute>
                 <attribute name="URLPrototype">jdbc:datadirect:sybase://{Host}:{Port};DatabaseName={Database}</attribute>
                 <attribute name="driverClassName">com.ddtek.jdbc.sybase.SybaseDriver</attribute>
@@ -382,7 +397,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <attribute name="name">Other</attribute>
                 <attribute name="URLPrototype"></attribute>
                 <attribute name="driverClassName"></attribute>
@@ -393,23 +408,20 @@
         </web-app>
     </module>
 
-    <security>
-    	<default-principal realm-name="geronimo-properties-realm">
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-1.1">
+    	<default-principal>
     		<principal
     			class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
     			name="system" />
     	</default-principal>
     	<role-mappings>
     		<role role-name="admin">
-    			<realm realm-name="geronimo-properties-realm">
     				<principal
     					class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
     					name="admin" designated-run-as="true" />
-    			</realm>
     		</role>
     	</role-mappings>
     </security>
-
     <!-- Console specific server info -->
     <!--<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">-->
         <!--<reference name="ServerInfo">-->
@@ -421,7 +433,7 @@
     <!--</gbean>-->
 
     <!-- Keystore configuration -->
-    <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">
+    <gbean name="KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>
         <attribute name="keyStoreType">PKCS12</attribute>
         <attribute name="keyStorePassword">password</attribute>



Mime
View raw message