geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r469724 - in /geronimo/server/branches/1.1: applications/console-core/src/java/org/apache/geronimo/console/gbean/ applications/console-framework/ applications/console-framework/src/java/org/apache/geronimo/console/servlet/ applications/cons...
Date Wed, 01 Nov 2006 00:56:27 GMT
Author: ammulder
Date: Tue Oct 31 16:56:26 2006
New Revision: 469724

URL: http://svn.apache.org/viewvc?view=rev&rev=469724
Log:
Now any module can add forwards to the console at runtime.  This is
  useful for adding new portlets at runtime where those portlets
  include images or other static content.  GERONIMO-2478

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

Added: geronimo/server/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/gbean/ContextForward.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/gbean/ContextForward.java?view=auto&rev=469724
==============================================================================
--- geronimo/server/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/gbean/ContextForward.java (added)
+++ geronimo/server/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/gbean/ContextForward.java Tue Oct 31 16:56:26 2006
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.console.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: 410741 $ $Date: 2006-06-01 00:35:48 -0400 (Thu, 01 Jun 2006) $
+ */
+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/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/gbean/ContextForward.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java?view=auto&rev=469724
==============================================================================
--- geronimo/server/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java (added)
+++ geronimo/server/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java Tue Oct 31 16:56:26 2006
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.console.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: 410741 $ $Date: 2006-06-01 00:35:48 -0400 (Thu, 01 Jun 2006) $
+ */
+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/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/gbean/ContextForwardGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/branches/1.1/applications/console-framework/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-framework/project.xml?view=diff&rev=469724&r1=469723&r2=469724
==============================================================================
--- geronimo/server/branches/1.1/applications/console-framework/project.xml (original)
+++ geronimo/server/branches/1.1/applications/console-framework/project.xml Tue Oct 31 16:56:26 2006
@@ -7,7 +7,22 @@
     <name>Geronimo :: Console :: Portal Framework</name>
 
     <dependencies>
-    <!-- JARs needed to compile JSPs -->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-console-core</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.currentVersion}</version>
+        </dependency>
+         <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+            <version>${mx4j_version}</version>
+        </dependency>
+   <!-- JARs needed to compile JSPs -->
         <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>

Added: geronimo/server/branches/1.1/applications/console-framework/src/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-framework/src/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java?view=auto&rev=469724
==============================================================================
--- geronimo/server/branches/1.1/applications/console-framework/src/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java (added)
+++ geronimo/server/branches/1.1/applications/console-framework/src/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java Tue Oct 31 16:56:26 2006
@@ -0,0 +1,175 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.console.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/branches/1.1/applications/console-framework/src/java/org/apache/geronimo/console/servlet/GenericForwardServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/branches/1.1/applications/console-framework/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-framework/src/webapp/WEB-INF/web.xml?view=diff&rev=469724&r1=469723&r2=469724
==============================================================================
--- geronimo/server/branches/1.1/applications/console-framework/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/branches/1.1/applications/console-framework/src/webapp/WEB-INF/web.xml Tue Oct 31 16:56:26 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,7 +92,7 @@
            <param-value>/plan-export</param-value>
         </init-param>
     </servlet>
