glassfish 0.9.3-universal-java → 0.9.4-universal-java

data/bin/gfrake

@@ -58,7 +58,7 @@ application.standard_exception_handling do
     rm_rf "tmp/.glassfish" 
   end
 
-  desc "Display version of warbler"
+  desc "Display version of GlassFish gem"
   task :version do
     require 'version'
     puts "#{GlassFish::FULLVERSION}"

data/bin/glassfish

@@ -34,7 +34,7 @@
  #   PID file where PID will be written. Applicable when used with -d option. The default pid file is tmp/pids/glassfish-<PID>.pid
  #
  # -l, --log FILE::
- #   Log file, where the server log messages will go. By default the server logs go to log/glassfish.log file.
+ #   Log file, where the server log messages will go. By default the server logs go to log/development.log file. To see the logs on console run with -l option without any argument.
  #
  # --log-level LEVEL::
  #   Log level 0 to 7. 0:OFF, 1:SEVERE, 2:WARNING, 3:INFO (default), 4:FINE, 5:FINER, 6:FINEST, 7:ALL.
@@ -43,6 +43,7 @@
  #   Configuration file location. Use glassfish.yml as template. Generate it using 'gfrake config' command.
  #
  # APPLICATION_PATH (optional):  Path to the application to be run (default: current).
+ #
  # For further configuration, run GlassFish rake command 'gfrake -T'
 
  require "java"

data/bin/glassfish_rails

@@ -1,57 +1,2 @@
- # == Synopsis
- #
- # glassfish: GlassFish v3 server for Rack based frameworks such as: Rails, Merb, Sinatra...
- #
- # == Usage:
- #
- # glassfish [OPTION] APPLICATION_PATH
- #
- # -h, --help::
- #    show help
- #
- # -c, --contextroot PATH::
- #    change the context root (default: '/')
- #
- # -p, --port PORT::
- #    change server port (default: 3000)
- #
- # -e, --environment ENV::
- #    change rails environment (default: development)
- #
- # -n --runtimes NUMBER::
- #    Number of JRuby runtimes to create initially
- #
- # --runtimes-min NUMBER::
- #    Minimum JRuby runtimes to create
- #
- # --runtimes-max NUMBER::
- #    Maximum number of JRuby runtimes to create
- #
- # -d, --daemon::
- #   Run GlassFish as daemon. Currently works with Linux and Solaris OS.
- #
- # -P, --pid FILE::
- #   PID file where PID will be written. Applicable when used with -d option. The default pid file is tmp/pids/glassfish-<PID>.pid
- #
- # -l, --log FILE::
- #   Log file, where the server log messages will go. By default the server logs go to log/glassfish.log file.
- #
- # --log-level LEVEL::
- #   Log level 0 to 7. 0:OFF, 1:SEVERE, 2:WARNING, 3:INFO (default), 4:FINE, 5:FINER, 6:FINEST, 7:ALL.
- #
- # --config FILE::
- #   Configuration file location. Use glassfish.yml as template. Generate it using 'gfrake config' command.
- #
- # APPLICATION_PATH (optional):  Path to the application to be run (default: current).
- # For further configuration, run GlassFish rake command 'gfrake -T'
-
- require "java"
- $LOAD_PATH << "#{File.dirname(__FILE__)}/../modules"
- $LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
-
- require 'command_line_parser'
- require 'glassfish'
-
- options = GlassFish::CommandLineParser.new.parse
- gf = GlassFish::Server.new
- gf.startup(options)
+puts "\n'glassfish_rails' is discontinued, use 'glassfish' command instead.\n\nThis script will be removed in the next release.
+\n\n"

data/config/asenv.bat

@@ -1,7 +1,9 @@
-rem
-rem Copyright 2004-2005 Sun Microsystems, Inc. All rights reserved.
-rem Use is subject to license terms.
-rem
+REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+REM 
+REM Copyright 2004-2008 Sun Microsystems, Inc. All rights reserved.
+REM 
+REM Use is subject to License Terms
+REM 
 
 set AS_ANT=..\lib\ant
 set AS_ANT_LIB=..\lib\ant\lib
@@ -9,11 +11,10 @@ set AS_WEBSERVICES_LIB=..\lib
 set AS_PERL=%PERL_HOME%
 set AS_NSS=..\lib
 set AS_NSS_BIN=..\lib\admincgi
