geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r548868 [1/2] - in /geronimo/sandbox/portals: ./ geronimo-console-standard/ geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/ geronimo-console-standard/src/main/webapp/ geronimo-console-standard/src/main/webapp/WEB-I...
Date Tue, 19 Jun 2007 22:10:24 GMT
Author: pmcmahan
Date: Tue Jun 19 15:10:23 2007
New Revision: 548868

URL: http://svn.apache.org/viewvc?view=rev&rev=548868
Log:
more console enablement on pluto 1.2.  copied the admin console portlets
from server/trunk and they more or less work after adding them to
pluto-portal's driver config file.  porting the admin console's style sheets,
color schemes, etc has not been looked into yet

Added:
    geronimo/sandbox/portals/geronimo-console-standard/
      - copied from r547039, geronimo/server/trunk/applications/console/geronimo-console-standard/
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/TreeDocIcon.css
      - copied unchanged from r548411, geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/TreeDocIcon.css
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/geronimo-web.xml
      - copied, changed from r547679, geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/favicon.ico
      - copied unchanged from r548386, geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/favicon.ico
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/images/
      - copied from r548386, geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/images/
Removed:
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/tld/
Modified:
    geronimo/sandbox/portals/geronimo-console-standard/pom.xml
    geronimo/sandbox/portals/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/index.jsp
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
    geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/index.html
    geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
    geronimo/sandbox/portals/pluto-testsuite/pom.xml
    geronimo/sandbox/portals/pom.xml

Modified: geronimo/sandbox/portals/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/pom.xml?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/pom.xml (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/pom.xml Tue Jun 19 15:10:23 2007
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.applications.console</groupId>
-        <artifactId>console</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.portals</groupId>
+        <artifactId>portals</artifactId>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-console-standard</artifactId>
-    <name>Geronimo Applications, Console :: Standard Portlets</name>
+    <artifactId>geronimo-manager</artifactId>
+    <name>Geronimo Manager Console Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>
@@ -38,42 +38,42 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-upgrade</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-converter</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-derby</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console-core</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
         
@@ -108,12 +108,6 @@
             <scope>provided</scope>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
         <!-- JMS dependencies -->
         
         <dependency>
@@ -122,33 +116,72 @@
             <scope>provided</scope>
         </dependency>
         
-        <!-- Used to pre compile JSPs -->
         <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
+            <groupId>dwr</groupId>
+            <artifactId>dwr</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
-            <groupId>dwr</groupId>
-            <artifactId>dwr</artifactId>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
     </dependencies>
     
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo.jspc</groupId>
-                <artifactId>jspc-maven-plugin</artifactId>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+  <!-- Build configuration -->
+  <build>
+    <finalName>geronimo-manager</finalName>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+
+
+
+<!--
+
+  The pluto-maven-plugin doesn't retain the xmlns for <web-app> which makes
+  geronimo angry.  so for now we can't use this plugin.  so for now the web.xml
+  has to be updated by hand when a portlet is added/removed from portlet.xml.
+  See GERONIMO-3252 for an idea about a module builder extension in Geronimo
+  that would eliminate the need for updating the web.xml at build time.
+
+  configure maven-war-plugin to use updated web.xml
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+          <resource>
+            <directory>${pom.basedir}</directory>
+            <includes>
+              <include>LICENSE.txt</include>
+              <include>NOTICE.txt</include>
+            </includes>
+            <targetPath>META-INF</targetPath>
+          </resource>
+        </configuration>
+      </plugin>
+
+  bind 'pluto:assemble' goal to 'process-resources' lifecycle
+      <plugin>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>maven-pluto-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>assemble</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+-->
+    </plugins>
+  </build>
     
 </project>

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java Tue Jun 19 15:10:23 2007
@@ -414,6 +414,9 @@
      * it beats hardcoding.
      */
     public static String getConsoleFrameworkServletPath(HttpServletRequest request) {
+        return request.getContextPath();
+/*  With pluto 1.2 the console framework webapp is no longer needed, so the extra
+    logic to compute its servlet path is no longer needed
         String contextPath;
         Object response = request.getAttribute("javax.portlet.response");
         if (response != null && response instanceof RenderResponse) { // request came from a portlet
@@ -425,5 +428,6 @@
             contextPath = request.getContextPath();
         }
         return contextPath;
+*/
     }
 }

