geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r409295 - in /geronimo/branches/1.1/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:42:21 GMT
Author: ammulder
Date: Wed May 24 20:42:20 2006
New Revision: 409295

URL: http://svn.apache.org/viewvc?rev=409295&view=rev
Log:
Update application sample plans to 1.1 syntax (GERONIMO-2061)

Modified:
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp
    geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
    geronimo/branches/1.1/applications/welcome/src/webapp/index.jsp

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp?rev=409295&r1=409294&r2=409295&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/dbwizard/usage.jsp
Wed May 24 20:42:20 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>
+            <b>&lt;dependency&gt;
+                &lt;groupId&gt;${pool.abstractNameMap['groupId']}&lt;/groupId&gt;
+                &lt;artifactId&gt;${pool.abstractNameMap['artifactId']}&lt;/artifactId&gt;
+            &lt;/dependency&gt;</b>
+        &lt;/dependencies&gt;
     &lt;/environment&gt;
 
     &lt;context-root&gt;/MyWebApp&lt;/context-root&gt;
-    &lt;context-priority-classloader&gt;true&lt;/context-priority-classloader&gt;
 
     &lt;!-- security settings, if any, go here --&gt;
 
@@ -80,13 +85,18 @@
 &lt;web-app
     xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"&gt;
     &lt;environment&gt;
-      &lt;configId&gt;
-        &lt;artifactId&gt;MyWebApp&lt;/artifactId&gt;
-      &lt;/configId&gt;
+        &lt;moduleId&gt;
+            &lt;artifactId&gt;MyWebApp&lt;/artifactId&gt;
+        &lt;/moduleId&gt;
+        &lt;dependencies&gt;
+            <b>&lt;dependency&gt;
+                &lt;groupId&gt;${pool.abstractNameMap['groupId']}&lt;/groupId&gt;
+                &lt;artifactId&gt;${pool.abstractNameMap['artifactId']}&lt;/artifactId&gt;
+            &lt;/dependency&gt;</b>
+        &lt;/dependencies&gt;
     &lt;/environment&gt;
 
     &lt;context-root&gt;/MyWebApp&lt;/context-root&gt;
-    &lt;context-priority-classloader&gt;true&lt;/context-priority-classloader&gt;
 
     &lt;!-- security settings, if any, go here --&gt;
 

Modified: geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp?rev=409295&r1=409294&r2=409295&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/realmwizard/usage.jsp
Wed May 24 20:42:20 2006
@@ -66,12 +66,14 @@
 <pre>
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;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"&gt;
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"&gt;
+    &lt;environment&gt;
+        &lt;moduleId&gt;
+            &lt;artifactId&gt;MyWebApp&lt;/artifactId&gt;
+        &lt;/moduleId&gt;
+    &lt;/environment&gt;
 
     &lt;context-root&gt;/MyWebApp&lt;/context-root&gt;
-    &lt;context-priority-classloader&gt;true&lt;/context-priority-classloader&gt;
 
     &lt;security-realm-name&gt;<b>${realm.name}</b>&lt;/security-realm-name&gt;
     &lt;security&gt;

Modified: geronimo/branches/1.1/applications/welcome/src/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/welcome/src/webapp/index.jsp?rev=409295&r1=409294&r2=409295&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/welcome/src/webapp/index.jsp (original)
+++ geronimo/branches/1.1/applications/welcome/src/webapp/index.jsp Wed May 24 20:42:20 2006
@@ -132,14 +132,17 @@
                 <p>Your web deployment plan should look like this, and you can either
pack it into
                 the WAR at <tt>WEB-INF/geronimo-web.xml</tt> or provide it as
a separate argument
                 to the deploy tool.</p>
-<pre>&lt;web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
-         configId="MyApplication"&gt;
+<pre>&lt;web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"&gt;
+    &lt;environment&gt;
+        &lt;moduleId&gt;
+            &lt;artifactId&gt;MyApplication&lt;/artifactId&gt;
+        &lt;/moduleId&gt;
+    &lt;/environment&gt;
     &lt;context-root&gt;/&lt;/context-root&gt;
-    &lt;context-priority-classloader&gt;false&lt;/context-priority-classloader&gt;
 &lt;/web-app&gt;</pre>
                 <p>Then you can stop this application and deploy yours from the <a
href="/console">Admin Console</a> or from the command line with a sequence of commands
like this:</p>
                 <% boolean jetty = application.getServerInfo().toLowerCase().indexOf("jetty")
> -1; %>
-<pre>java -jar bin/deployer.jar stop geronimo/welcome-<% if(jetty) {%>jetty<%}
else {%>tomcat<%}%>/1.0/car
+<pre>java -jar bin/deployer.jar stop welcome-<% if(jetty) {%>jetty<%} else
{%>tomcat<%}%>
 java -jar bin/deployer.jar deploy MyWebApp.war</pre>
             </div>
 
@@ -151,7 +154,7 @@
            </ul>
 
             <p>Thanks for using Geronimo!</p>
-
+<!-- Needs to be updated if we want to keep using it
             <div style="margin-left: 50px; margin-right: 50px; padding: 10px; background-color:#eee">
                 <p><b>Would you like a slimmer Geronimo installation?</b><br
/>
                  Geronimo ships with a number of sample applications and demonstration services
@@ -242,7 +245,7 @@
                     </tr>
                 </table>
             </div>
-
+-->
 
             <p align="right"><font size=-1>
             <img src="<%=request.getContextPath()%>/images/powered_by_100x30.gif"/>



Mime
View raw message