Explorar o código

Enable console logging for gemini, remove unused files (#3203)

Before, we had disabled gemini's logging completely, so if there was a
problem (such as: can't connect to the database and throws an exception
on startup) it wouldn't show up anywhere.  With this change, errors like
that should show up.

Starting resin with "resinctl console" instead of "resinctl start" means
the stdout from the gemini Java application will actually show up in
TFB's console output and get captured in the results directory.  Resin's
documentation suggests that "start" should be the mode used in
production, but that happens to be inconvenient for us in the context of
TFB since stdout is the only kind of logging we can depend on.  We're
asserting that there will be no difference in performance from "console"
as opposed to "start".

I removed all the unused .conf files for Gemini.  In the remaining used
.conf file, I enabled logging to stdout and changed the log threshold to
the recommended value.  I removed the "RequestLog*" settings because that
feature was removed from gemini.

I removed the Eclipse project files and the setup.sh script because those
aren't required by TFB.  They're leftovers from the original gemini
project generator and we don't intend for anyone to actually use them, if
they even still work.
Michael Hixson %!s(int64=7) %!d(string=hai) anos
pai
achega
b67c6e04db

+ 0 - 56
frameworks/Java/gemini/.classpath

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/activation.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/mail.jar"/>
-	<classpathentry kind="src" path="Source"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Resin"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/reflectasm.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/reflections.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/java-image-scaling.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/kryo.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/kryonet-all.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/asm.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/compiler.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/filters.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/guava.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/im4java.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-annotations.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-core.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-databind.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javaee-api.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javaee-web-api.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javassist.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javax.jms-api.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javax.mail-api.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javax.mail.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jbcrypt.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jjwt.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/minlog.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/mysql-connector-java.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/objenesis.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/trove4j.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-public-javadoc.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-public-sources.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-public.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-resin-public-javadoc.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-resin-public-sources.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/gemini-resin-public.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-annotations-javadoc.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-annotations-sources.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-core-javadoc.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-core-sources.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-databind-javadoc.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jackson-databind-sources.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javassist-javadoc.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javassist-sources.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javax.mail-api-javadoc.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/javax.mail-api-sources.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/jsr250-api.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/postgresql-javadoc.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/postgresql-sources.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/postgresql.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/resin-javaee16.jar"/>
-	<classpathentry kind="lib" path="Docroot/WEB-INF/lib/resin.jar"/>
-	<classpathentry kind="output" path="Docroot/WEB-INF/classes"/>
-</classpath>

+ 0 - 37
frameworks/Java/gemini/.project

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>FrameworkBenchmarks-Gemini</name>
-	<comment></comment>
-	<projects>
-		<project>TechEmpower</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>

+ 0 - 560
frameworks/Java/gemini/Docroot/WEB-INF/GeminiHello-Base.conf

@@ -1,560 +0,0 @@
-# -----------------------------------------------------------------------
-# GEMINIHELLO configuration file
-#
-# BASELINE Configuration
-#
-# This configuration file specifies application default behavior that is
-# suitable where not superseded by deployment-specific configuration
-# files.  Refer to the separate deployment-specific configuration files
-# (such as GeminiHello-Dev.conf).
-#
-# The automatically-generated configuration files align with generic
-# deployment "roles" (Development, Test, and Production).  It is common
-# practice, however, to have additional machine-specific configuration 
-# files.  This allows for configuration attributes to be distributed
-# between so that, for example, all development environments can use
-# attributes specific in a Development configuration file.  For example:
-#
-#    GeminiHello.conf - Baseline configuration
-#    GeminiHello-Dev.conf - Standard development configuration specifics
-#    GeminiHello-BLACKPARK.conf - Specifics for a machine named Blackpark.
-#
-# -----------------------------------------------------------------------
-#
-# AUTO GENERATED CONFIGURATION FILE NOTICE:
-#   Search for lines that contain "EDIT THIS" for AUTO-GENERATED items
-#   that you cam edit for additional functionality.
-#
-# Notes:
-#   Lines that begin with # are comments.  Empty lines are ignored.  Each
-#   entry in this file is described immediately above the provided value.
-#
-#   Directories must have their back-slashes (\) escaped as \\.
-#
-# -----------------------------------------------------------------------
-#
-# STANDARD PROPERTIES
-#   Gemini provides the following standard properties dynamically at
-#   runtime, derived from the deployment environment.
-#
-#   All Servlet Initialization Parameters in the following form:
-#   Servlet.Parameter.(ParamName) = (Value)
-#
-#   All Server Attributes in the following form:
-#   Servlet.Attribute.(AttribtueName) = (Value)
-#
-#   Servlet.ContextName - The deployment context name for the web-app.
-#   Servlet.DeploymentRoot - The physical file system location for the
-#     "document root" of the web-app.
-#   Servlet.WebInf - The physical file system location of the web-app's
-#     WEB-INF directory.
-#   Servlet.MachineName - The discovered machine name of the server.
-#   Servlet.ApplicationRoot - One directory above the DeploymentRoot.
-#
-# -----------------------------------------------------------------------
-
-# The version file sets the "StaticsVersion" attribute, which is used in test
-# and production to generate links to static assets that can be cached forever.
-# This version number is changed every time the ant build script is executed.
-Extends = GeminiHello-Version.conf
-
-# -----------------------------------------------------------------------
-# DEPLOYMENT SETTINGS
-# -----------------------------------------------------------------------
-
-# ApplicationRoot
-#   Specifies the file system root of the application.  This value is
-#   not actually used by Gemini, but is used as a macro in several
-#   other property values.
-
-ApplicationRoot = ${Servlet.ApplicationRoot}
-#ApplicationRoot = C:/Development/GeminiHello/
-
-# DeploymentDescription
-#   A simple descriptive name or label for this deployment of the
-#   application (e.g., Production, Test, Development, and so on).  This
-#   description is used to identify the installation in some system-
-#   generated messages such as exception report e-mails.
-
-DeploymentDescription = Unspecified
-
-
-# -----------------------------------------------------------------------
-# DATABASE SETTINGS
-# -----------------------------------------------------------------------
-
-# Connection information can be found in the separate deployment-
-# specific configuration files.
-
-# MySQL/ConnectorJ
-db.Driver.Class = com.mysql.jdbc.Driver
-db.Driver.UrlPrefix = jdbc:mysql://
-db.Driver.SupportsAbsolute = yes
-db.Driver.SupportsGetRow = yes
-db.Driver.Jdbc1 = no
-
-db.ConnectString = localhost:3306/hello_world?jdbcCompliantTruncation=false&cachePrepStmts=true&prepStmtCache=4096&zeroDateTimeBehavior=convertToNull
-db.LoginName = root
-db.LoginPass = root
-
-# JTDS (Open source JDBC driver for Microsoft SQL Server)
-#db.Driver.Class = net.sourceforge.jtds.jdbc.Driver
-#db.Driver.UrlPrefix = jdbc:jtds:sqlserver://
-#db.Driver.SupportsAbsolute = yes
-#db.Driver.SupportsGetRow = yes
-#db.Driver.Jdbc1 = no
-
-# db.Driver.Pooling
-#   How many Connections to maintain to the database.  The default is 1.
-# db.Driver.MaxPooling
-#   How many concurrent Connections to allow at maximum.
-
-db.Driver.Pooling = 200
-db.Driver.MaxPooling = 200
-
-# BasicConnectionListener properties
-
-# cl.RetriesOnDisconnect
-#   How many automatic retries on database connection (socket) failures
-#   should be made before aborting a query attempt?
-
-cl.RetriesOnDisconnect = 1
-
-# cl.AlertFile
-#   File to write database connector alerts to.
-
-cl.AlertLogFile = ${ApplicationRoot}/jdbc-alerts.log
-
-
-# -----------------------------------------------------------------------
-# CLUSTER SETTINGS
-# -----------------------------------------------------------------------
-
-# The cluster settings are left commented here.  Gemini clustering can
-# be enabled either (a) by defining cluster connectivity information here
-# in a configuration file or (b) by having application instances fetch
-# their configuration from the cluster master.  In case (b), this
-# configuration file won't be used and there's no point in un-commenting
-# and modifying the lines below.
-
-#ClusterClient.TransportClassname = com.techempower.gemini.cluster.transport.kryonet.KryoClientTransport
-#ClusterClient.Authentication.Key = shared-secret
-#Kryo.Client.Host = localhost
-#Kryo.Client.TcpPort = 54555
-
-
-# -----------------------------------------------------------------------
-# DIRECTORY SETTINGS
-# -----------------------------------------------------------------------
-
-# JSPDirectory
-#   Specifies the relative URL base for JSP files.
-
-JSPDirectory = /WEB-INF/jsp/
-
-# JSPPhysicalDirectory
-#   Specifies the physical directory that is referenced by JSPDirectory
-#   above.
-
-JSPPhysicalDirectory = ${Servlet.WebInf}/jsp/
-
-# HTMLDirectory
-#   Specifies the relative URL base for HTML files.  If HTML files are
-#   served by a separate host, an asbolute URL base can be specified.
-
-HTMLDirectory = /html/
-
-# ImagesDirectory
-#   Specifies the relative URL base for image files.  If images are
-#   served by a separate host, an asbolute URL base can be specified.
-
-ImageDirectory = /images/
-
-# CSSDirectory
-#   Specifies the relative URL base for style sheet files.  If CSS 
-#   files are served by a separate host, an asbolute URL base can be
-#   specified.
-
-CSSDirectory = /css/
-
-# JavaScriptDirectory
-#   Specifies the relative URL base for JavaScript (.js) files.  If
-#   JS files are served by a separate host, an asbolute URL base can be
-#   specified.
-
-JavaScriptDirectory = /js/
-
-# ServletURL
-#   Specifies the relative URL for the dispatcher servlet.  For many
-#   applications, this will be set to the root (just /).  This requires
-#   that the application server direct request to the Servlet only when
-#   the URL matches the root and the root only.  In Resin, the way
-#   this is accomplished is by setting a Servlet Mapping as below:
-#     <servlet-mapping url-regexp='^/$' servlet-name='...'/>
-
-ServletURL = /
-
-
-# -----------------------------------------------------------------------
-# LOGGING SETTINGS
-# -----------------------------------------------------------------------
-
-# Log.File - Log file settings
-# Log.File.On
-#   Enables or disables logging to log files.
-# Log.Console.On
-#   Enables or disables logging to the console.
-
-Log.File.On = no
-Log.Console.On = no
-
-# Log.File.LogDirectory
-#   Specifies the directory to which logfiles should be written.  By
-#   default this is just a subdirectory named "logs" off of whatever
-#   is the active directory.  The directory must exist for the log files
-#   to work.
-
-Log.File.LogDirectory = ${ApplicationRoot}/Logs/Application-Logs/
-
-# Log.File.LogDebugThreshold -and-
-# Log.Console.LogDebugThreshold
-#   Specify the minimum log level (0 to 100, inclusive) to require for
-#   writing items to this log listener.
-#
-# 20 is recommended to start out.
-
-Log.File.LogDebugThreshold = 100
-Log.Console.LogDebugThreshold = 100
-
-# RequestLogDir
-#   Specifies the directory in which to store Request logs, which are in
-#   W3C format.  These logs can be used to generate usage analysis
-#   reports.
-RequestLogDir = ${ApplicationRoot}/Logs/Request-Logs/
-
-# RequestLogEnabled
-#   Is the request logging feature enabled?
-
-RequestLogEnabled = yes
-
-# RequestLogSuffix
-#   Sets the suffix for request log files.
-
-RequestLogSuffix = .log
-
-
-# -----------------------------------------------------------------------
-# IP/DNS/URL SETTINGS
-# -----------------------------------------------------------------------
-
-# StandardDomain
-#   Species the URL base for the standard (non-secure) domain name.
-#   This should not end with a trailing /, which would otherwise be
-#   standard practice.
-
-# TODO: EDIT THIS
-StandardDomain = http://${Servlet.MachineName}
-
-# SecureDomain
-#   Specifies the URL base for the secure (SSL) domain name.
-#   This should not end with a trailing /, which would otherwise be
-#   standard practice.
-
-# TODO: EDIT THIS
-SecureDomain = https://${Servlet.MachineName}
-
-
-# -----------------------------------------------------------------------
-# LOGIN HANDLER
-# -----------------------------------------------------------------------
-
-# LoginHandler.CmdLogin
-#   The command to recognize for the login page (default: "login"). The
-#   login page can be invoked directly via this command or via a peer
-#   Handler, such as subclasses of SecureHandler.
-
-LoginHandler.CmdLogin = login
-
-# LoginHandler.CmdLogout
-#   The command to recognize for logout requests. The default is
-#   "logout".
-
-LoginHandler.CmdLogout = logout
-
-# LoginHandler.CmdPostLogin
-#   The command to redispatch to after a successful login. This command
-#   will only be used if a prior request was not preempted by a forced
-#   login. The default is "home".
-
-LoginHandler.CmdPostLogin = home
-
-# LoginHandler.JspLogin
-#   The JSP page name to use for rendering the login form. The default
-#   is "login.jsp" within the root of your application's JSP directory.
-
-LoginHandler.JspLogin = accounts/login.jsp
-
-# LoginHandler.JspLogout
-#   The JSP page name to use for rendering the logout screen. The default
-#   is "logout.jsp" within the root of your application's JSP directory.
-
-LoginHandler.JspLogout = accounts/logout.jsp
-
-# LoginHandler.CookieNameSuffix - You can change the suffix of the cookie
-#   name used to save automatic login credentials. The default is
-#   "-automatic-login".
-
-LoginHandler.CookieNameSuffix = -automatic-login
-
-# LoginHandler.LogoutDeletesCookie
-#   Delete automatic login cookie after logout.
-
-LoginHandler.LogoutDeletesCookie = yes
-
-# LoginHandler.EmailTemplateName
-#   You can change the template name of the e-mail used to send a user a
-#   replacement password (in the event that they forget their current
-#   password). The default template name is "E-NewPassword".
-
-LoginHandler.EmailTemplateName = E-NewPassword
-
-# LoginHandler.FailedAttemptLimit
-#   Limits the number of sequential failed attempts before an IP address
-#   cannot make any further login attempts (until a timeout period has
-#   expired).
-
-LoginHandler.FailedAttemptLimit = 25
-
-# LoginHandler.FailedResetSeconds
-#   An interval of time after which an IP address that had been blocked
-#   will be permitted to login again.
-
-LoginHandler.FailedResetSeconds = 60
-
-
-# -----------------------------------------------------------------------
-# STANDARD ADMIN SETTINGS
-# -----------------------------------------------------------------------
-
-# Admin.RelativeJspPath
-#   Specifies the relative path to JSP files for the Admin section.
-
-Admin.RelativeJspPath = admin/
-
-# Admin.ScratchEnabled
-#   Should the admin section allow the execution of arbitrary JSP 
-#   fragments?
-
-Admin.ScratchEnabled = no
-
-# Admin.ScratchIP
-#   If scratches are enabled, from what IPs are they permitted?
-
-Admin.ScratchIP = 127.0.0.1,172.16.98.14
-
-
-# -----------------------------------------------------------------------
-# PYXIS USERS AND GROUPS SETTINGS
-# -----------------------------------------------------------------------
-
-# Pyxis.UsersTable
-#   The name of the Users table for this database.
-Pyxis.UsersTable = GhUsers
-
-# Pyxis.GroupsTable
-#   The name of the Groups table for this database.
-Pyxis.GroupsTable = GhGroups
-
-# Pyxis.UsersToGroupsTable
-#   The name of the table mapping Users to Groups for this database.
-Pyxis.UsersToGroupsTable = MapUserToGroup
-
-# BasicSecurity.PasswordCryptographer
-#   Specifies the fully-qualified classname of a PasswordCryptographer
-#   implementation that can hash user passwords.  A common implementation
-#   is com.techempower.security.BCryptPasswordCryptographer.
-
-BasicSecurity.PasswordCryptographer = com.techempower.security.BCryptPasswordCryptographer
-
-
-# -----------------------------------------------------------------------
-# JSP PRECOMPILATION (optional; not enabled in this auto-generated file)
-# -----------------------------------------------------------------------
-
-# Precomp.Group1
-#   Defines a comma-separated list of directories (relative URLs) that
-#   contain JSP files (relative to the JSPDirectory).  Multiple groups
-#   can be defined as Group2; Group3; etc.
-#   ex. Precomp.Group1 = /,/includes/,/admin/
-
-#Precomp.Group1 = /
-
-# Precomp.AuthorizedIP
-#   An IP address that is authorized to invoke the Precompilation
-#   process.
-
-#Precomp.AuthorizedIP = 65.115.126.13
-
-
-# -----------------------------------------------------------------------
-# MAIL SETTINGS
-# -----------------------------------------------------------------------
-
-# MailServerCount
-#   The number of mail servers to use in fail-over.  If no fail-over is
-#   used, this should be 1.
-
-MailServerCount = 1
-
-# EmailerThreadsDaemon
-#   Set to no to force e-mail servicer threads to completely deliver their
-#   queues even when the application stops.  Set to yes to allow threads
-#   to stop immediately when the application stops, resulting in the
-#   possibility of undelivered e-mails.
-
-EmailerThreadsDaemon = yes
-
-# Mail Server blocks (where 'X' is a sequential ID of the mail servers
-# used by the application).
-#
-# MailServerX.ServerAddress
-#   Specify each mail server's DNS name or IP address.  Make sure the
-#   mail server will relay e-mail for this application.
-# MailServerX.SmtpPort
-#   Specify an SMTP port number if used for Outbound mail.
-# MailServerX.PopPort
-#   Specify a POP3 port number if used for Inbound mail.
-# MailServerX.Username
-#   Used if an SMTP username is required to send or receive mail
-# MailServerX.Password
-#   The password for the user specified above
-# MailServerX.Role
-#   Outbound, Inbound, or Both
-
-# No mail servers specified in baseline configuration.  See environment-
-# specific configuration files.
-#MailServer1.ServerAddress = mail.techempower.com
-#MailServer1.SmtpPort = 25
-#MailServer1.Username = username
-#MailServer1.Password = password
-#MailServer1.ServerRole = Outbound
-
-# FromEmailAddress
-#   The e-mail address to use as an "author" when sending e-mails.
-
-FromEmailAddress = [email protected]
-
-# Email text files block
-#   Each of the e-mails that the site sends out is read in from
-#   the following text files.
-
-E-NewPassword = emails/New Password.txt
-
-
-# -----------------------------------------------------------------------
-# ERROR HANDLING SETTINGS
-# -----------------------------------------------------------------------
-
-# Should exceptions caught by the Gemini infrastructure while handling
-# web requests be written to the log file?
-
-BasicExceptionHandler.LogExceptions = yes
-BasicExceptionHandler.LogStackTraces = yes
-
-# Should the stack trace of exceptions caught by the Gemini
-# Infrastructure be clearly visible to users?  This is generally
-# acceptable only in a development environment.  In a Production
-# environment, set this value to 'no'.  Stack traces will still be
-# visible within the HTML source sent to the client.
-
-BasicExceptionHandler.RevealStackTrace = no
-
-# BasicExceptionHandler.ErrorPage
-#   Specifies the filename of the error page that should be rendered
-#   to display an exception.  If empty, the internal "page" will be
-#   used.
-
-BasicExceptionHandler.ErrorPage = error-page.jsp
-
-# Feature.exc-email
-# (Formerly EmailExceptionHandler.Enabled)
-#   The EmailExceptionHandler can be enabled or disabled.
-
-Feature.exc-email = false
-
-# EmailExceptionHandler.ToEmailAddress
-#   The e-mail address to which to send exception reports.
-
-EmailExceptionHandler.ToEmailAddress = [email protected]
-
-# EmailExceptionHandler.FromEmailAddress
-#   The e-mail address from which to send exception reports.
-
-EmailExceptionHandler.FromEmailAddress = [email protected]
-
-# EmailExceptionHandler.MinimumInterval
-#   The minimum number of seconds that must pass since the previous
-#   exception report in order to allow another report to be sent.  This
-#   helps mitigate an avalanche of reports from a critical error.  The
-#   interval is specified in seconds.  A good default is 600 (10
-#   minutes).
-
-EmailExceptionHandler.MinimumInterval = 600
-
-
-# -----------------------------------------------------------------------
-# MISCELLANEOUS SETTINGS
-# -----------------------------------------------------------------------
-
-# Character encoding settings
-#
-# Encoding.RequestCharset
-#   What character encoding are we expecting for requests?
-# Encoding.ResponseType
-#   The full MIME-Type name for responses.
-
-Encoding.RequestCharset = UTF-8
-Encoding.ResponseType = text/html;charset=utf-8
-
-# RequestCounting
-#   Specifies that requests should be counted and that threads
-#   processing requests should be assigned names that include the
-#   request ID number for the scope of the request.
-
-RequestCounting = yes
-
-# SchedulerSleepSeconds
-#   Seconds to sleep between scheduler checks.
-
-SchedulerSleepSeconds = 10
-
-# SessionTimeout
-#   Sets the number of seconds before a session should time out on
-#   the web site.
-
-SessionTimeout = 3600
-
-# SessionTracking
-#   If enabled, sessions will be tracked.  This allows the application
-#   to get a count of active sessions.
-
-SessionTracking = Yes
-
-# ThreadDump.DumpOnStopLocation
-#   Specifies a file system location to write thread dump text files
-#   when the application is unloaded by the application server (such
-#   as when the server stops).
-
-ThreadDump.DumpOnStopLocation = ${ApplicationRoot}/Thread Dumps/
-
-# Robots.File
-#   Specifies the file that should be returned when /robots.txt is 
-#   requested.  See hello.home.RobotsHandler.
-
-Robots.File = ${Servlet.WebInf}/robots-disallowed.txt
-
-# UrlRewriter.Active
-#   Activates Gemini's URL Rewriting
-UrlRewriter.Active = Yes
-
-Feature.monitor = no

+ 0 - 26
frameworks/Java/gemini/Docroot/WEB-INF/GeminiHello-DJIBOUTI.conf

@@ -1,26 +0,0 @@
-# -----------------------------------------------------------------------
-# GEMINIHELLO configuration file
-#
-# EXAMPLE MACHINE-SPECIFIC CONFIGURATION
-#
-# The configuration attributes specified in this file are specific to a
-# single development-environment machine.
-# -----------------------------------------------------------------------
-
-# Extend the development configuration, which in turn extends the
-# baseline configuration.
-Extends = GeminiHello-Prod.conf
-
-DeploymentDescription = Production/${Servlet.MachineName}
-
-# Now set any attributes that are specific to this machine.
-
-db.Driver.Class = com.mysql.jdbc.Driver
-db.Driver.UrlPrefix = jdbc:mysql://
-db.ConnectString = 127.0.0.1:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useServerPrepStmts=true&enableQueryTimeouts=false&useUnbufferedIO=false&useReadAheadInput=false&maintainTimeStats=false&cacheRSMetadata=true
-
-Log.Console.On = yes
-Log.Console.LogDebugThreshold = 50
-
-db.Driver.Pooling = 30
-db.Driver.MaxPooling = 30

+ 0 - 23
frameworks/Java/gemini/Docroot/WEB-INF/GeminiHello-Dev.conf

@@ -1,23 +0,0 @@
-# -----------------------------------------------------------------------
-# GEMINIHELLO configuration file
-#
-# DEVELOPMENT ENVIRONMENT
-#
-# The configuration attributes specified in this file should be common
-# across all Development deployments of the application.
-# -----------------------------------------------------------------------
-
-# Extend the baseline configuration.
-Extends = GeminiHello-Base.conf
-
-DeploymentDescription = Development/${Servlet.MachineName}
-
-# Database connectivity for Development.
-db.ConnectString = localhost:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull
-db.LoginName = root
-db.LoginPass = root
-
-# Disable outbound e-mail from the Development environment.
-OutboundMailEnabled = no
-
-

+ 0 - 24
frameworks/Java/gemini/Docroot/WEB-INF/GeminiHello-Inverness.conf

@@ -1,24 +0,0 @@
-# -----------------------------------------------------------------------
-# GEMINIHELLO configuration file
-#
-# EXAMPLE MACHINE-SPECIFIC CONFIGURATION
-#
-# The configuration attributes specified in this file are specific to a
-# single development-environment machine.
-# -----------------------------------------------------------------------
-
-# Extend the development configuration, which in turn extends the
-# baseline configuration.
-Extends = GeminiHello-Prod.conf
-
-DeploymentDescription = Production/${Servlet.MachineName}
-
-# Now set any attributes that are specific to this machine.
-
-db.ConnectString = 172.16.98.98:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useServerPrepStmts=true&enableQueryTimeouts=false&useUnbufferedIO=false&useReadAheadInput=false&maintainTimeStats=false&cacheRSMetadata=true
-
-Log.Console.On = yes
-Log.Console.LogDebugThreshold = 50
-
-db.Driver.Pooling = 30
-db.Driver.MaxPooling = 30

+ 0 - 28
frameworks/Java/gemini/Docroot/WEB-INF/GeminiHello-Prod.conf

@@ -1,28 +0,0 @@
-# -----------------------------------------------------------------------
-# GEMINIHELLO configuration file
-#
-# PRODUCTION ENVIRONMENT
-#
-# The configuration attributes specified in this file should be common
-# across all Production deployments of the application.
-# -----------------------------------------------------------------------
-
-# Extend the baseline configuration.
-Extends = GeminiHello-Base.conf
-
-DeploymentDescription = Production/${Servlet.MachineName}
-
-# Database connectivity for Production.
-db.ConnectString = localhost:3306/gemini?jdbcCompliantTruncation=false&cachePrepStmts=true&prepStmtC
-db.LoginName = hello
-db.LoginPass = hello
-
-# For this application, we are not sending any outbound e-mail.
-OutboundMailEnabled = no
-
-# In production, refer to all the static assets via URLs with version strings to
-# allow us to perform aggressive caching.
-HTMLDirectory = /static/${StaticsVersion}/html/
-ImageDirectory = /static/${StaticsVersion}/images/
-CSSDirectory = /static/${StaticsVersion}/css/
-JavaScriptDirectory = /static/${StaticsVersion}/js/

+ 0 - 42
frameworks/Java/gemini/Docroot/WEB-INF/GeminiHello-Test.conf

@@ -1,42 +0,0 @@
-# -----------------------------------------------------------------------
-# GEMINIHELLO configuration file
-#
-# TEST ENVIRONMENT
-#
-# The configuration attributes specified in this file should be common
-# across all Test deployments of the application.
-# -----------------------------------------------------------------------
-
-# Extend the baseline configuration.
-Extends = GeminiHello-Base.conf
-
-# TODO: Edit these settings according to the particulars of the
-# Test environment.
-
-DeploymentDescription = Test/${Servlet.MachineName}
-
-# Database connectivity for Test.
-db.ConnectString = localhost:3306/gemini?jdbcCompliantTruncation=false&cachePrepStmts=true&prepStmtC
-db.LoginName = hello
-db.LoginPass = hello
-
-# Mail server definition for the Test environment.  TODO: Review these
-# settings for suitability in Test.
-MailServerCount = 1
-MailServer1.ServerAddress = mail.techempower.com
-MailServer1.SmtpPort = 25
-MailServer1.PopPort = 110
-MailServer1.Username = mhixson
-MailServer1.Password = password
-MailServer1.ServerRole = Outbound
-
-# In test, we'll want to have the email exception handler enabled.
-EmailExceptionHandler.Enabled = true
-
-# In test, refer to all the static assets via URLs with version strings to
-# allow us to perform aggressive caching.
-HTMLDirectory = /static/${StaticsVersion}/html/
-ImageDirectory = /static/${StaticsVersion}/images/
-CSSDirectory = /static/${StaticsVersion}/css/
-JavaScriptDirectory = /static/${StaticsVersion}/js/
-

+ 4 - 26
frameworks/Java/gemini/Docroot/WEB-INF/GeminiHello.conf

@@ -53,11 +53,6 @@
 #
 #
 # -----------------------------------------------------------------------
 # -----------------------------------------------------------------------
 
 
-# The version file sets the "StaticsVersion" attribute, which is used in test
-# and production to generate links to static assets that can be cached forever.
-# This version number is changed every time the ant build script is executed.
-Extends = GeminiHello-Version.conf
-
 # -----------------------------------------------------------------------
 # -----------------------------------------------------------------------
 # DEPLOYMENT SETTINGS
 # DEPLOYMENT SETTINGS
 # -----------------------------------------------------------------------
 # -----------------------------------------------------------------------
@@ -68,7 +63,6 @@ Extends = GeminiHello-Version.conf
 #   other property values.
 #   other property values.
 
 
 ApplicationRoot = ${Servlet.ApplicationRoot}
 ApplicationRoot = ${Servlet.ApplicationRoot}
-#ApplicationRoot = C:/Development/GeminiHello/
 
 
 # DeploymentDescription
 # DeploymentDescription
 #   A simple descriptive name or label for this deployment of the
 #   A simple descriptive name or label for this deployment of the
@@ -206,7 +200,7 @@ ServletURL = /
 #   Enables or disables logging to the console.
 #   Enables or disables logging to the console.
 
 
 Log.File.On = no
 Log.File.On = no
-Log.Console.On = no
+Log.Console.On = yes
 
 
 # Log.File.LogDirectory
 # Log.File.LogDirectory
 #   Specifies the directory to which logfiles should be written.  By
 #   Specifies the directory to which logfiles should be written.  By
@@ -214,7 +208,7 @@ Log.Console.On = no
 #   is the active directory.  The directory must exist for the log files
 #   is the active directory.  The directory must exist for the log files
 #   to work.
 #   to work.
 
 
-Log.File.LogDirectory = ${ApplicationRoot}/Logs/Application-Logs/
+Log.File.LogDirectory = ${ApplicationRoot}/Logs/
 
 
 # Log.File.LogDebugThreshold -and-
 # Log.File.LogDebugThreshold -and-
 # Log.Console.LogDebugThreshold
 # Log.Console.LogDebugThreshold
@@ -223,24 +217,8 @@ Log.File.LogDirectory = ${ApplicationRoot}/Logs/Application-Logs/
 #
 #
 # 20 is recommended to start out.
 # 20 is recommended to start out.
 
 
-Log.File.LogDebugThreshold = 100
-Log.Console.LogDebugThreshold = 100
-
-# RequestLogDir
-#   Specifies the directory in which to store Request logs, which are in
-#   W3C format.  These logs can be used to generate usage analysis
-#   reports.
-RequestLogDir = ${ApplicationRoot}/Logs/Request-Logs/
-
-# RequestLogEnabled
-#   Is the request logging feature enabled?
-
-RequestLogEnabled = yes
-
-# RequestLogSuffix
-#   Sets the suffix for request log files.
-
-RequestLogSuffix = .log
+Log.File.LogDebugThreshold = 20
+Log.Console.LogDebugThreshold = 20
 
 
 
 
 # -----------------------------------------------------------------------
 # -----------------------------------------------------------------------

+ 0 - 0
frameworks/Java/gemini/Docroot/WEB-INF/mustache/.gitkeep


+ 0 - 14
frameworks/Java/gemini/GeminiHello.launch

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/GeminiHello"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_60"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.caucho.server.resin.Resin"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-conf &quot;Docroot/WEB-INF/resin.xml&quot;"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="GeminiHello"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -Djava.util.logging.manager=com.caucho.log.LogManagerImpl -ea"/>
-</launchConfiguration>

+ 0 - 57
frameworks/Java/gemini/setup.sh

@@ -1,57 +0,0 @@
-#!/bin/bash
-# 
-# This script can be used to generate the required, machine-specific 
-# configuration file:  GeminiHello-[MACHINE_NAME].conf
-# 
-# The intent is that developers would run this script once as part 
-# of their initial setup.  On Windows, the script can be run through 
-# Git bash.
-
-export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64
-export RESIN_HOME=${IROOT}/resin-4.0.41
-
-projectName="GeminiHello"
-machineNameUpper="`echo $HOSTNAME|tr '[a-z]' '[A-Z]'`"
-machineNameLower="`echo $HOSTNAME|tr '[A-Z]' '[a-z]'`"
-directoryName=$(cd `dirname $0` && pwd)
-user=`echo \`id -nu\``
-
-# If the file we wanted to generate already exists, don't bother 
-# creating a new one.
-
-configurationFile=$directoryName/Docroot/WEB-INF/$projectName-$machineNameUpper.conf;
-
-if [ -f $configurationFile ]
-then
-  echo "The configuration file $configurationFile already exists.  Exiting."
-  exit 0
-else
-  echo "Creating configuration file:  $configurationFile"
-fi
-
-# Write the required configuration attributes to the file.
-
-echo "# -----------------------------------------------------------------------" > $configurationFile
-echo "# GEMINIHELLO configuration file                                        " >> $configurationFile
-echo "#                                                                        " >> $configurationFile
-echo "# MACHINE-SPECIFIC CONFIGURATION                                         " >> $configurationFile
-echo "#                                                                        " >> $configurationFile
-echo "# The configuration attributes specified in this file are specific to a  " >> $configurationFile
-echo "# single development-environment machine.                                " >> $configurationFile
-echo "# -----------------------------------------------------------------------" >> $configurationFile
-echo "" >> $configurationFile
-echo "# Extend the development configuration, which in turn extends the " >> $configurationFile
-echo "# baseline configuration." >> $configurationFile
-echo "Extends = $projectName-Dev.conf" >> $configurationFile
-echo "" >> $configurationFile
-echo "# Now set any attributes that are specific to this machine." >> $configurationFile
-echo "StandardDomain = http://$machineNameLower.techempower.com" >> $configurationFile
-echo "SecureDomain = https://$machineNameLower.techempower.com" >> $configurationFile
-echo "#OutboundMailEnabled = yes" >> $configurationFile
-echo "StartupMailAuthor = [email protected]" >> $configurationFile
-echo "FromEmailAddress = [email protected]" >> $configurationFile
-echo "PasswordReset.FromAddress = [email protected]" >> $configurationFile
-echo "EmailExceptionHandler.ToEmailAddress = [email protected]" >> $configurationFile
-echo "EmailExceptionHandler.FromEmailAddress = [email protected]" >> $configurationFile
-
-exit 0

+ 1 - 1
frameworks/Java/gemini/start.sh

@@ -9,4 +9,4 @@ sed -i 's|db.Driver.UrlPrefix = .*|db.Driver.UrlPrefix = jdbc:mysql://|g' Docroo
 mkdir -p Docroot/WEB-INF/classes
 mkdir -p Docroot/WEB-INF/classes
 ant resolve
 ant resolve
 ant compile
 ant compile
-resinctl -conf $TROOT/Docroot/WEB-INF/resin.xml start
+resinctl -conf $TROOT/Docroot/WEB-INF/resin.xml console