geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r372304 - in /geronimo/branches/1.0/applications/console-standard/src: java/org/apache/geronimo/console/databasemanager/wizard/ webapp/WEB-INF/view/dbwizard/ webapp/WEB-INF/view/jmswizard/ webapp/WEB-INF/view/realmwizard/
Date Wed, 25 Jan 2006 20:14:49 GMT
Author: ammulder
Date: Wed Jan 25 12:14:44 2006
New Revision: 372304

URL: http://svn.apache.org/viewcvs?rev=372304&view=rev
Log:
Update namespaces, remove parentIds, and improve RAR file paths
  for the DB & security realm portlets (GERONIMO-1450)

Modified:
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=372304&r1=372303&r2=372304&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Wed Jan 25 12:14:44 2006
@@ -629,7 +629,7 @@
             } else if(mode.equals(TEST_CONNECTION_MODE)) {
                 renderTestConnection(renderRequest, renderResponse);
             } else if(mode.equals(SHOW_PLAN_MODE)) {
-                renderPlan(renderRequest, renderResponse);
+                renderPlan(renderRequest, renderResponse, data);
             } else if(mode.equals(IMPORT_START_MODE)) {
                 renderImportUploadForm(renderRequest, renderResponse);
             } else if(mode.equals(IMPORT_STATUS_MODE)) {
@@ -776,9 +776,23 @@
         testConnectionView.include(renderRequest, renderResponse);
     }
 
-    private void renderPlan(RenderRequest renderRequest, RenderResponse renderResponse) throws
IOException, PortletException {
+    private void renderPlan(RenderRequest renderRequest, RenderResponse renderResponse, PoolData
data) throws IOException, PortletException {
         // Pass on results
         renderRequest.setAttribute("deploymentPlan", renderRequest.getPortletSession().getAttribute("deploymentPlan"));
+        // Digest the RAR URI
+        String path = PortletManager.getRepositoryEntry(renderRequest, data.getRarPath()).getPath();
+        String base = PortletManager.getServerInfo(renderRequest).getCurrentBaseDirectory();
+        if(base != null && path.startsWith(base)) {
+            path = path.substring(base.length());
+            if(path.startsWith("/")) {
+                path = path.substring(1);
+            }
+        } else {
+            int pos = path.lastIndexOf('/');
+            path = path.substring(pos+1);
+        }
+        renderRequest.setAttribute("rarRelativePath", path);
+
         planView.include(renderRequest, renderResponse);
     }
 

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp?rev=372304&r1=372303&r2=372304&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
Wed Jan 25 12:14:44 2006
@@ -53,7 +53,7 @@
 <pre>
 cd GERONIMO_HOME
 java -jar bin/deployer.jar deploy plan-file.xml \
-        ${pool.rarPath}
+        ${rarRelativePath}
 </pre></td>
       </tr>
     <!-- STATUS FIELD: Embed in EAR guidance -->
@@ -65,7 +65,7 @@
 <ol>
   <li>Copy and paste the plan to a file</li>
   <li>Save the plan file to the top level of your EAR</li>
-  <li>Copy the RAR file from <tt>GERONIMO_HOME/repository/${pool.rarPath}</tt>
+  <li>Copy the RAR file from <tt>GERONIMO_HOME/${rarRelativePath}</tt>
     to the top level of your EAR</li>
   <li>Create a <tt>META-INF/geronimo-application.xml</tt> file in your
EAR
     that has a <tt>module</tt> entry like this (substituting the correct
@@ -76,7 +76,7 @@
    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
    configId="MyApplication"&gt;
   &lt;module&gt;
-    &lt;connector&gt;rar-file-name&lt;/connector&gt;
+    &lt;connector&gt;rar-file-name.rar&lt;/connector&gt;
     &lt;alt-dd&gt;plan-file-name.xml&lt;/alt-dd&gt;
   &lt;/module&gt;
 &lt;/application&gt;

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp?rev=372304&r1=372303&r2=372304&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp
Wed Jan 25 12:14:44 2006
@@ -48,10 +48,9 @@
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
-    configId="MyConfigName"
-    parentId="org/apache/geronimo/Server"&gt;
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
+    configId="MyConfigName"&gt;
 
     &lt;context-root&gt;/MyWebApp&lt;/context-root&gt;
     &lt;context-priority-classloader&gt;true&lt;/context-priority-classloader&gt;
@@ -75,10 +74,9 @@
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
-    configId="MyConfigName"
-    parentId="org/apache/geronimo/Server"&gt;
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
+    configId="MyConfigName"&gt;
 
     &lt;context-root&gt;/MyWebApp&lt;/context-root&gt;
     &lt;context-priority-classloader&gt;true&lt;/context-priority-classloader&gt;

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp?rev=372304&r1=372303&r2=372304&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp
Wed Jan 25 12:14:44 2006
@@ -87,7 +87,7 @@
    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
    configId="MyApplication"&gt;
   &lt;module&gt;
-    &lt;connector&gt;rar-file-name&lt;/connector&gt;
+    &lt;connector&gt;rar-file-name.rar&lt;/connector&gt;
     &lt;alt-dd&gt;plan-file-name.xml&lt;/alt-dd&gt;
   &lt;/module&gt;
 &lt;/application&gt;

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp?rev=372304&r1=372303&r2=372304&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
Wed Jan 25 12:14:44 2006
@@ -66,10 +66,9 @@
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
-    configId="MyConfigName"
-    parentId="geronimo/j2ee-server/1.0/car"&gt;
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
+    configId="MyConfigName"&gt;
 
     &lt;context-root&gt;/MyWebApp&lt;/context-root&gt;
     &lt;context-priority-classloader&gt;true&lt;/context-priority-classloader&gt;



Mime
View raw message