Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 89516 invoked from network); 6 Aug 2006 01:51:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Aug 2006 01:51:07 -0000 Received: (qmail 61127 invoked by uid 500); 6 Aug 2006 01:51:06 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 61102 invoked by uid 500); 6 Aug 2006 01:51:06 -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 61091 invoked by uid 99); 6 Aug 2006 01:51:06 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Aug 2006 18:51:06 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,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; Sat, 05 Aug 2006 18:51:03 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 674CE1A981A; Sat, 5 Aug 2006 18:50:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r429090 - in /geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view: dbwizard/showPlan.jsp jmswizard/plan.jsp realmwizard/showPlan.jsp Date: Sun, 06 Aug 2006 01:50:36 -0000 To: scm@geronimo.apache.org From: ammulder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060806015037.674CE1A981A@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: Sat Aug 5 18:50:36 2006 New Revision: 429090 URL: http://svn.apache.org/viewvc?rev=429090&view=rev Log: Merge GERONIMO-2285 to trunk Modified: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp Modified: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp?rev=429090&r1=429089&r2=429090&view=diff ============================================================================== --- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp (original) +++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp Sat Aug 5 18:50:36 2006 @@ -73,8 +73,12 @@ 
 <application
-   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-   configId="MyApplication">
+   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+  <environment>
+    <moduleId>
+      <artifactId>MyApplication</artifactId>
+    </moduleId>
+  </environment>
   <module>
     <connector>rar-file-name.rar</connector>
     <alt-dd>plan-file-name.xml</alt-dd>

Modified: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp?rev=429090&r1=429089&r2=429090&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp (original)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/plan.jsp Sat Aug  5 18:50:36 2006
@@ -84,8 +84,12 @@
 
 
 <application
-   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-   configId="MyApplication">
+   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+    <environment>
+      <moduleId>
+        <artifactId>MyApplication</artifactId>
+      </moduleId>
+    </environment>
   <module>
     <connector>rar-file-name.rar</connector>
     <alt-dd>plan-file-name.xml</alt-dd>

Modified: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp?rev=429090&r1=429089&r2=429090&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp (original)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp Sat Aug  5 18:50:36 2006
@@ -86,8 +86,17 @@
           something like this:
 
 <application
-   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-   configId="MyApplication">
+   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+  <environment>
+    <moduleId>
+      <artifactId>MyApplication</artifactId>
+    </moduleId>
+    <dependencies>
+       <dependency>
+         ...
+       </dependency>
+    </dependencies>
+  </environment>
 
   <gbean name="${realm.name}"
     class="org.apache.geronimo.security.realm.GenericSecurityRealm">