-set AS_IMQ_LIB=..\imq\lib
-set AS_IMQ_BIN=..\imq\bin
+set AS_IMQ_LIB=..\..\mq\lib
+set AS_IMQ_BIN=..\..\mq\bin
 set AS_CONFIG=..\config
 set AS_INSTALL=..
-set AS_JAVA=c:\java\jdk1.6.0\jre/..
 set AS_ACC_CONFIG=..\domains\domain1\config\sun-acc.xml
 set AS_JHELP=..\lib
 set AS_ICU_LIB=..\lib
@@ -24,5 +25,5 @@ set AS_NATIVE_LAUNCHER_LIB_PREFIX=\jre\bin\client
 set AS_WEBCONSOLE_LIB=../lib
 set AS_JATO_LIB=../lib
 set AS_HADB=%HADB_HOME%
-set AS_DERBY_INSTALL=..\javadb
+set AS_DERBY_INSTALL=..\..\javadb
 set AS_MFWK_HOME=%MFWK_HOME%

data/config/asenv.conf

@@ -1,7 +1,11 @@
 #
-# Copyright 2004-2005 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
+# Copyright 2004-2008 Sun Microsystems, Inc. All rights reserved.
+# 
+# Use is subject to License Terms
+#
+
 
 AS_ANT="../lib/ant"
 AS_ANT_LIB="../lib/ant/lib"
@@ -9,8 +13,8 @@ AS_WEBSERVICES_LIB="../lib"
 AS_PERL="%PERL_HOME%"
 AS_NSS="../lib"
 AS_NSS_BIN="../lib/admincgi"
-AS_IMQ_LIB="../imq/lib"
-AS_IMQ_BIN="../imq/bin"
+AS_IMQ_LIB="../../mq/lib"
+AS_IMQ_BIN="../../mq/bin"
 AS_CONFIG="../config"
 AS_INSTALL=".."
 AS_ACC_CONFIG="../domains/domain1/config/sun-acc.xml"
@@ -23,5 +27,5 @@ AS_NATIVE_LAUNCHER_LIB_PREFIX="/jre/lib/i386/client"
 AS_WEBCONSOLE_LIB="../lib"
 AS_JATO_LIB="../lib"
 AS_HADB="%HADB_HOME%"
-AS_DERBY_INSTALL="../javadb"
+AS_DERBY_INSTALL="../../javadb"
 AS_MFWK_HOME="%MFWK_HOME%"

data/domains/domain1/config/admin-keyfile

@@ -1 +1,3 @@
-anonymous;{SSHA}jBnM2TF2BglcyR3RtTfEXg0U18nbjwDKCfK9wg==;asadmin
+anonymous;{SSHA}OyEtavRpicpaAC6faDddGruZEYBNwDCij2SqhA==;asadmin
+
+# Domain User and Password - Do Not Delete Entry Above

data/domains/domain1/config/default-web.xml

@@ -86,7 +86,6 @@
   <!--                       entries can be slow and may consume            -->
   <!--                       significant proportions of server resources.   -->
   <!--                                                                      -->
-  <!--                                                                      -->
   <!--   output              Output buffer size (in bytes) when writing     -->
   <!--                       resources to be served.  [2048]                -->
   <!--                                                                      -->
@@ -1126,6 +1125,9 @@
     <welcome-file>index.jsp</welcome-file>
   </welcome-file-list>
 
+  <login-config>
+    <auth-method>BASIC</auth-method>
+  </login-config>
 
 </web-app>
 

data/domains/domain1/config/domain.xml

@@ -6,7 +6,7 @@
 <!-- Generated from default-domain.xml.template -->
 <!-- Avoid manual edits of this file. Run "gfadmin verify-domain-xml" otherwise.-->
 
-<domain application-root="${com.sun.aas.instanceRoot}/applications" log-root="${com.sun.aas.instanceRoot}/logs">
+<domain application-root="${com.sun.aas.instanceRoot}/applications" log-root="${jruby.log.location}">
     <applications/>
     <resources>
         <jdbc-resource pool-name="__TimerPool" jndi-name="jdbc/__TimerPool" object-type="system-admin"/>
@@ -76,7 +76,7 @@
                 <jms-host host="laturbie.sfbay.sun.com" name="default_JMS_host"/>
             </jms-service>
 
-            <log-service file="${jruby.log.location}" log-rotation-limit-in-bytes="2000000">
+            <log-service file="${jruby.log.file}" log-rotation-limit-in-bytes="2000000">
                 <module-log-levels/>
             </log-service>
 
@@ -180,10 +180,11 @@
 
 
             <thread-pools>
