Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 23134 invoked from network); 25 May 2006 03:43:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 May 2006 03:43:52 -0000 Received: (qmail 16271 invoked by uid 500); 25 May 2006 03:43:51 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 16243 invoked by uid 500); 25 May 2006 03:43:51 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 16232 invoked by uid 99); 25 May 2006 03:43:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 May 2006 20:43:51 -0700 X-ASF-Spam-Status: No, hits=0.6 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 May 2006 20:43:50 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 5D5E21A983E; Wed, 24 May 2006 20:43:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r409296 - in /geronimo/trunk/applications: console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp welcome/src/webapp/index.jsp Date: Thu, 25 May 2006 03:43:29 -0000 To: scm@geronimo.apache.org From: ammulder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060525034330.5D5E21A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ammulder Date: Wed May 24 20:43:29 2006 New Revision: 409296 URL: http://svn.apache.org/viewvc?rev=409296&view=rev Log: Merge fix for GERONIMO-2061 to trunk Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp geronimo/trunk/applications/welcome/src/webapp/index.jsp Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp?rev=409296&r1=409295&r2=409296&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp (original) +++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp Wed May 24 20:43:29 2006 @@ -51,13 +51,18 @@ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"> <environment> - <configId> - <artifactId>MyWebApp</artifactId> - </configId> + <moduleId> + <artifactId>MyWebApp</artifactId> + </moduleId> + <dependencies> + <dependency> + <groupId>${pool.abstractNameMap['groupId']}</groupId> + <artifactId>${pool.abstractNameMap['artifactId']}</artifactId> + </dependency> + </dependencies> </environment> <context-root>/MyWebApp</context-root> - <context-priority-classloader>true</context-priority-classloader> <!-- security settings, if any, go here --> @@ -80,13 +85,18 @@ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"> <environment> - <configId> - <artifactId>MyWebApp</artifactId> - </configId> + <moduleId> + <artifactId>MyWebApp</artifactId> + </moduleId> + <dependencies> + <dependency> + <groupId>${pool.abstractNameMap['groupId']}</groupId> + <artifactId>${pool.abstractNameMap['artifactId']}</artifactId> + </dependency> + </dependencies> </environment> <context-root>/MyWebApp</context-root> - <context-priority-classloader>true</context-priority-classloader> <!-- security settings, if any, go here --> Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp?rev=409296&r1=409295&r2=409296&view=diff ============================================================================== --- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp (original) +++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp Wed May 24 20:43:29 2006 @@ -66,12 +66,14 @@ 
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
-    configId="MyConfigName">
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+    <environment>
+        <moduleId>
+            <artifactId>MyWebApp</artifactId>
+        </moduleId>
+    </environment>
 
     <context-root>/MyWebApp</context-root>
-    <context-priority-classloader>true</context-priority-classloader>
 
     <security-realm-name>${realm.name}</security-realm-name>
     <security>

Modified: geronimo/trunk/applications/welcome/src/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/welcome/src/webapp/index.jsp?rev=409296&r1=409295&r2=409296&view=diff
==============================================================================
--- geronimo/trunk/applications/welcome/src/webapp/index.jsp (original)
+++ geronimo/trunk/applications/welcome/src/webapp/index.jsp Wed May 24 20:43:29 2006
@@ -132,14 +132,17 @@
                 
Your web deployment plan should look like this, and you can either pack it into
                 the WAR at WEB-INF/geronimo-web.xml or provide it as a separate argument
                 to the deploy tool.

-
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
-         configId="MyApplication">
+
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+    <environment>
+        <moduleId>
+            <artifactId>MyApplication</artifactId>
+        </moduleId>
+    </environment>
     <context-root>/</context-root>
-    <context-priority-classloader>false</context-priority-classloader>
 </web-app>

                 
Then you can stop this application and deploy yours from the Admin Console or from the command line with a sequence of commands like this:

                 <% boolean jetty = application.getServerInfo().toLowerCase().indexOf("jetty") > -1; %>
-
java -jar bin/deployer.jar stop geronimo/welcome-<% if(jetty) {%>jetty<%} else {%>tomcat<%}%>/1.0/car
+
java -jar bin/deployer.jar stop welcome-<% if(jetty) {%>jetty<%} else {%>tomcat<%}%>
 java -jar bin/deployer.jar deploy MyWebApp.war

             
 
@@ -151,7 +154,7 @@
            
 
             
Thanks for using Geronimo!

-
+