-
+-->
     <servlet-mapping>
         <servlet-name>se-console</servlet-name>
         <url-pattern>/portal/*</url-pattern>
@@ -95,9 +102,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>
@@ -110,13 +122,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>
@@ -128,7 +140,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/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/confirmExport.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/confirmExport.jsp?view=diff&rev=469724&r1=469723&r2=469724
==============================================================================
--- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/confirmExport.jsp (original)
+++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/car/confirmExport.jsp Tue Oct 31 16:56:26 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/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp?view=diff&rev=469724&r1=469723&r2=469724
==============================================================================
--- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp (original)
+++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp Tue Oct 31 16:56:26 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/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?view=diff&rev=469724&r1=469723&r2=469724
==============================================================================
--- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp (original)
+++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp Tue Oct 31 16:56:26 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/branches/1.1/applications/console-standard/src/webapp/graphs/memoryGraphSVG.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/graphs/memoryGraphSVG.jsp?view=diff&rev=469724&r1=469723&r2=469724
==============================================================================
--- geronimo/server/branches/1.1/applications/console-standard/src/webapp/graphs/memoryGraphSVG.jsp (original)
+++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/graphs/memoryGraphSVG.jsp Tue Oct 31 16:56:26 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/branches/1.1/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/configs/console-jetty/src/plan/plan.xml?view=diff&rev=469724&r1=469723&r2=469724
==============================================================================
--- geronimo/server/branches/1.1/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/server/branches/1.1/configs/console-jetty/src/plan/plan.xml Tue Oct 31 16:56:26 2006
@@ -25,6 +25,21 @@
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
             <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>
 
@@ -33,7 +48,7 @@
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
             <context-root>/console-standard</context-root>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
-            <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>
@@ -41,7 +56,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -49,7 +64,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -57,7 +72,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -65,7 +80,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -73,7 +88,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -81,7 +96,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -89,7 +104,7 @@
                 <attribute name="XA">true</attribute>
                 <attribute name="RARName">tranql/tranql-connector-derby-embed-xa/${tranql_vendors_version}/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>
@@ -97,7 +112,7 @@
                 <attribute name="XA">true</attribute>
                 <attribute name="RARName">tranql/tranql-connector-derby-client-xa/${tranql_vendors_version}/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>
@@ -105,7 +120,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -113,7 +128,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -121,7 +136,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -129,7 +144,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -137,7 +152,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -145,7 +160,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -153,7 +168,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -161,7 +176,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -169,7 +184,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -177,7 +192,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -185,7 +200,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -193,7 +208,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -201,7 +216,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -209,7 +224,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -217,7 +232,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -225,7 +240,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -233,7 +248,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -241,7 +256,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -249,7 +264,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -257,7 +272,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -265,7 +280,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -273,7 +288,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -281,7 +296,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -289,7 +304,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -297,7 +312,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -305,7 +320,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -316,21 +331,19 @@
         </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">
+    <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <reference name="ServerInfo">
             <name>ServerInfo</name>
         </reference>
@@ -340,7 +353,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">jks</attribute>
         <attribute name="keyStoreProvider">SUN</attribute>

Modified: geronimo/server/branches/1.1/configs/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/configs/console-tomcat/src/plan/plan.xml?view=diff&rev=469724&r1=469723&r2=469724
==============================================================================
--- geronimo/server/branches/1.1/configs/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/branches/1.1/configs/console-tomcat/src/plan/plan.xml Tue Oct 31 16:56:26 2006
@@ -26,6 +26,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>
 
@@ -35,7 +50,7 @@
             <context-root>/console-standard</context-root>
             <cross-context/>
             <security-realm-name>geronimo-properties-realm</security-realm-name>
-            <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>
@@ -43,7 +58,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -51,7 +66,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -59,7 +74,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -67,7 +82,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -75,7 +90,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -83,7 +98,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -91,7 +106,7 @@
                 <attribute name="XA">true</attribute>
                 <attribute name="RARName">tranql/tranql-connector-derby-embed-xa/${tranql_vendors_version}/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>
@@ -99,7 +114,7 @@
                 <attribute name="XA">true</attribute>
                 <attribute name="RARName">tranql/tranql-connector-derby-client-xa/${tranql_vendors_version}/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>
@@ -107,7 +122,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -115,7 +130,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -123,7 +138,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -131,7 +146,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -139,7 +154,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -147,7 +162,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -155,7 +170,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -163,7 +178,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -171,7 +186,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -179,7 +194,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -187,7 +202,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -195,7 +210,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -203,7 +218,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -211,7 +226,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -219,7 +234,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -227,7 +242,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -235,7 +250,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -243,7 +258,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -251,7 +266,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -259,7 +274,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -267,7 +282,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -275,7 +290,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -283,7 +298,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -291,7 +306,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -299,7 +314,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -307,7 +322,7 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">tranql/tranql-connector/${tranql_connector_version}/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>
@@ -318,25 +333,23 @@
         </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">
+    <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
         <reference name="ServerInfo">
             <name>ServerInfo</name>
         </reference>
@@ -346,7 +359,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">jks</attribute>
         <attribute name="keyStoreProvider">SUN</attribute>



Mime
View raw message