-                <thread-pool thread-pool-id="thread-pool-1"/>
+                <thread-pool name="http-thread-pool" max-queue-size="4096" />
+                <thread-pool name="thread-pool-1" max-thread-pool-size="200" />
             </thread-pools>
             <management-rules enabled="true"/>
         </config>
     </configs>
     <property value="domain1" name="administrative.domain.name"/>
-</domain>
+</domain>

data/domains/domain1/config/glassfish_gem_version.yml

@@ -4,4 +4,4 @@
 #directory was created by the different version of gem. 
 #
 glassfish:
-  version: 0.9.3
+  version: 0.9.4

data/domains/domain1/config/keyfile

@@ -1,6 +1,6 @@
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
-#
-
-# List of users for simple file realm. Empty by default.
+#
+# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+#
+
+# List of users for simple file realm. Empty by default.

data/domains/domain1/config/logging.properties

@@ -1,130 +1,46 @@
-############################################################
-#  	Default Logging Configuration File
-#
-# You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.  
-# For example java -Djava.util.logging.config.file=myfile
-############################################################
-
-############################################################
-#  	Global properties
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler 
-# classes.  These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the INFO and above levels.
-
-# In glassfish, it is not a good idea to add handlers this way
-# as it requires the handler to be on the system classpath.
-# A better approach is to define an HK2 component wich implements
-# the Hanlder contract :
-#
-# @Service(name="console")
-# @ContractProvided(Handler.class)
-# public class MyConsoleHandler implements Handler {
-#      // implementation of Handler interface
-# }
-
+#GlassFish logging.properties list
+#Mon Mar 16 22:32:12 PDT 2009
+javax.enterprise.system.tools.admin.level=INFO
 handlers=
