geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r355727 - in /geronimo/branches/1.0/applications: console-framework/src/webapp/images/ console-standard/src/webapp/WEB-INF/view/welcome/ welcome/src/webapp/ welcome/src/webapp/images/
Date Sat, 10 Dec 2005 09:20:10 GMT
Author: ammulder
Date: Sat Dec 10 01:20:07 2005
New Revision: 355727

URL: http://svn.apache.org/viewcvs?rev=355727&view=rev
Log:
Merge welcome page changes from HEAD

Added:
    geronimo/branches/1.0/applications/console-framework/src/webapp/images/powered_by_100x30.gif
  (with props)
    geronimo/branches/1.0/applications/welcome/src/webapp/images/powered_by_100x30.gif   (with
props)
Modified:
    geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
    geronimo/branches/1.0/applications/welcome/src/webapp/index.jsp

Added: geronimo/branches/1.0/applications/console-framework/src/webapp/images/powered_by_100x30.gif
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-framework/src/webapp/images/powered_by_100x30.gif?rev=355727&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/branches/1.0/applications/console-framework/src/webapp/images/powered_by_100x30.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=355727&r1=355726&r2=355727&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
(original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
Sat Dec 10 01:20:07 2005
@@ -11,13 +11,20 @@
         <td width="90%" align="left" valign="top">
             <p><font face="Verdana" size="+1"><center><b>Welcome
to the Apache Geronimo&#8482;<BR>Administration Console!</b></center></font></p>
 
-            <p>The administration console provides a convenient, user friendly way
to administer many aspects of the Geronimo Server.  It is currently a work in progress, and
will continue to evolve over time.  The navigation panel on the lefthand side of the screen
provides easy access to the individual tasks.  It is always present and allows easy transition
from task to task.</p>
+            <p>The administration console provides a convenient, user friendly way
to administer many aspects of the
+                Geronimo Server.  It is currently a work in progress, and will continue to
evolve over time.  The
+                navigation panel on the left-hand side of the screen provides easy access
to the individual tasks
+                available in the console.</p>
+
+            <p>This space is the main content area where the real work happens.  Each
view contains one or more
+                portlets (self contained view fragments) that typically include a link for
help in the header.  Look
+                at the top of this portlet for an example and try it out.</p>
 
-            <p>This space is the main content area where the real work happens.  Each
view contains one or more portlets (self contained view fragments) that typically include
a link for help in the header.  Look at the top of this portlet for an example and try it
out.</p>
+            <p>The references on the right are provided so that you can learn more
about Apache Geronimo, its
+                capabilities, and what might be coming in future releases.</p>
 
-            <p>The references on the right are provided so that you can learn more
about Apache Geronimo, its capabilities, and what might be coming in future releases.</p>
-
-            <p>Mailing lists are available to get involved in the development of Apache
Geronimo or to ask questions of the community:</p>
+            <p>Mailing lists are available to get involved in the development of Apache
Geronimo or to ask questions
+                of the community:</p>
 
            <ul>
                <li><b><a href="mailto:user-subscribe@geronimo.apache.org">user@geronimo.apache.org</a></b>
@@ -30,7 +37,7 @@
 
             <p>So share your experiences with us and let us know how we can make Geronimo
even better.</p>
 
-            <p><CENTER><B>Thanks for using Geronimo!</B></CENTER></p>
+            <p style="text-align: center"><b>Thanks for using Geronimo!</b></p>
 
 
         </td>
@@ -43,7 +50,7 @@
             <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1"><i>Common Console Actions</i></font>
+                        <font face="Verdana" size="+1">Common Console Actions</font>
                     </td>
                 </tr>
                 <tr>
@@ -67,7 +74,7 @@
             <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1"><i>Geronimo Online</i></font>
+                        <font face="Verdana" size="+1">Geronimo Online</font>
                     </td>
                 </tr>
                 <tr>
@@ -89,7 +96,7 @@
             <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1"><i>Geronimo Documentation</i>&nbsp;&nbsp;&nbsp;</font>
+                        <font face="Verdana" size="+1">Geronimo Documentation&nbsp;&nbsp;&nbsp;</font>
                     </td>
                 </tr>
                 <tr>
@@ -98,7 +105,7 @@
                         <a href="http://geronimo.apache.org/faq.html">FAQ</a><br
/>
                         <a href="http://wiki.apache.org/geronimo">Wiki</a><br
/>
                         <a href="http://geronimo.apache.org/documentation.html">Geronimo
Documentation</a><br />
-                        <a href="http://opensource2.atlassian.com/confluence/oss/display/GERONIMO/Home">Additional
Documentation</a><br />
+<%--                        <a href="http://opensource2.atlassian.com/confluence/oss/display/GERONIMO/Home">Additional
Documentation</a><br />--%>
                         &nbsp;<br />
                     </td>
                 </tr>
@@ -108,9 +115,7 @@
             <br />
 
             <p align="right"><font size=-1>
-<!--   Bring this line in and add the powered by icon when available
-            <img src="/console/images/ico_geronimo_16x16.gif"/>
--->
+            <img src="/console/images/powered_by_100x30.gif"/>
             </font><br />
             &nbsp;
             <font size=-1>Copyright &copy; 1999-2005 Apache Software Foundation</font><br
/>

Added: geronimo/branches/1.0/applications/welcome/src/webapp/images/powered_by_100x30.gif
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/welcome/src/webapp/images/powered_by_100x30.gif?rev=355727&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/branches/1.0/applications/welcome/src/webapp/images/powered_by_100x30.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: geronimo/branches/1.0/applications/welcome/src/webapp/index.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/welcome/src/webapp/index.jsp?rev=355727&r1=355726&r2=355727&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/welcome/src/webapp/index.jsp (original)
+++ geronimo/branches/1.0/applications/welcome/src/webapp/index.jsp Sat Dec 10 01:20:07 2005
@@ -53,7 +53,7 @@
             <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
                 <tr>
                     <td bgcolor="#5FA3D6" bordercolor="#000000" align="left" nowrap>
-                        <font face="Verdana" size="+1"><i>Documentation</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
+                        <font face="Verdana" size="+1">Documentation&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
                     </td>
                 </tr>
                 <tr>
@@ -61,16 +61,16 @@
                         <a href="http://geronimo.apache.org/faq.html">FAQ</a><br
/>
                         <a href="http://wiki.apache.org/geronimo">Wiki</a><br
/>
                         <a href="http://geronimo.apache.org/documentation.html">Geronimo
Documentation</a><br />
-                        <a href="http://opensource2.atlassian.com/confluence/oss/display/GERONIMO/Home">Additional
Documentation</a><br />
+<%--                        <a href="http://opensource2.atlassian.com/confluence/oss/display/GERONIMO/Home">Additional
Documentation</a><br />--%>
                         &nbsp;
                     </td>
                 </tr>
             </table>
             <br />
             <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
-                <tr>                                
+                <tr>
                     <td bgcolor="#5FA3D6" bordercolor="#000000" align="left" nowrap>
-                        <font face="Verdana" size="+1"><i>Geronimo Online</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
+                        <font face="Verdana" size="+1">Geronimo Online&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
                     </td>
                 </tr>
                 <tr>
@@ -84,24 +84,24 @@
                     </td>
                 </tr>
             </table>
-            
+
             <br />
             <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
-                <tr>                                
+                <tr>
                     <td bgcolor="#5FA3D6" bordercolor="#000000" align="left" nowrap>
-                        <font face="Verdana" size="+1"><i>Geronimo Examples</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
+                        <font face="Verdana" size="+1">Geronimo Examples&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" bordercolor="#000000" nowrap>
                         <a href="/servlets-examples/">Servlet Examples </a><br
/>
                         <a href="/jsp-examples/">JSP Examples </a><br />
-                        <a href="http://opensource2.atlassian.com/confluence/oss/display/GERONIMO/Samples+for+Apache+Geronimo">Download
Additional Examples</a><br />
+<%--                        <a href="http://opensource2.atlassian.com/confluence/oss/display/GERONIMO/Samples+for+Apache+Geronimo">Download
Additional Examples</a><br />--%>
                         &nbsp;
-                        
+
                     </td>
                 </tr>
-            </table>  
+            </table>
         </td>
 
         <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
@@ -111,7 +111,38 @@
             <p><center><b>If you're seeing this page via a web browser,
it means you've setup<br />
             Apache Geronimo&#8482; successfully. Congratulations!</b></center></p>
 
-            <p>As you may have guessed by now, this is the default home page for Geronimo.
If you're seeing this page, and you don't think you should be, then either you're either a
user who has arrived at new installation of Geronimo, or you're an administrator who hasn't
got his/her setup quite right. Providing the latter is the case, please refer to the <a
href="http://geronimo.apache.org/documentation.html">Geronimo Documentation</a> for
more detailed setup and administration information.</p>
+            <p>As you may have guessed by now, this is the default home page for Geronimo.
If you're seeing this page,
+                and you don't think you should be, then either you're either a user who has
arrived at new installation
+                of Geronimo, or you're an administrator who hasn't got his/her setup quite
right.  If you need help
+                setting up or administering Geronimo, see the
+                <a href="http://geronimo.apache.org/documentation.html">Geronimo Documentation</a>.</p>
+
+            <p>If you'd like to get started configuring Geronimo and the applications
and services available
+              in Geronimo, you might want to start with the Geronimo
+              <a href="/console">Admin Console</a> (if this is your first time
using Geronimo, the admin username
+              is probably "system" with password "manager", though if you used the installer
you got to choose
+              your own during the installation).</p>
+
+            <div style="margin-left: 50px; margin-right: 50px; padding: 10px; background-color:#eee">
+                <p><b>Would you like your application to appear at this URL?</b><br
/>
+                To set the context root for a web application, you can write a Geronimo deployment
+                plan that uses the <tt>context-root</tt> element to specify the
URL prefix used to
+                reach that application.  If you specify a context root of <tt>/</tt>
then the
+                application will appear at this URL.  However, you'll need to stop this small
+                Welcome application first!</p>
+                <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;
+    &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 with a command
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
+java -jar bin/deployer.jar deploy MyWebApp.war</pre>
+            </div>
 
             <p>Geronimo mailing lists are available at the Geronimo project web site:</p>
 
@@ -123,6 +154,7 @@
             <p>Thanks for using Geronimo!</p>
 
             <p align="right"><font size=-1>
+            <img src="<%=request.getContextPath()%>/images/powered_by_100x30.gif"/>
 <!--   Bring this line in and add the powered by icon when available
             <img src="<%=request.getContextPath()%>/images/ico_geronimo_16x16.gif"/>
 -->
@@ -139,4 +171,4 @@
 </table>
 
 </body>
-<ohtml>
+</html>



Mime
View raw message