Index: applications/remote-deploy/src/webapp/index.jsp =================================================================== --- applications/remote-deploy/src/webapp/index.jsp (revision 0) +++ applications/remote-deploy/src/webapp/index.jsp (revision 0) @@ -0,0 +1,56 @@ +<%-- + Copyright 2005 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--%> + + +<%@ page session="false" %> + + + + Apache Geronimo + + + + + + + + + + +
+ + + + + + + + + +
 
  
+
+ +
+ +
+
+
+ +

This is the remote deploy application used by the command-line deploy tool to upload files to remote servers

+ + + + Index: applications/remote-deploy/src/webapp/main.css =================================================================== --- applications/remote-deploy/src/webapp/main.css (revision 0) +++ applications/remote-deploy/src/webapp/main.css (revision 0) @@ -0,0 +1,518 @@ +body +{ + /*background-color: #FFFFFF;*/ +} + +.BrightTitle +{ + color: #FFFFFF; + background-color: #5FA3D6; + font-size: 11px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; +} + +.BrightTitle a:hover +{ + color: #5FA3D6; +} + +.BrightBox +{ + border: thin solid #5FA3D6; +} + +td +{ + font-size: 11px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; +} + +th +{ + font-size: 12px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; +} + +a:link, a:visited +{ + color: #204486; +} + +a:hover +{ + /*color: #5FA3D6;*/ + color: #CF820A; +} + +.Logo +{ + background-image:url("images/head_left_754x86.gif"); + background-repeat: no-repeat; + width: 570px; + height: 86px; + font-size: 35px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + text-align: right; + vertical-align: bottom; + line-height: 30px; + font-weight: bold; +} + +.GeronimoLogo +{ + background-image:url("images/logo_head_570x86.gif"); + background-repeat: no-repeat; + width: 570px; + height: 86px; + font-size: 35px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + text-align: right; + vertical-align: bottom; + line-height: 30px; + font-weight: bold; +} + +.LoginLogo +{ + background-image:url("images/head_left_login_586x86.gif"); + background-repeat: no-repeat; + width: 570px; + height: 86px; + font-size: 35px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + text-align: right; + vertical-align: bottom; + line-height: 30px; + font-weight: bold; +} + +.WelcomeLogo +{ + background-image:url("images/welcome_head_570x86.gif"); + background-repeat: no-repeat; + width: 570px; + height: 86px; + font-size: 35px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + text-align: right; + vertical-align: bottom; + line-height: 30px; + font-weight: bold; +} + +.Top +{ + background-image:url("images/head_bgstretch_1x86.gif"); + background-repeat: repeat-x; + height: 86px; + font-size: 11px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + text-align: right; + vertical-align: bottom; + font-weight: bold; +} + +.Top a:link, .Top a:visited, .Top a:hover +{ + color: #FFFFFF; + font-size: 11px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + text-decoration: underline; + text-align: left; + vertical-align: bottom; + line-height: 30px; + font-weight: bold; +} + +.TopSpacer +{ + height: 20px; +} + +.Hidden +{ + visibility: hidden; + height: 0px; + line-height: 0px; + display: none; +} + +.Menu .Selection +{ + background-color: #F2F2F2; + font-size: 12px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; +} + +.Menu .Selection .CollapsedLeft +{ + width: 12px; + height: 12px; + color: #000000; + background-color: #F2F2F2; +} + +.Menu .Selection .Indent +{ + width: 2px; + background-color: #F2F2F2; +} + +.Menu .Selection .CollapsedRight +{ + width: 8px; + height: 12px; + background-color: #F2F2F2; +} + +.Menu .Selection .TopLeft +{ + width: 8px; + height: 16px; + background-color: #F2F2F2; +} + +.Menu .Selection .TopMiddle +{ + color: #000000; + text-decoration: none; + background-color: #F2F2F2; +} + +.Menu .Selection .TopMiddle a:link, +.Menu .Selection .TopMiddle a:visited, +{ + color: #000000; + line-height: 20px; + font-size: 12px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + background-color: #F2F2F2; +} + +.Menu .Selection .TopMiddle a:hover +{ + color: #5FA3D6; +} + +.Menu .Selection .TopRight +{ + width: 8px; + height: 16px; + background-color: #F2F2F2; +} + +.Menu .Selection .Spacer +{ + height: 5px; +} + +.Menu .Hidden +{ + visibility: hidden; + height: 0px; + display: none; +} + +.Menu .Subselection .Left +{ + width: 12px; + background-color: #F2F2F2; +} + +.Menu .Subselection .Indent +{ + width: 2px; + background-color: #F2F2F2; +} + +.Menu .Subselection .Middle +{ + font-size: 12px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + background-color: #F2F2F2; + color:#000000; +} + +.Menu .Subselection .Middle a:link, +.Menu .Subselection .Middle a:visited, +{ + line-height: 20px; + color: #000000; +} + +.Menu .Subselection .Middle a:hover +{ + color: #5FA3D6; +} + +.Menu .Subselection .Right +{ + width: 8px; + background-color: #F2F2F2; +} + +.Menu .Subselection .BottomLeft +{ + width: 8px; + height: 8px; + background-color: #F2F2F2; +} + +.Menu .Subselection .BottomMiddle +{ + height: 8px; + background-color: #F2F2F2; +} + +.Menu .Subselection .BottomRight +{ + width: 8px; + height: 8px; + background-color: #F2F2F2; +} + +.Gutter +{ + width: 5px; +} + +.Content .TopLeft +{ + width: 18px; + height: 18px; + line-height: 18px; + background-color: #000000; +} + +.Content .Title +{ + font-size: 12px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + background-color: #000000; + color: #FFFFFF; + height: 18px; + line-height: 18px; +} + +.Content .Title a:link, .Content .Title a:hover, .Content .Title a:visited +{ + font-size: 12px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + background-color: #000000; + color: #FFFFFF; + height: 18px; + line-height: 18px; +} + +.Content .Title .Indent +{ + width: 20px; +} + +.Content .TopRight +{ + width: 18px; + height: 18px; + background-color:#000000; +} + +.Content .CollapsedLeft +{ + width: 18px; + height: 18px; + background-color:#000000; +} + +.Content .CollapsedRight +{ + width: 18px; + height: 18px; + background-color:#000000; +} + +.Content .Left +{ + width: 18px; + background-color: #FFFFFF; +} + +.Content .Body, .Content .Body td +{ + font-size: 12px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + background-color: #FFFFFF; + color: #1E1E52; +} + +.Content .Body strong +{ + font-weight: bold; + font-size: 12px; +} + +.Content .Body th +{ + font-weight: bold; + font-size: 12px; +} + +.Content .Body .LightBackground +{ + background-color: #FFFFFF; + color:#000000; +} + +.Content .Body .LightBackground .InputField +{ + width: 150px; +} + +.Content .Body .MediumBackground +{ + background-color: #F2F2F2; + color:#000000; +} + +.Content .Body .DarkBackground, +.Content .Body .DarkBackground a:link, +.Content .Body .DarkBackground a:visited, +.Content .Body .DarkBackground a:hover +{ + background-color: #2581C7; + color:#FFFFFF; + font-size: 15px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; +} + +.Content .Body .reallyDarkBackground, +.Content .ReallyDarkBackground, +.ReallyDarkBackground +{ + color: #FFFFFF; + background-color: #000000; + font-size: 15px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; +} + +.Content .Body .IndentedTitle +{ + background-color: #919FBC; + color:#FFFFFF; +} + +.Content .Body .LightIndentedBG +{ + background-color: #FFFFFF; + color:#000000; +} + +.Content .Body .MediumIndentedBG +{ + background-color: #DDDDDD; + color:#000000; +} + + +.Content .Body a:link, +.Content .Body a:visited, +{ + font-size: 10px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + text-decoration: underline; + color: #546BC7; + font-weight: bold; +} + +.Content .Body a:hover +{ + color: #5FA3D6; +} + +.Content .Buttons { + border-top-width: thin; + border-right-width: thin; + border-bottom-width: thin; + border-left-width: thin; + border-top-style: solid; + border-right-style: solid; + border-bottom-style: solid; + border-left-style: solid; + border-top-color: #7B7BAE; + border-right-color: #7B7BAE; + border-bottom-color: #141336; + border-left-color: #141336; + background-color: #23224C; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + font-size: 12px; + text-decoration: underline; + color: #5FA3D6; +} + +.Content .Right +{ + width: 18px; + background-color: #FFFFFF; +} + +.Content .BottomLeft +{ + width: 18px; + height: 12px; + line-height: 12px; + background-color:#333366; +} + +.Content .Footer +{ + line-height: 12px; + height: 12px; + font-size: 9px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + background-color:#333366; + color:#000000; +} + +.Content .Footer a:link, +.Content .Footer a:visited, +.Content .Footer a:hover +{ + color: #5FA3D6; +} + +.Content .BottomRight +{ + width: 18px; + line-height: 12px; + height: 12px; + background-color:#333366; +} + +.Content .Spacer +{ + height: 10px; +} + +.BottomSpacer +{ +} + +.Footer +{ + font-size: 9px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + height: 20px; + background-color: #5FA3D6; +} + +.Footer a:link, +.Footer a:visited, +.Footer a:hover +{ + color: #5FA3D6; + text-decoration: underline; +} + +.Box +{ + border: thin solid #000000; +} Index: applications/remote-deploy/src/webapp/WEB-INF/web.xml =================================================================== --- applications/remote-deploy/src/webapp/WEB-INF/web.xml (revision 399523) +++ applications/remote-deploy/src/webapp/WEB-INF/web.xml (working copy) @@ -25,11 +25,6 @@ - 404-error - / - - - file-upload /upload Index: applications/welcome/project.xml =================================================================== --- applications/welcome/project.xml (revision 399523) +++ applications/welcome/project.xml (working copy) @@ -32,6 +32,56 @@ + + + org.apache.geronimo.specs + geronimo-servlet_2.4_spec + ${geronimo_spec_servlet_version} + + + + commons-logging + commons-logging + ${commons_logging_version} + + + + geronimo + geronimo-kernel + ${geronimo_version} + + + + geronimo + geronimo-naming + ${geronimo_version} + + + + geronimo + geronimo-management + ${geronimo_version} + + + + geronimo + geronimo-system + ${geronimo_version} + + + + mx4j + mx4j + ${mx4j_version} + + + + mx4j + mx4j-remote + ${mx4j_version} + + + + +<%@ page session="false" %> + + + + Apache Geronimo + + + + + + + + + + +
+ + + + + + + + + +
 
  
+
+ +
+ +
+
+
+ +

<%= request.getAttribute("MESSAGE") %>

+ + + + Index: applications/welcome/src/webapp/images/head_about_51x86.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: applications\welcome\src\webapp\images\head_about_51x86.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: applications/welcome/src/webapp/images/head_left_login_586x86.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: applications\welcome\src\webapp\images\head_left_login_586x86.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: applications/welcome/src/webapp/images/login_lock_64x55.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: applications\welcome\src\webapp\images\login_lock_64x55.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: applications/welcome/src/webapp/images/logo_head_570x86.gif =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: applications\welcome\src\webapp\images\logo_head_570x86.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: applications/welcome/src/webapp/index.jsp =================================================================== --- applications/welcome/src/webapp/index.jsp (revision 399523) +++ applications/welcome/src/webapp/index.jsp (working copy) @@ -16,6 +16,7 @@ <%@ page session="false" %> + @@ -25,6 +26,8 @@ +<% boolean jetty = application.getServerInfo().toLowerCase().indexOf("jetty") > -1; %> + @@ -94,9 +97,15 @@ @@ -111,7 +120,7 @@ Apache Geronimo™ successfully. Congratulations!

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 + and you don't think you should be, then 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 Geronimo Documentation.

@@ -138,7 +147,6 @@ <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 deploy MyWebApp.war
Index: applications/welcome/src/webapp/login.jsp =================================================================== --- applications/welcome/src/webapp/login.jsp (revision 0) +++ applications/welcome/src/webapp/login.jsp (revision 0) @@ -0,0 +1,150 @@ + + +Geronimo Console Login + + + + +<% String configId = request.getParameter("sampleConfigId"); %> + + + + + + <%-- Top table is the banner --%> +
- Servlet Examples
- JSP Examples
- LDAP Demo
+ <% if(jetty) { %> + Servlet Examples
+ JSP Examples
+ LDAP Demo
+ <% } else { %> + Servlet Examples
+ JSP Examples
+ LDAP Demo
+ <% } %> Additional Samples
+ + + + + + + + + + + + + +
  + +
  
  
+ + <%-- Main body --%> + + + + + + + + +
  + + + + +
+ + + + + + + + + + + + + + +
 Log in to the Geronimo Console
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      
Username:  
Password:  
     
Choose a remote repository to inspect for available Geronimo plugins. The repository must have a geronimo-plugins.xml file in the root directory listing the available plugins in the repository. You can also download running configurations from another Geronimo server just as if you're browsing and installing third-party plugins. If you want to point to a remote Geronimo server, enter a URL such as http://geronimo-server:8080/console-standard/maven-repo/ and the enter the administrator username and password in the optional authentication fields.
 Repository:  
 Repository Username:  
 Repository Password:  
      
  
      
+
This example is not currently installed. Please login to install it. +
The default userid is system and the default password is manager +
+
+ 		 
+ + + Index: applications/welcome/src/webapp/login_success.jsp =================================================================== --- applications/welcome/src/webapp/login_success.jsp (revision 0) +++ applications/welcome/src/webapp/login_success.jsp (revision 0) @@ -0,0 +1,6 @@ + +Login Successful + +Login Successfull. Click here to return to the portal tests. + + \ No newline at end of file Index: applications/welcome/src/webapp/loginerror.jsp =================================================================== --- applications/welcome/src/webapp/loginerror.jsp (revision 0) +++ applications/welcome/src/webapp/loginerror.jsp (revision 0) @@ -0,0 +1,141 @@ + + +Geronimo Console Login + + + + + + +
+ <%-- Top table is the banner --%> + + + + + + + + + + + + + + +
  + +
  
  
+ + <%-- Main body --%> + + + + + + +
  + + + + +
+ + + + + + + + + + + + + + + + + +
 Log In to the Geronimo Console
Invalid Username and/or Password!
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      
Username:  
Password:  
     
  
      
+
Welcome to the Geronimo™ Console
+ + + + + + + + + + + + + + + + + +
  GERONIMO™ is a Java-certified, production-grade platform designed to allow developers to rapidly deploy and manage their applications. The result is an integrated, highly functional application platform that leverages the latest innovations from the open source community and simplifies application deployment and maintenance.  
   
  Geronimo™ has integrated the following components:
+   •  Application server (Apache Geronimo)
+   •  Web server and servlet engine (Tomcat)
+   •  Web server and servlet engine (Jetty)
+   •  JSP compiler (Jasper)
+   •  Relational database (Apache Derby)
+   •  Messaging (ActiveMQ)
+   •  User management services
+   •  Centralized administration console
+ 		 
+
+
+ + 		 
+
+ + + Index: applications/welcome/src/webapp/main.css =================================================================== --- applications/welcome/src/webapp/main.css (revision 399523) +++ applications/welcome/src/webapp/main.css (working copy) @@ -58,6 +58,20 @@ font-weight: bold; } +.GeronimoLogo +{ + background-image:url("images/logo_head_570x86.gif"); + background-repeat: no-repeat; + width: 570px; + height: 86px; + font-size: 35px; + font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif; + text-align: right; + vertical-align: bottom; + line-height: 30px; + font-weight: bold; +} + .LoginLogo { background-image:url("images/head_left_login_586x86.gif"); Index: applications/welcome/src/webapp/WEB-INF/web.xml =================================================================== --- applications/welcome/src/webapp/WEB-INF/web.xml (revision 399523) +++ applications/welcome/src/webapp/WEB-INF/web.xml (working copy) @@ -10,4 +10,38 @@ Welcome to Geronimo + + serveSamples + org.apache.geronimo.welcome.ServeSamplesServlet + + + + serveSamples + /serveSamples + + + + + + /serveSamples/* + GET + POST + PUT + + + admin + + + + FORM + geronimo-properties-realm + + /login.jsp + /loginerror.jsp + + + + admin + + Index: configs/welcome-jetty/src/plan/plan.xml =================================================================== --- configs/welcome-jetty/src/plan/plan.xml (revision 399523) +++ configs/welcome-jetty/src/plan/plan.xml (working copy) @@ -24,4 +24,18 @@ / false + geronimo-properties-realm + + + + + + + + + + + + + Index: configs/welcome-tomcat/src/plan/plan.xml =================================================================== --- configs/welcome-tomcat/src/plan/plan.xml (revision 399523) +++ configs/welcome-tomcat/src/plan/plan.xml (working copy) @@ -24,4 +24,18 @@ / false + geronimo-properties-realm + + + + + + + + + + + + +