-
-# To also add the FileHandler, use the following line instead.
-#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
-
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers.  For any given facility this global level
-# can be overriden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= INFO
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-# this is the default hanlder for Glassfish, it writes to a log file
-# The handler is not registered through the handlers property above
-# because the implementation is not on the system class path. 
-# GlassFish will register this handler automtically as it is 
-# and HK2 component like described above.
-# rotates the file based on time or size.
-com.sun.enterprise.server.logging.FileandSyslogHandler.file=${jruby.log.location}
-# rotation time in minutes (takes precedence on size if defined),
-# 0 for no rotation based on time
-com.sun.enterprise.server.logging.FileandSyslogHandler.rotationTimelimitInMinutes=0
-# rotation limit in bytes, 0 means no rotation, 500000 is the minimum
-com.sun.enterprise.server.logging.FileandSyslogHandler.rotationLimitInBytes=0
-# formatter used to format the log records in the server log file
-com.sun.enterprise.server.logging.FileandSyslogHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
-
-
-# default file output is in user's home directory.
-java.util.logging.FileHandler.pattern = %h/java%u.log
-java.util.logging.FileHandler.limit = 50000
-java.util.logging.FileHandler.count = 1
-java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
-
-# Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = INFO
-java.util.logging.ConsoleHandler.formatter = com.sun.enterprise.server.logging.UniformLogFormatter
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-# For example, set the com.xyz.foo logger to only log SEVERE
-# messages:
-com.xyz.foo.level = SEVERE
-
-#Some logger names for v3 are below just uncoment the line logger below and save the file.  The logging code will automatically be reconfigured. 
-#ROOTLOGGER
-#javax.enterprise.level=FINE
-#Tools Logger
-#javax.enterprise.system.tools.level=FINE
-# EJB Logger
-#javax.enterprise.system.container.ejb.level=FINE
-#JAVAMAIL_LOGGER
-#javax.enterprise.resource.javamail.level=FINE
-#JMS_LOGGER
-#javax.enterprise.resource.jms.level=FINE
-#WEB LOGGER
-#javax.enterprise.system.container.web.level=FINE
-#CMP_LOGGER
-#javax.enterprise.system.container.cmp.level=FINE
-#JDO_LOGGER
-#javax.enterprise.resource.jdo.level=FINE
-#ACC_LOGGER
-#javax.enterprise.system.container.appclient.level=FINE
-#MDB_LOGGER
-#javax.enterprise.system.container.ejb.mdb.level=FINE
-#SECURITY LOGGER 
-#javax.enterprise.system.core.security.level=FINE
-#TRANSACTION_LOGGER
-#javax.enterprise.system.core.transaction.level=FINE
-#CORBA_LOGGER
-#javax.enterprise.resource.corba.level=FINE
-#ADMIN LOGGER
-#javax.enterprise.system.tools.admin.level=FINE
-#DPL_LOGGER - deployment logger
-#javax.enterprise.system.tools.deployment.level=FINE
-#SAAJ_LOGGER
-#javax.enterprise.system.webservices.saaj.level=FINE
-#UTIL_LOGGER
-#javax.enterprise.system.util.level=FINE
-#NAMING_LOGGER
-#javax.enterprise.system.core.naming.level=FINE
-#CORE_LOGGER
-#javax.enterprise.system.core.level=FINE
-#LOADER_LOGGER
-#javax.enterprise.system.core.classloading.level=FINE
-#CONFIG_LOGGER
-#javax.enterprise.system.core.config.level=FINE
-#AMX_LOGGER
-#javax.enterprise.system.AMX.level=FINE
-
-
+java.util.logging.ConsoleHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
+org.apache.jasper.level=INFO
+javax.enterprise.resource.corba.level=INFO
+javax.enterprise.system.core.classloading.level=INFO
+javax.enterprise.resource.jta.level=INFO
+java.util.logging.ConsoleHandler.level=INFO
+com.sun.enterprise.server.logging.GFFileHandler.file=logs/server.log
+javax.enterprise.system.webservices.saaj.level=INFO
+java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
+javax.enterprise.system.tools.deployment.level=INFO
+javax.enterprise.system.container.ejb.level=INFO
+com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
+javax.enterprise.system.core.transaction.level=INFO
+org.apache.catalina.level=INFO
+com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
+javax.enterprise.system.container.ejb.mdb.level=INFO
+org.apache.coyote.level=INFO
+javax.level=INFO
+java.util.logging.FileHandler.limit=50000
+javax.enterprise.resource.javamail.level=INFO
+com.sun.enterprise.server.logging.GFFileHandler.logtoConsole=false
+javax.enterprise.system.webservices.rpc.level=INFO
+javax.enterprise.system.container.web.level=INFO
+javax.enterprise.system.util.level=INFO
+javax.enterprise.resource.resourceadapter.level=INFO
+javax.enterprise.resource.jms.level=INFO
+javax.enterprise.system.core.config.level=INFO
+com.sun.enterprise.server.logging.GFFileHandler.rotationLimitInBytes=0
+javax.enterprise.system.level=INFO
+javax.enterprise.system.core.security.level=INFO
+javax.enterprise.system.container.cmp.level=INFO
+java.util.logging.FileHandler.pattern=%h/java%u.log
+com.sun.enterprise.server.logging.SyslogHandler.useSystemLogging=false
+group-management-services=INFO
+com.sun.enterprise.server.logging.GFFileHandler.alarms=false
+javax.enterprise.system.webservices.registry.level=INFO
+javax.enterprise.system.core.selfmanagement.level=INFO
+.level=INFO
+java.util.logging.FileHandler.count=1
+javax.enterprise.resource.jdo.level=INFO
+javax.enterprise.system.core.naming.level=INFO
+com.sun.enterprise.server.logging.GFFileHandler.retainErrorsStasticsForHours=0

data/domains/domain1/config/login.conf

@@ -1,21 +1,21 @@
-/*  Copyright 2004 Sun Microsystems, Inc.  All rights reserved.    */
-/*  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. */
-
-fileRealm {
-	com.sun.enterprise.security.auth.login.FileLoginModule required;
-};
-
-ldapRealm {
-	com.sun.enterprise.security.auth.login.LDAPLoginModule required;
-};
-
-solarisRealm {
-	com.sun.enterprise.security.auth.login.SolarisLoginModule required;
-};
-
-jdbcRealm {
-	com.sun.enterprise.security.auth.login.JDBCLoginModule required;
-};
-jdbcDigestRealm {
-       com.sun.enterprise.security.auth.login.JDBCDigestLoginModule required;
-};
+/*  Copyright 2004 Sun Microsystems, Inc.  All rights reserved.    */
+/*  SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. */
+
+fileRealm {
+	com.sun.enterprise.security.auth.login.FileLoginModule required;
+};
+
+ldapRealm {
+	com.sun.enterprise.security.auth.login.LDAPLoginModule required;
+};
+
+solarisRealm {
+	com.sun.enterprise.security.auth.login.SolarisLoginModule required;
+};
+
+jdbcRealm {
+	com.sun.enterprise.security.auth.login.JDBCLoginModule required;
+};
+jdbcDigestRealm {
+       com.sun.enterprise.security.auth.login.JDBCDigestLoginModule required;
+};