Index: applications/welcome/project.xml =================================================================== --- applications/welcome/project.xml (revision 399866) +++ 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} + + + + Index: applications/welcome/src/java/org/apache/geronimo/welcome/InstallSamplesServlet.java =================================================================== --- applications/welcome/src/java/org/apache/geronimo/welcome/InstallSamplesServlet.java (revision 0) +++ applications/welcome/src/java/org/apache/geronimo/welcome/InstallSamplesServlet.java (revision 0) @@ -0,0 +1,325 @@ +/** + * + * 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. + */ +package org.apache.geronimo.welcome; + + +import java.io.File; +import java.io.InputStream; +import java.io.FileOutputStream; +import java.io.ObjectOutputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.net.URL; +import java.util.List; +import java.util.ListIterator; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; +import javax.naming.InitialContext; +import javax.security.auth.login.FailedLoginException; +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.apache.geronimo.gbean.AbstractName; +import org.apache.geronimo.gbean.AbstractNameQuery; +import org.apache.geronimo.kernel.GBeanNotFoundException; +import org.apache.geronimo.kernel.Kernel; +import org.apache.geronimo.kernel.KernelRegistry; +import org.apache.geronimo.kernel.config.Configuration; +import org.apache.geronimo.kernel.config.ConfigurationInfo; +import org.apache.geronimo.kernel.config.ConfigurationManager; +import org.apache.geronimo.kernel.config.ConfigurationModuleType; +import org.apache.geronimo.kernel.config.ConfigurationStore; +import org.apache.geronimo.kernel.config.ConfigurationUtil; +import org.apache.geronimo.kernel.repository.Artifact; +import org.apache.geronimo.management.geronimo.J2EEApplication; +import org.apache.geronimo.management.geronimo.J2EEDomain; +import org.apache.geronimo.management.geronimo.J2EEServer; +import org.apache.geronimo.management.geronimo.WebModule; +import org.apache.geronimo.system.plugin.PluginList; +import org.apache.geronimo.system.plugin.PluginInstaller; +import org.apache.geronimo.system.plugin.DownloadResults; + +/** + * Servlet that redirects to a sample app if it exists + * or gives the option of downloading the app as a plugin. + * + */ +public class InstallSamplesServlet extends HttpServlet { + private final static Log log = LogFactory.getLog(InstallSamplesServlet.class); + + private Kernel kernel = null; + private RequestDispatcher rd = null; + private ConfigurationManager configurationManager = null; + private PluginInstaller pluginInstaller = null; + private String moduleType = "war"; + private String hostname = "localhost"; + private final String msg = "MESSAGE"; + private String EXCEPTION_MSG = null; + private String repository; + private String[] configIds ; + private Properties props; + + + /** + * Initialize the Kernel and ConfigurationManager + * + **/ + public void init(ServletConfig config) { + try { + super.init(config); + kernel = (Kernel) new InitialContext().lookup("java:comp/GeronimoKernel"); + } + catch (Exception e) { + kernel = KernelRegistry.getSingleKernel(); + } + + if (kernel != null) { + configurationManager = ConfigurationUtil.getConfigurationManager(kernel); + Set domainNames = kernel.listGBeans(new AbstractNameQuery(J2EEDomain.class.getName())); + AbstractName domainName = (AbstractName) domainNames.iterator().next(); + J2EEDomain domain = (J2EEDomain) kernel.getProxyManager().createProxy(domainName, J2EEDomain.class); + J2EEServer server = domain.getServerInstances()[0]; + pluginInstaller = server.getPluginInstaller(); + } + else { + EXCEPTION_MSG = "Couldn't find Kernel"; + } + + try { + props = new Properties(); + InputStream is = getClass().getResourceAsStream("welcome.properties"); + props.load(is); + repository = props.getProperty("welcome.plugin.repository"); + + boolean jetty = config.getServletContext().getServerInfo().toLowerCase().indexOf("jetty") > -1; + String container = "tomcat"; + if (jetty) + container = "jetty"; + String configs = props.getProperty("welcome.examples." + container); + StringTokenizer str = new StringTokenizer(configs, ","); + configIds = new String[str.countTokens()]; + for (int i =0; str.hasMoreTokens(); configIds[i++] = str.nextToken().trim()); + } + catch (Exception e) { + EXCEPTION_MSG = e.toString(); + } + + rd = config.getServletContext().getRequestDispatcher("/handleMessage.jsp"); + } + + public void debug(String str) { + System.out.println(str); + } + + /** + * read request parameter "sampleConfigId" + * if sample not installed, prompt to go to plugin page + * if installed but not running, prompt to start the app + * if running, serve the app + **/ + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + HttpSession session = request.getSession(); + hostname = request.getLocalName(); + String configId = request.getParameter("sampleConfigId"); + + String START_MSG = "This example has previously been installed but it is currently stopped. If you could like to start it by using the admin console, click here"; + + if (EXCEPTION_MSG == null) { + if (configId == null || configId.trim().equals("")) { + for (int i=0; i< configIds.length; i++) { + configId = configIds[i]; + Artifact artifact = Artifact.create(configId); + try { + installSample(repository, artifact, session); + } + catch (Exception e) { + EXCEPTION_MSG = e.toString(); + } + } + if (EXCEPTION_MSG == null) { + props.setProperty("welcome.examples.installed", "true"); + FileOutputStream fos = new FileOutputStream(getServletContext().getRealPath("/") + "/props.ser"); + ObjectOutputStream oos = new ObjectOutputStream(fos); + oos.writeObject(props); + response.sendRedirect("http://" + hostname + ":8080/"); + return; + } + } + else { + if (configurationManager != null) { + Artifact artifact = Artifact.create(configId); + if (configurationManager.isInstalled(artifact)) { + String moduleType = getModuleType(artifact); + + if (configurationManager.isRunning(artifact)) { + // app installed and running. Serve the app. + String contextPath = getContextPath(artifact); + if (contextPath != null) { + response.sendRedirect(contextPath); + return; + } + } + else { + // app installed but stopped. Prompt to start. + request.setAttribute(msg, START_MSG); + rd.forward(request, response); + return; + } + } + else { + // app not installed. Prompt to install. + //request.setAttribute(msg, PLUGIN_MSG); + try { + installSample(repository, artifact, session); + String contextPath = getContextPath(artifact); + response.sendRedirect(contextPath); + return; + } + catch (Exception e) { + EXCEPTION_MSG = e.toString(); + } + } + } + } + } + + request.setAttribute(msg, EXCEPTION_MSG); + rd.forward(request, response); + } + + + + + /** + * get ContextPath for a running configuration + **/ + private String getContextPath(Artifact artifact) { + Configuration config = configurationManager.getConfiguration(artifact); + ConfigurationModuleType type = config.getModuleType(); + AbstractName result; + WebModule webModule; + try { + if (type.equals(ConfigurationModuleType.WAR)) { + result = config.findGBean(new AbstractNameQuery(WebModule.class.getName())); + webModule = (WebModule) kernel.getProxyManager().createProxy(result, getClass().getClassLoader()); + } + else if (type.equals(ConfigurationModuleType.EAR)) { + result = config.findGBean(new AbstractNameQuery(J2EEApplication.class.getName())); + J2EEApplication application = (J2EEApplication) kernel.getProxyManager().createProxy(result, getClass().getClassLoader()); + webModule = application.getWebModules()[0]; + } + else { + EXCEPTION_MSG = "Unknown module type"; + return null; + } + return webModule.getContextPath(); + } + catch (GBeanNotFoundException e) { + EXCEPTION_MSG = "Bad config ID: " + e.getMessage(); + return null; + } + } + + + /** + * get the module type. + * This method is needed because the above method works only on a running configuration + **/ + private String getModuleType(Artifact artifact) { + String type = "war"; + ConfigurationStore configStore = configurationManager.getStoreForConfiguration(artifact); + List list = configStore.listConfigurations(); + for (ListIterator iterator = list.listIterator(); iterator.hasNext();) { + ConfigurationInfo configurationInfo = (ConfigurationInfo) iterator.next(); + if (configurationInfo.getConfigID().equals(artifact)) { + ConfigurationModuleType moduleType = configurationInfo.getType(); + if (moduleType.equals(ConfigurationModuleType.EAR)) + type = "ear"; + } + } + return type; + } + + + private void installSample(String repository, Artifact artifact, HttpSession session) throws Exception { + if (configurationManager.isInstalled(artifact)) + return; + + PluginList installList; + try { + PluginList list = pluginInstaller.listPlugins(new URL(repository), null, null); + installList = PluginList.createInstallList(list, artifact); + } + catch (FailedLoginException e) { + throw new Exception("Invalid login for Maven repository '"+repository+"'", e); + } + if (installList == null) { + throw new Exception("No configuration found for '"+artifact.toString()+"'"); + } + Object downloadKey = pluginInstaller.startInstall(installList, null, null); + Thread t = new Thread(new Installer(pluginInstaller, downloadKey, session)); + t.start(); + t.join(); + + configurationManager.loadConfiguration(artifact); + configurationManager.startConfiguration(artifact); + } + + public static class Installer implements Runnable { + private PluginInstaller pluginInstaller; + private Object downloadKey; + private HttpSession session; + + public Installer(PluginInstaller pluginInstaller, Object downloadKey, HttpSession session) { + this.pluginInstaller = pluginInstaller; + this.downloadKey = downloadKey; + this.session = session; + } + + public void run() { + DownloadResults results; + while (true) { + results = pluginInstaller.checkOnInstall(downloadKey); + System.out.println(results.getCurrentMessage()); + if (results.isFinished()) { + log.info("Installation finished"); + System.out.println("Installation finished"); + session.setAttribute("DOWNLOAD_RESULTS_SESSION_KEY", results); + break; + } + else { + try { + Thread.sleep(1000); + } + catch (InterruptedException e) { + log.error("Download monitor thread interrupted", e); + } + } + } + } + } +} Index: applications/welcome/src/java/org/apache/geronimo/welcome/ServeSamplesServlet.java =================================================================== --- applications/welcome/src/java/org/apache/geronimo/welcome/ServeSamplesServlet.java (revision 0) +++ applications/welcome/src/java/org/apache/geronimo/welcome/ServeSamplesServlet.java (revision 0) @@ -0,0 +1,198 @@ +/** + * + * 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. + */ +package org.apache.geronimo.welcome; + + +import java.io.IOException; +import java.util.List; +import java.util.ListIterator; +import javax.naming.InitialContext; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.apache.geronimo.gbean.AbstractName; +import org.apache.geronimo.gbean.AbstractNameQuery; +import org.apache.geronimo.kernel.GBeanNotFoundException; +import org.apache.geronimo.kernel.Kernel; +import org.apache.geronimo.kernel.KernelRegistry; +import org.apache.geronimo.kernel.config.Configuration; +import org.apache.geronimo.kernel.config.ConfigurationInfo; +import org.apache.geronimo.kernel.config.ConfigurationManager; +import org.apache.geronimo.kernel.config.ConfigurationModuleType; +import org.apache.geronimo.kernel.config.ConfigurationStore; +import org.apache.geronimo.kernel.config.ConfigurationUtil; +import org.apache.geronimo.kernel.repository.Artifact; +import org.apache.geronimo.management.geronimo.J2EEApplication; +import org.apache.geronimo.management.geronimo.WebModule; + +/** + * Servlet that redirects to a sample app if it exists + * or gives the option of downloading the app as a plugin. + * + */ +public class ServeSamplesServlet extends HttpServlet { + private final static Log log = LogFactory.getLog(ServeSamplesServlet.class); + + private Kernel kernel = null; + private RequestDispatcher rd = null; + private ConfigurationManager configurationManager = null; + private String moduleType = "war"; + private String hostname = "localhost"; + private final String msg = "MESSAGE"; + private String EXCEPTION_MSG; + + + /** + * Initialize the Kernel and ConfigurationManager + * + **/ + public void init(ServletConfig config) { + try { + super.init(config); + kernel = (Kernel) new InitialContext().lookup("java:comp/GeronimoKernel"); + } + catch (Exception e) { + EXCEPTION_MSG = e.toString(); + kernel = KernelRegistry.getSingleKernel(); + } + + if (kernel != null) { + configurationManager = ConfigurationUtil.getConfigurationManager(kernel); + } + + + rd = config.getServletContext().getRequestDispatcher("/handleMessage.jsp"); + } + + public void debug(String str) { + System.out.println(str); + } + + /** + * read request parameter "sampleConfigId" + * if sample not installed, go to a servlet that silently installs it. + * if installed but not running, prompt to start the app + * if running, serve the app + **/ + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + hostname = request.getLocalName(); + String configId = request.getParameter("sampleConfigId"); + + String ERROR_MSG = "Parameter sampleConfigId is missing"; + String START_MSG = "This example has previously been installed but it is currently stopped. If you could like to start it by using the admin console, click here"; + String PLUGIN_MSG = "This example is not currently installed. Click here to install it using the admin console.
(NOTE: The admin console requires you to logon. The default userid is system and the default password is manager)"; + String BACK_MSG = "Click here to go back"; + + + if (configId != null && !configId.trim().equals("")) { + + if (configurationManager != null) { + Artifact artifact = Artifact.create(configId); + if (configurationManager.isInstalled(artifact)) { + String moduleType = getModuleType(artifact); + + if (configurationManager.isRunning(artifact)) { + // app installed and running. Serve the app. + String contextPath = getContextPath(artifact); + response.sendRedirect(contextPath); + return; + } + else { + // app installed but stopped. Prompt to start. + request.setAttribute(msg, START_MSG); + } + } + else { + // app not installed + //request.setAttribute(msg, PLUGIN_MSG); + response.sendRedirect("http://" + hostname + ":8080/installSamples?sampleConfigId=" + configId); + return; + } + } + else { + request.setAttribute(msg, EXCEPTION_MSG); + } + } + else { + request.setAttribute(msg, ERROR_MSG); + } + + rd.forward(request, response); + } + + + + + /** + * get ContextPath for a running configuration + **/ + private String getContextPath(Artifact artifact) { + Configuration config = configurationManager.getConfiguration(artifact); + ConfigurationModuleType type = config.getModuleType(); + AbstractName result; + WebModule webModule; + try { + if (type.equals(ConfigurationModuleType.WAR)) { + result = config.findGBean(new AbstractNameQuery(WebModule.class.getName())); + webModule = (WebModule) kernel.getProxyManager().createProxy(result, getClass().getClassLoader()); + } + else if (type.equals(ConfigurationModuleType.EAR)) { + result = config.findGBean(new AbstractNameQuery(J2EEApplication.class.getName())); + J2EEApplication application = (J2EEApplication) kernel.getProxyManager().createProxy(result, getClass().getClassLoader()); + webModule = application.getWebModules()[0]; + } + else { + return null; + } + return webModule.getContextPath(); + } + catch (GBeanNotFoundException e) { + EXCEPTION_MSG = "Bad config ID: " + e.getMessage(); + return null; + } + } + + + /** + * get the module type. + * This method is needed because the above method works only on a running configuration + **/ + private String getModuleType(Artifact artifact) { + String type = "war"; + ConfigurationStore configStore = configurationManager.getStoreForConfiguration(artifact); + List list = configStore.listConfigurations(); + for (ListIterator iterator = list.listIterator(); iterator.hasNext();) { + ConfigurationInfo configurationInfo = (ConfigurationInfo) iterator.next(); + if (configurationInfo.getConfigID().equals(artifact)) { + ConfigurationModuleType moduleType = configurationInfo.getType(); + if (moduleType.equals(ConfigurationModuleType.EAR)) + type = "ear"; + } + } + return type; + } + +} + Index: applications/welcome/src/resources/org/apache/geronimo/welcome/welcome.properties =================================================================== --- applications/welcome/src/resources/org/apache/geronimo/welcome/welcome.properties (revision 0) +++ applications/welcome/src/resources/org/apache/geronimo/welcome/welcome.properties (revision 0) @@ -0,0 +1,6 @@ +#default repository to install plugins (examples) from. +welcome.plugin.repository=http://www.geronimoplugins.com/repository/geronimo-1.1 + +# list of examples to install separated by a , (comma) +welcome.examples.jetty=geronimo/jsp-examples-jetty/1.1-SNAPSHOT/car, geronimo/servlets-examples-jetty/1.1-SNAPSHOT/car +welcome.examples.tomcat=geronimo/jsp-examples-tomcat/1.1-SNAPSHOT/car, geronimo/servlets-examples-tomcat/1.1-SNAPSHOT/car Index: applications/welcome/src/webapp/handleMessage.jsp =================================================================== --- applications/welcome/src/webapp/handleMessage.jsp (revision 0) +++ applications/welcome/src/webapp/handleMessage.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 + + + + + + + + + + +
+ + + + + + + + + +
 
  
+
+ +
+ +
+
+
+ +

<%= 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 399866) +++ applications/welcome/src/webapp/index.jsp (working copy) @@ -16,6 +16,8 @@ <%@ page session="false" %> +<%@ page import="java.io.File" %> + @@ -25,6 +27,8 @@ +<% boolean jetty = application.getServerInfo().toLowerCase().indexOf("jetty") > -1; %> + @@ -92,14 +96,30 @@ Geronimo Examples       - + <% File foo = new File(application.getRealPath("/") + "/props.ser"); + if (foo.exists()) { + %> + + + <% } else { %> + + + <% } %>
- Servlet Examples
- JSP Examples
- LDAP Demo
+ <% if(jetty) { %> + Servlet Examples
+ JSP Examples
+ LDAP Demo
+ <% } else { %> + Servlet Examples
+ JSP Examples
+ LDAP Demo
+ <% } %> Additional Samples
+ To install examples, click here.
This requires internet connectivity. +
@@ -111,7 +131,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 +158,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,115 @@ + + +Geronimo Console Login + + + + +<% String configId = request.getParameter("sampleConfigId"); %> + + +
+ + + <%-- Top table is the banner --%> + + + + + + + + + + + + + + +
  + +
  
  
+ + <%-- Main body --%> + + + + + + + + +
  + + + + +
+ + + + + + + + + + + + + + +
 Log in to the Geronimo Console
 
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      
Username:  
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 399866) +++ 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 399866) +++ applications/welcome/src/webapp/WEB-INF/web.xml (working copy) @@ -10,4 +10,48 @@ Welcome to Geronimo + + installSamples + org.apache.geronimo.welcome.InstallSamplesServlet + + + + serveSamples + org.apache.geronimo.welcome.ServeSamplesServlet + + + + installSamples + /installSamples + + + + serveSamples + /serveSamples + + + + + + /installSamples/* + 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 399866) +++ 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 399866) +++ configs/welcome-tomcat/src/plan/plan.xml (working copy) @@ -24,4 +24,18 @@ / false + geronimo-properties-realm + + + + + + + + + + + + +