You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2006/08/06 03:50:36 UTC
svn commit: r429090 - in /geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view: dbwizard/showPlan.jsp jmswizard/plan.jsp realmwizard/showPlan.jsp

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 @@
 </ol>
 <pre>
 &lt;application
-   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-   configId="MyApplication"&gt;
+   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"&gt;
+  &lt;environment&gt;
+    &lt;moduleId&gt;
+      &lt;artifactId&gt;MyApplication&lt;/artifactId&gt;
+    &lt;/moduleId&gt;
+  &lt;/environment&gt;
   &lt;module&gt;
     &lt;connector&gt;rar-file-name.rar&lt;/connector&gt;
     &lt;alt-dd&gt;plan-file-name.xml&lt;/alt-dd&gt;

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 @@
 </ol>
 <pre>
 &lt;application
-   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-   configId="MyApplication"&gt;
+   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"&gt;
+    &lt;environment&gt;
+      &lt;moduleId&gt;
+        &lt;artifactId&gt;MyApplication&lt;/artifactId&gt;
+      &lt;/moduleId&gt;
+    &lt;/environment&gt;
   &lt;module&gt;
     &lt;connector&gt;rar-file-name.rar&lt;/connector&gt;
     &lt;alt-dd&gt;plan-file-name.xml&lt;/alt-dd&gt;

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:
 <pre>
 &lt;application
-   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
-   configId="MyApplication"&gt;
+   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"&gt;
+  &lt;environment&gt;
+    &lt;moduleId&gt;
+      &lt;artifactId&gt;MyApplication&lt;/artifactId&gt;
+    &lt;/moduleId&gt;
+    &lt;dependencies&gt;
+       &lt;dependency&gt;
+         ...
+       &lt;/dependency&gt;
+    &lt;/dependencies&gt;
+  &lt;/environment&gt;
 
   &lt;gbean name="${realm.name}"
     class="org.apache.geronimo.security.realm.GenericSecurityRealm"&gt;