Copied: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/geronimo-web.xml (from r547679, geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=548868&p1=geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml&r1=547679&p2=geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/geronimo-web.xml&r2=548868
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jun 19 15:10:23 2007
@@ -18,85 +18,161 @@
 
 <!-- $Rev$ $Date$ -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
+         xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-    <module>
-        <web>framework.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-              <dependencies>
-                <dependency>
-                    <groupId>org.codehaus.castor</groupId>
-                    <artifactId>castor</artifactId>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.pluto</groupId>
-                    <artifactId>pluto-descriptors</artifactId>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.pluto</groupId>
-                    <artifactId>pluto-portal</artifactId>
-                    <type>jar</type>
-                </dependency>
-              </dependencies>
-              <inverse-classloading/>
-            </environment>
-
-            <context-root>/console</context-root>
-            <cross-context/>
-            <security-realm-name>geronimo-admin</security-realm-name>
-            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <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-${geronimoSchemaVersion}">
-                <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-${geronimoSchemaVersion}">
-                <attribute name="portalPathPrefix">/plan-export</attribute>
-                <attribute name="portletContextPath">/console-standard</attribute>
-                <attribute name="portletServletPath">/plan-export</attribute>
-            </gbean>
-        </web-app>
-    </module>
-
-    <module>
-        <web>standard.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-              <dependencies>
-                <dependency>
-                    <groupId>commons-digester</groupId>
-                    <artifactId>commons-digester</artifactId>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>commons-fileupload</groupId>
-                    <artifactId>commons-fileupload</artifactId>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                    <type>jar</type>
-                </dependency>
-                <dependency>
-                    <groupId>dwr</groupId>
-                    <artifactId>dwr</artifactId>
-                    <type>jar</type>
-                </dependency>
-              </dependencies>
-              <inverse-classloading/>
-            </environment>
-
-            <context-root>/console-standard</context-root>
-            <cross-context/>
-            <security-realm-name>geronimo-admin</security-realm-name>
+  <dep:environment>
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.portals</dep:groupId>
+      <dep:artifactId>geronimo-manager</dep:artifactId>
+      <dep:version>1.0-SNAPSHOT</dep:version>
+      <dep:type>war</dep:type>
+    </dep:moduleId>
+    <dep:dependencies>
+
+<!-- this dep picks up all the portlet and JEE apis -->
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.portals</dep:groupId>
+        <dep:artifactId>pluto-container</dep:artifactId>
+        <dep:version>1.0-SNAPSHOT</dep:version>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-converter</dep:artifactId>
+        <dep:type>jar</dep:type>
+      </dep:dependency>
+
+<!--
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-kernel</dep:artifactId>
+        <dep:type>jar</dep:type>
+      </dep:dependency>
+-->
+
+<!-- copied from deps generated by maven-car-plugin for server/trunk/configs/webconsole-tomcat -->
+      <dep:dependency>
+          <dep:groupId>commons-digester</dep:groupId>
+          <dep:artifactId>commons-digester</dep:artifactId>
+          <dep:type>jar</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+          <dep:groupId>commons-fileupload</dep:groupId>
+          <dep:artifactId>commons-fileupload</dep:artifactId>
+          <dep:type>jar</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+          <dep:groupId>commons-io</dep:groupId>
+          <dep:artifactId>commons-io</dep:artifactId>
+          <dep:type>jar</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+          <dep:groupId>dwr</dep:groupId>
+          <dep:artifactId>dwr</dep:artifactId>
+          <dep:type>jar</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>connector-deployer</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>j2ee-corba-yoko</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-upgrade</dep:artifactId>
+        <dep:version>2.0-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+
+<!--  I don't think this one needs to be explicitly declared
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>jasper</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+-->
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-management</dep:artifactId>
+        <dep:version>2.0-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+        <dep:artifactId>geronimo-activemq-management</dep:artifactId>
+        <dep:version>2.0-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.applications.console</dep:groupId>
+        <dep:artifactId>geronimo-console-core</dep:artifactId>
+        <dep:version>2.0-SNAPSHOT</dep:version>
+        <dep:type>jar</dep:type>
+        <dep:import>classes</dep:import>
+      </dep:dependency>
+      <dep:dependency>
+          <dep:groupId>org.apache.geronimo.modules</dep:groupId>
+          <dep:artifactId>geronimo-deploy-jsr88</dep:artifactId>
+          <dep:version>2.0-SNAPSHOT</dep:version>
+          <dep:type>jar</dep:type>
+          <dep:import>classes</dep:import>
+      </dep:dependency>
+
+
+
+
+
+
+
+
+
+
+
+    </dep:dependencies>
+    <dep:hidden-classes>
+       <filter>org.apache.commons.digester</filter>
+    </dep:hidden-classes>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+
+  <context-root>/manager</context-root>
+
+  <container-config>
+    <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
+      <cross-context/>
+    </tomcat>
+  </container-config>
+
+
+
+<!---  TODO:  are these gbeans still needed ?
+  <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+      <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.2">
+      <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.2">
+      <attribute name="portalPathPrefix">/plan-export</attribute>
+      <attribute name="portletContextPath">/console-standard</attribute>
+      <attribute name="portletServletPath">/plan-export</attribute>
+  </gbean>
+-->
+
+<!--
             <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
                 <reference name="ServerInfo">
                     <name>ServerInfo</name>
@@ -105,7 +181,8 @@
                     <name>properties-login</name>
                 </reference>
             </gbean>
-            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+-->
+            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">DaffodilDB Embedded</attribute>
                 <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
                 <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
@@ -113,7 +190,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -121,7 +198,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">DB2</attribute>
                 <attribute name="URLPrototype">jdbc:db2://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.ibm.db2.jcc.DB2Driver</attribute>
@@ -129,7 +206,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -137,7 +214,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Derby embedded</attribute>
                 <attribute name="URLPrototype">jdbc:derby:{Database}</attribute>
                 <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
@@ -145,7 +222,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Derby network</attribute>
                 <attribute name="URLPrototype">jdbc:derby://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
@@ -153,7 +230,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Derby embedded XA</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -161,7 +238,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Derby network XA</attribute>
                 <attribute name="URLPrototype">null</attribute>
                 <attribute name="driverClassName">null</attribute>
@@ -169,7 +246,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">FrontBase</attribute>
                 <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
@@ -177,7 +254,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">HSQLDB embedded</attribute>
                 <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
                 <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
@@ -185,7 +262,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">HSQLDB server</attribute>
                 <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
@@ -193,7 +270,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -201,7 +278,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -209,7 +286,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">InterSystems Cache</attribute>
                 <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
                 <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
@@ -217,7 +294,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">JDataStore</attribute>
                 <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
                 <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
@@ -225,7 +302,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">JDBC/ODBC Bridge</attribute>
                 <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
                 <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
@@ -233,7 +310,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">McKoi embedded</attribute>
                 <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
                 <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
@@ -241,7 +318,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">McKoi server</attribute>
                 <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
                 <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
@@ -249,7 +326,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Mimer</attribute>
                 <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
@@ -257,7 +334,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">MySQL</attribute>
                 <attribute name="URLPrototype">jdbc:mysql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.mysql.jdbc.Driver</attribute>
@@ -265,7 +342,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Oracle Thin</attribute>
                 <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
                 <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
@@ -273,7 +350,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Oracle OCI</attribute>
                 <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
                 <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
@@ -281,7 +358,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -289,7 +366,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Pervasive</attribute>
                 <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
@@ -297,7 +374,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Pointbase server</attribute>
                 <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
@@ -305,7 +382,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">PostgreSQL</attribute>
                 <attribute name="URLPrototype">jdbc:postgresql://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">org.postgresql.Driver</attribute>
@@ -313,7 +390,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Progress</attribute>
                 <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
                 <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
@@ -321,7 +398,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">MaxDB</attribute>
                 <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
                 <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
@@ -329,7 +406,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -337,7 +414,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -345,7 +422,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -353,7 +430,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -361,7 +438,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -369,7 +446,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <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>
@@ -377,7 +454,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" xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="name">Other</attribute>
                 <attribute name="URLPrototype"></attribute>
                 <attribute name="driverClassName"></attribute>
@@ -385,32 +462,8 @@
                 <attribute name="XA">false</attribute>
                 <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
             </gbean>
-        </web-app>
-    </module>
-
-    <security xmlns="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
-        <!--<default-subject>-->
-            <!--<realm>geronimo-admin</realm>-->
-            <!--<id>system</id>-->
-        <!--</default-subject>-->
-    	<role-mappings>
-    		<role role-name="admin">
-    				<principal
-    					class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
-    					name="admin"/>
-    		</role>
-    	</role-mappings>
-    </security>
-    <!-- Console specific server info -->
-    <!--<gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">-->
-        <!--<reference name="ServerInfo">-->
-            <!--<name>ServerInfo</name>-->
-        <!--</reference>-->
-        <!--<reference name="LoginModule">-->
-            <!--<name>properties-login</name>-->
-        <!--</reference>-->
-    <!--</gbean>-->
 
+<!-- TODO: what is this? -->
     <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
 
-</application>
+</web-app>

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/portlet.xml Tue Jun 19 15:10:23 2007
@@ -20,12 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<portlet-app
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    version="1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
-                        http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+<portlet-app version="1.0">
 
      <portlet>
         <description>Initial portlet with Geronimo informat.</description>

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp Tue Jun 19 15:10:23 2007
@@ -16,10 +16,9 @@
 --%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
-<% String dwrForwarderServlet = org.apache.geronimo.console.util.PortletManager.getConsoleFrameworkServletPath(request) + "/../dwr"; %>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/ProgressMonitor.js'></script>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/interface/ProgressMonitor.js'></script>
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/engine.js'></script>
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/util.js'></script>
 
 <script type="text/javascript">
 DWREngine.setErrorHandler(<portlet:namespace/>onError);

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp Tue Jun 19 15:10:23 2007
@@ -16,8 +16,7 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-                 javax.portlet.RenderRequest,org.apache.geronimo.console.classloaderview.ClassLoaderViewPortlet"%>
+<%@ page import="javax.portlet.RenderRequest,org.apache.geronimo.console.classloaderview.ClassLoaderViewPortlet"%>
 <portlet:defineObjects />
 
 <%
@@ -270,11 +269,6 @@
 
 </script>
 
-<%
-                    String consoleFrameworkContext = PortletManager
-                    .getConsoleFrameworkServletPath(request);
-            String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
-%>
 <form name="clform" onSubmit="return getAction()">
 <input type="hidden" name="snNode" value=""/>
 <TABLE cellpadding="1" cellspacing="1" border="1">
@@ -296,7 +290,7 @@
 <div dojoType="TreeToggleOnSelect" selector="selector"
  controller="controller"></div>
 <div dojoType="TreeDocIconExtension" widgetId="iconcontroller"
- templateCssPath="<%= iconCSS %>"></div>
+ templateCssPath="${pageContext.request.contextPath}/TreeDocIcon.css"></div>
 <div dojoType="TreeV3" listeners="controller;selector;iconcontroller"
  widgetId='tree' allowedMulti='false'></div>
 

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp Tue Jun 19 15:10:23 2007
@@ -16,8 +16,7 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-				 javax.portlet.RenderRequest"%>
+<%@ page import="javax.portlet.RenderRequest"%>
 <portlet:defineObjects/>
 
 <%
@@ -186,10 +185,6 @@
 
 </script>
 
-	<% 
-		String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-		String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
-	%>
 <TABLE cellpadding="1" cellspacing="1" border="1">
 <tr><td>
 <b>Search Text:</b> <input type="text" id="searchText" onChange="javascript:textChange()"/>
@@ -204,6 +199,6 @@
 <div dojoType="TreeSelectorV3" widgetId="selector" eventNames="select:nodeSelected"></div>	
 <div dojoType="TreeEmphasizeOnSelect" selector="selector"></div>
 <div dojoType="TreeToggleOnSelect" selector="selector" controller="controller"></div>
-<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= iconCSS %>"></div>
+<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="${pageContext.request.contextPath}/TreeDocIcon.css"></div>
 <div dojoType="TreeV3" listeners="controller;selector;iconcontroller" widgetId='tree' allowedMulti='false'></div>
 

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp Tue Jun 19 15:10:23 2007
@@ -16,16 +16,13 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager" %>
-
-<% String dwrForwarderServlet = PortletManager.getConsoleFrameworkServletPath(request) + "/../dwr"; %>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/Jsr77Stats.js'></script>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
-
 
 <portlet:defineObjects/>
 
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/interface/Jsr77Stats.js'></script>
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/engine.js'></script>
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/util.js'></script>
+
 <table width="100%">
   <tr>
     <td class="DarkBackground" width="100%" colspan="2" align="center">Geronimo</td>
@@ -153,7 +150,6 @@
 <portlet:namespace/>callServer();
 </script>
 
-<%-- todo: calculate the /console prefix somehow --%>
-<embed src="/console/forwards/graphs/memoryGraphSVG.jsp"
+<embed src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/graphs/memoryGraphSVG.jsp")%>'
        width="600" height="450" type="image/svg+xml"
        pluginspage="http://www.adobe.com/svg/viewer/install/" />

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp Tue Jun 19 15:10:23 2007
@@ -18,8 +18,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-                 org.apache.geronimo.console.jmxmanager.JMXManagerHelper" %>
+<%@ page import="org.apache.geronimo.console.jmxmanager.JMXManagerHelper" %>
 <portlet:defineObjects/>
 
 <!------------------------>
@@ -28,8 +27,7 @@
 
 <%
     // JMX icon
-    String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-    String jmxIconURI = consoleFrameworkContext + "/../images/ico_filetree_16x16.gif";
+    String jmxIconURI = renderRequest.getContextPath() + "/images/ico_filetree_16x16.gif";
 %>
 
 <style type="text/css">
@@ -353,10 +351,10 @@
 <!--     DWR Stuff     -->
 <!----------------------->
 
-<% String dwrForwarderServlet = PortletManager.getConsoleFrameworkServletPath(request) + "/../dwr"; %>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/JMXHelper.js'></script>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
+
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/interface/JMXHelper.js'></script>
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/engine.js'></script>
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/util.js'></script>
 
 <script>
 /**

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp Tue Jun 19 15:10:23 2007
@@ -16,8 +16,7 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-                 javax.portlet.RenderRequest"%>
+<%@ page import="javax.portlet.RenderRequest"%>
 <portlet:defineObjects/>
 
 <%
@@ -159,10 +158,6 @@
 
 </script>
 
-        <% 
-                String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-            String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
-        %>
 <TABLE cellpadding="1" cellspacing="1" border="1">
 <tr><td>
 <b>Search Text:</b> <input type="text" id="searchText" onChange="javascript:textChange()"/>
@@ -178,6 +173,6 @@
 <div dojoType="TreeSelectorV3" widgetId="selector"></div>       
 <div dojoType="TreeEmphasizeOnSelect" selector="selector"></div>
 <div dojoType="TreeToggleOnSelect" selector="selector" controller="controller"></div>
-<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= iconCSS %>"></div>
+<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="${pageContext.request.contextPath}/TreeDocIcon.css"></div>
 <div dojoType="TreeV3" listeners="controller;selector;iconcontroller" widgetId='tree' allowedMulti='false'></div>
 

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/index.jsp?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/index.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/keystore/index.jsp Tue Jun 19 15:10:23 2007
@@ -17,7 +17,6 @@
 
 <%-- $Rev$ $Date$ --%>
 
-<%@ page import="org.apache.geronimo.console.util.PortletManager"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
@@ -36,8 +35,6 @@
 current login session.  The <b>Available</b> flag indicates whether that password has
 been saved in order to make the keystore available to other components in the server.</p>
 
-<% String consoleServletPath = PortletManager.getConsoleFrameworkServletPath(request); %>
-
 <table width="100%">
   <tr>
     <td class="DarkBackground">Keystore File</td>
@@ -84,13 +81,13 @@
           <a href="<portlet:actionURL portletMode="view">
             <portlet:param name="mode" value="unlockEdit-before" />
             <portlet:param name="keystore" value="${keystore.name}" />
-            </portlet:actionURL>"><img src="<%=consoleServletPath%>/../images/ico_lock_16x16.gif" alt="Locked" /></a>
+            </portlet:actionURL>"><img src="${pageContext.request.contextPath}/images/ico_lock_16x16.gif" alt="Locked" /></a>
         </c:when>
         <c:otherwise>
           <a href="<portlet:actionURL portletMode="view">
             <portlet:param name="mode" value="lockEdit-before" />
             <portlet:param name="keystore" value="${keystore.name}" />
-            </portlet:actionURL>"><img src="<%=consoleServletPath%>/../images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
+            </portlet:actionURL>"><img src="${pageContext.request.contextPath}/images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
         </c:otherwise>
       </c:choose>
     </td>
@@ -100,13 +97,13 @@
           <a href="<portlet:actionURL portletMode="view">
             <portlet:param name="mode" value="unlockKeystore-before" />
             <portlet:param name="keystore" value="${keystore.name}" />
-            </portlet:actionURL>"><img src="<%=consoleServletPath%>/../images/ico_lock_16x16.gif" alt="Locked" /></a>
+            </portlet:actionURL>"><img src="${pageContext.request.contextPath}/images/ico_lock_16x16.gif" alt="Locked" /></a>
         </c:when>
         <c:otherwise>
           <a href="<portlet:actionURL portletMode="view">
             <portlet:param name="mode" value="lockKeystore-before" />
             <portlet:param name="keystore" value="${keystore.name}" />
-            </portlet:actionURL> "onClick="return confirm('This keystore is currently in use.  Locking it may prevent the server from starting.  Continue?');" ><img src="<%=consoleServletPath%>/../images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
+            </portlet:actionURL> "onClick="return confirm('This keystore is currently in use.  Locking it may prevent the server from starting.  Continue?');" ><img src="${pageContext.request.contextPath}/images/ico_unlock3_16x16.gif" alt="Unlocked" /></a>
             ${keys[keystore.name]}
         </c:otherwise>
       </c:choose>

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp Tue Jun 19 15:10:23 2007
@@ -17,13 +17,11 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page import="org.apache.geronimo.console.util.PortletManager" %>
 <portlet:defineObjects/>
 
 <%
     // LDAP icon
-    String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-    String ldapIconURI = consoleFrameworkContext + "/../images/ico_filetree_16x16.gif";
+    String ldapIconURI = renderRequest.getContextPath() + "/images/ico_filetree_16x16.gif";
 %>
 
 <!-- DOJO Stuff -->
@@ -283,10 +281,9 @@
 </style>
 
 <!-- DWR Stuff -->
-<% String dwrForwarderServlet = PortletManager.getConsoleFrameworkServletPath(request) + "/../dwr"; %>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/LDAPHelper.js'></script>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/interface/LDAPHelper.js'></script>
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/engine.js'></script>
+<script type='text/javascript' src='${pageContext.request.contextPath}/dwr/util.js'></script>
 
 <script>
 /* Sync calls */

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Tue Jun 19 15:10:23 2007
@@ -16,7 +16,6 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager" %>
 <portlet:defineObjects/>
 
 
@@ -72,13 +71,18 @@
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
-	                    <% String consoleServletPath = PortletManager.getConsoleFrameworkServletPath(request); %>
-                        <img src="<%=consoleServletPath%>/../images/ico_db_16x16.gif" /><a href="<%=consoleServletPath%>/services/services_jdbc">Database Pools</a><br />
-                        <img src="<%=consoleServletPath%>/../images/ico_lock_16x16.gif" /><a href="<%=consoleServletPath%>/Security/Security_realms">Security Realms</a><br />
-                        <img src="<%=consoleServletPath%>/../images/ico_beanjar_16x16.gif" /><a href="<%=consoleServletPath%>/services/services_jms">JMS Resources</a><br />
-                        <img src="<%=consoleServletPath%>/../images/ico_list_16x16.gif" /><a href="<%=consoleServletPath%>/apps/apps_all">Deploy Applications</a><br />
-                        <img src="<%=consoleServletPath%>/../images/ico_servcomp_16x16.gif" /><a href="<%=consoleServletPath%>/server/server_web">Web Server Ports</a><br />
-                        <img src="<%=consoleServletPath%>/../images/ico_look_16x16.gif" /><a href="<%=consoleServletPath%>/server/server_info">Memory &amp; Uptime</a><br />
+                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_db_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/DBWizard">Database Pools</a><br />
+
+                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_lock_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/RealmWizard">Security Realms</a><br />
+
+                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_beanjar_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/JMSServerManager">JMS Resources</a><br />
+
+                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_list_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/Deployment">Deploy Applications</a><br />
+
+                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_servcomp_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/WebServerManager">Web Server Ports</a><br />
+
+                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_look_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/ServerInfo">Server Information</a>
+
                         &nbsp;<br />
                     </td>
                 </tr>



Mime
View raw message