glassfish 0.9.2-universal-java → 0.9.3-universal-java

data/lib/config.rb

@@ -0,0 +1,198 @@
+#--
+#DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+#Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+#
+#The contents of this file are subject to the terms of either the GNU
+#General Public License Version 2 only ("GPL") or the Common Development
+#and Distribution License("CDDL") (collectively, the "License").  You
+#may not use this file except in compliance with the License. You can obtain
+#a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+#or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
+#language governing permissions and limitations under the License.
+#
+#When distributing the software, include this License Header Notice in each
+#file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+#Sun designates this particular file as subject to the "Classpath" exception
+#as provided by Sun in the GPL Version 2 section of the License file that
+#accompanied this code.  If applicable, add the following below the License
+#Header, with the fields enclosed by brackets [] replaced by your own
+#identifying information: "Portions Copyrighted [year]
+#[name of copyright owner]"
+#
+#Contributor(s):
+#
+#If you wish your version of this file to be governed by only the CDDL or
+#only the GPL Version 2, indicate your decision by adding "[Contributor]
+#elects to include this software in this distribution under the [CDDL or GPL
+#Version 2] license."  If you don't indicate a single choice of license, a
+#recipient has the option to distribute your version of this file under
+#either the CDDL, the GPL Version 2 or to extend the choice of license to
+#its licensees as provided above.  However, if you add GPL Version 2 code
+#and therefore, elected the GPL Version 2 license, then the option applies
+#only if the new code is made subject to such option by the copyright
+#holder.
+#++
+
+require 'java'
+require 'yaml'
+require 'ftools'
+require 'socket'
+
+module GlassFish
+  class Config
+    LOG_LEVELS = (0..7)
+    PID_FILE = Dir.pwd+File::SEPARATOR+"tmp"+File::SEPARATOR+"pids"+File::SEPARATOR+"glassfish"
+    DEFAULT_JVM_OPTS = "-server -Xmx512m -XX:MaxPermSize=192m -XX:NewRatio=2 -XX:+DisableExplicitGC -Dhk2.file.directory.changeIntervalTimer=6000";
+
+    # Validates the configuration options. If it can will revert to default else 
+    # fail 
+    def validate config
+      # http configuration
+      # port
+      begin
+        server = TCPServer.new '0.0.0.0', config[:port]
+      rescue 
+        STDERR.puts "0.0.0.0:#{config[:port]}: " + $!      
+        #TODO: we should give an option of ephemeral port support
+        exit(1) 
+      end
+      server.close
+
+      # daemon
+      if(config[:daemon])
+        os = java.lang.System.getProperty("os.name").downcase
+        version = java.lang.System.getProperty("os.version")
+        #check the platform, Currently daemon mode works only on linux and 
+        #solaris
+        if(!os.include?("linux") and !os.include?("sunos"))
+          Config.fail "You are running on #{java.lang.System.getProperty("os.name")}  #{version}. Currently daemon mode only works on Linux or Solaris platforms!"
+        end
+        
+        if(config[:jvm_options].nil?)
+          config[:jvm_options] = DEFAULT_JVM_OPTS
+        end
+      end
+
+      # log_level
+      if not (0..7).include?(config[:log_level])
+        STDERR.puts "Invalid log level #{config[:log_level]}. Chose a number between 0 to 7."
+        Config.fail "\t0 OFF\n\t1 SEVERE \n\t2 WARNING\n\t3 INFO(default)\n\t4 FINE\n\t5 FINER\n\t6 FINEST\n\t7 ALL\n"
+      end
+
+      # JRuby runtime
+      runtimes_err = " Invalid runtime configuration, initial:#{config[:runtimes]}, min:#{config[:runtimes_min]}, max:#{config[:runtimes_max]}."
+      err = false
+      if(config[:runtimes] < 1 || config[:runtimes] > config[:runtimes_max] || config[:runtimes] < config[:runtimes_min])
+        err = true;
+        runtimes_err +=  "\n\tinitial runtime must be > 0, <= runtimes-max and >= runtimes-min."
+      end
+      if(config[:runtimes_min] < 1 || config[:runtimes_min] > config[:runtimes] || config[:runtimes_min] > config[:runtimes_max])
+        err = true;
+        runtimes_err += "\n\truntimes-min must be > 0, <=runtimes-max and <= initial_runtmes"
+      end
+      if(config[:runtimes_max] < 1 || config[:runtimes_max] < config[:runtimes_min] || config[:runtimes_max] < config[:runtimes])
+        err=true
+        runtimes_err += "\n\truntimes-max must be > 0, >=runtimes-min and >= initial_runtmes"
+      end
+      if(err)
+        Config.fail runtimes_err
+      end
+
+
+      # contextroot
+      # There is not much to validate here. For now we leave it as it is
+
+      # log configuration
+
+
+      # log-file
+      if(config[:log] == nil)
+        config[:log] = File.join(config[:app_dir], "log", config[:environment]+".log")
+      end
+
+      if not File.exists?(config[:log])
+        puts "Log file #{config[:log]} does not exist. Creating a new one..."
+        parent = File.dirname(config[:log])
+        if(!File.exists?parent)
+          FileUtils.mkdir_p parent
+        end
+        file = File.new(config[:log], "w")
+        file.close
+      end
+
+
+      # pid file validation is done latter on
+
+      #TODO: validate JVM options?
+
+      # By this time we know all is good. Now lets create the domain directory
+      domaindir = File.join(config[:app_dir], "tmp", ".glassfish")
+      config[:domain_dir] = File.expand_path(domaindir)
+
+      if !setup_temp_domain?File.join(domaindir, "config")
+        puts "ERROR: Failed to create GlassFish domain directory: #{domaindir}"
+        exit -1
+      end
+    end
+    
+    def self.fail(message)
+      STDERR.puts "ERROR: #{message}"
+      STDERR.puts "Type 'glassfish -h' to get help"
+      Kernel.exit -1
+    end
+    
+
+    private
+
+    #
+    #Create a domain directory and copy the domain.xml and logging.properties 
+    #there. This will take care of infamous bug that causes people to run 
+    # glassfish gem as sudo if jruby is installed as root
+    #
+    def setup_temp_domain? config_dir
+      if !File.exist? config_dir
+        FileUtils.mkdir_p config_dir
+      end
+      if !same_version?config_dir
+        return check_domain_dir? config_dir
+      end
+      true
+    end
+
+    def check_domain_dir?(config_dir)
+      if !File.writable_real?config_dir
+        return false
+      end
+      src = File.dirname(__FILE__)+File::SEPARATOR+".."+File::SEPARATOR+"domains"+File::SEPARATOR+"domain1"+File::SEPARATOR+"config"
+      File.cp(File.join(src,"domain.xml"), config_dir)
+      File.cp(File.join(src,"logging.properties"), config_dir)
+    end
+
+    #
+    #Returns true if there is glasfish_gem_version.yml file and has the same 
+    #version as the glassfish gem. Otherwise creates a new file and returns 
+    #false so that rest of the stuff can be created
+    #
+    def same_version?(config_dir)
+      f = File.join(config_dir, 'glassfish_gem_version.yml')
+      if !File.exist? f
+        src = File.join(File.dirname(__FILE__), "..", "domains", "domain1", "config", "glassfish_gem_version.yml")
+        File.cp src, config_dir
+        return false
+      end
+      file = File.open(f)
+      data = YAML::load(file)
+
+      #this is probably corrupted, return false so that a new one can be placed
+      if not data.key?'glassfish'
+        return false; 
+      end
+      version = data['glassfish'].fetch('version', nil)
+      if(version.nil?)
+        return false
+      end
+      version.eql?GlassFish::VERSION
+    end
+  end
+end

data/{modules/glassfish.rb → lib/gfraker.rb}

@@ -33,26 +33,9 @@
 #only if the new code is made subject to such option by the copyright
 #holder.
 #++
-
-require 'glassfish.jar'
-
-#
-#Invokes and runs GlassFish
-#
 module GlassFish
-  class Server
-    import com.sun.enterprise.glassfish.bootstrap.ASMain    
-    def startup(args)
-      #set jruby runtime property
-      java.lang.System.setProperty("jruby.runtime", args[:runtimes].to_s)
-      java.lang.System.setProperty("jruby.runtime.min", args[:runtimes_min].to_s)
-      java.lang.System.setProperty("jruby.runtime.max", args[:runtimes_max].to_s)
-      java.lang.System.setProperty("rails.env", args[:environment])
-      java.lang.System.setProperty("jruby.gem.port", args[:port].to_s)
-      java.lang.System.setProperty("GlassFish_Platform", "Static")
-      #java.lang.System.setProperty("glassfish.static.cache.dir", args[:app_dir]+"/tmp")
-
-      ASMain.main([args[:app_dir], "--contextroot", args[:contextroot]].to_java(:string))
-    end
+  HOME = File.expand_path(File.dirname(__FILE__) + '/..') unless defined?(GLASSFISH_HOME)
+  class Config
+    FILE = "config/glassfish.yml"
   end
-end
+end

data/lib/glassfish.rb

@@ -0,0 +1,78 @@
+#--
+#DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+#Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+#
+#The contents of this file are subject to the terms of either the GNU
+#General Public License Version 2 only ("GPL") or the Common Development
+#and Distribution License("CDDL") (collectively, the "License").  You
+#may not use this file except in compliance with the License. You can obtain
+#a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+#or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
+#language governing permissions and limitations under the License.
+#
+#When distributing the software, include this License Header Notice in each
+#file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+#Sun designates this particular file as subject to the "Classpath" exception
+#as provided by Sun in the GPL Version 2 section of the License file that
+#accompanied this code.  If applicable, add the following below the License
+#Header, with the fields enclosed by brackets [] replaced by your own
+#identifying information: "Portions Copyrighted [year]
+#[name of copyright owner]"
+#
+#Contributor(s):
+#
+#If you wish your version of this file to be governed by only the CDDL or
+#only the GPL Version 2, indicate your decision by adding "[Contributor]
+#elects to include this software in this distribution under the [CDDL or GPL
+#Version 2] license."  If you don't indicate a single choice of license, a
+#recipient has the option to distribute your version of this file under
+#either the CDDL, the GPL Version 2 or to extend the choice of license to
+#its licensees as provided above.  However, if you add GPL Version 2 code
+#and therefore, elected the GPL Version 2 license, then the option applies
+#only if the new code is made subject to such option by the copyright
+#holder.
+#++
+require 'java'
+require 'glassfish-gem.jar'
+require 'glassfish.jar'
+require 'akuma.jar'
+require 'yaml'
+require 'ftools'
+require 'version'
+
+
+#
+#Invokes and runs GlassFish
+#
+module GlassFish
+  class Server
+    import "org.glassfish.scripting.gem.GlassFishMain"
+    import "org.glassfish.scripting.gem.Options"
+
+    def startup(args)
+      if args[:log_level] > 4
+        puts "Arguments: "
+        args.each do |k, v| 
+          puts "\t#{k}=>#{v}"
+        end
+      end
+
+      opts = Options.new()
+      opts.runtimes = args[:runtimes]
+      opts.runtimes_min = args[:runtimes_min]
+      opts.runtimes_max = args[:runtimes_max]
+      opts.environment = args[:environment]
+      opts.port = args[:port]
+      opts.contextRoot = args[:contextroot]
+      opts.appDir = args[:app_dir]
+      opts.daemon = args[:daemon]
+      opts.pid = args[:pid]
+      opts.log = args[:log]
+      opts.domainDir = args[:domain_dir]
+      opts.log_level = args[:log_level]
+      opts.jvm_opts = args[:jvm_options]
+      gf = GlassFishMain.start opts
+    end
+  end
+end

data/lib/templates/domain.xml

@@ -65,7 +65,7 @@
         <jmx-connector auth-realm-name="admin-realm" security-enabled="false" address="0.0.0.0" port="%%%JMX_SYSTEM_CONNECTOR_PORT%%%" name="system" />
         <das-config autodeploy-enabled="true" dynamic-reload-enabled="true" deploy-xml-validation="full" autodeploy-dir="${com.sun.aas.instanceRoot}/autodeploy" />
         <property value="/admin" name="adminConsoleContextRoot" />
-        <property value="glassfish/lib/install/applications/admingui.war" name="adminConsoleDownloadLocation" />
+        <property value="${com.sun.aas.installRoot}/lib/install/applications/admingui.war" name="adminConsoleDownloadLocation" />
         <property value="${com.sun.aas.installRoot}/.." name="ipsRoot" />
       </admin-service>
       <web-container>

data/{modules → lib}/version.rb

@@ -35,7 +35,6 @@
 #++
 
 module GlassFish
-  module VERSION
-    STRING = "0.9.2"
-  end
+  VERSION = "0.9.3"
+  FULLVERSION = "GlassFish gem version: #{VERSION}\nhttp://glassfishgem.rubyforge.org"
 end

metadata

@@ -1,60 +1,72 @@
 --- !ruby/object:Gem::Specification 
-extensions: []
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - '>='
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+email: vivek.pandey@sun.com, jerome.dochez@sun.com
+cert_chain: []
+
+summary: GlassFish V3 Application Server for JRuby
+post_install_message: 
+extra_rdoc_files: 
+- LICENSE.txt
+- COPYRIGHT
+homepage: http://glassfishgem.rubyforge.org/
+signing_key: 
+name: glassfish
+rdoc_options: []
 
-homepage: http://wiki.glassfish.java.net/Wiki.jsp?page=JRuby
+autorequire: 
+rubyforge_project: glassfishgem
 executables: 
 - glassfish
 - glassfish_rails
-- gfadmin
-version: !ruby/object:Gem::Version 
-  version: 0.9.2
-post_install_message: 
-date: 2009-01-30 08:00:00 +00:00
+- gfrake
+description: GlassFish gem is an embedded GlassFish V3 application server which would
+  help run your Ruby on Rails application
+specification_version: 2
+default_executable: glassfish
 files: 
-- bin/gfadmin
+- bin/gfrake
 - bin/glassfish
 - bin/glassfish_rails
-- lib/templates
-- lib/registration
-- lib/processLauncher.xml
-- lib/processLauncher.properties
-- lib/package-appclient.xml
-- lib/jndi-properties.jar
 - lib/appclient
-- lib/templates/server.policy
-- lib/templates/profile.properties
-- lib/templates/login.conf
-- lib/templates/logging.properties
-- lib/templates/keystore.jks
-- lib/templates/keyfile
-- lib/templates/domain.xml.xsl
-- lib/templates/domain.xml
-- lib/templates/default-web.xml
-- lib/templates/cacerts.jks
-- lib/registration/servicetag-registry.xml
-- lib/appclient/wss-client-config-2.0.xml
-- lib/appclient/wss-client-config-1.0.xml
-- lib/appclient/client.policy
+- lib/asadmin.rb
+- lib/command_line_parser.rb
+- lib/config.rb
+- lib/gfraker.rb
+- lib/glassfish.rb
+- lib/rdoc_usage.rb
+- lib/registration
+- lib/templates
+- lib/version.rb
 - lib/appclient/appclientlogin.conf
-- modules/tiger-types-osgi.jar
-- modules/pkg-client.jar
-- modules/launcher.jar
-- modules/kernel.jar
-- modules/internal-api.jar
-- modules/hk2.jar
-- modules/hk2-core.jar
-- modules/grizzly-utils.jar
-- modules/grizzly-rcm.jar
-- modules/grizzly-portunif.jar
-- modules/grizzly-http.jar
-- modules/grizzly-framework.jar
-- modules/glassfish.jar
-- modules/cli-framework.jar
-- modules/branding.jar
-- modules/auto-depends.jar
-- modules/asm-all-repackaged.jar
-- modules/api-exporter.jar
+- lib/appclient/client.policy
+- lib/appclient/wss-client-config-1.0.xml
+- lib/appclient/wss-client-config-2.0.xml
+- lib/registration/servicetag-registry.xml
+- lib/templates/cacerts.jks
+- lib/templates/default-web.xml
+- lib/templates/domain.xml
+- lib/templates/domain.xml.xsl
+- lib/templates/keyfile
+- lib/templates/keystore.jks
+- lib/templates/logging.properties
+- lib/templates/login.conf
+- lib/templates/profile.properties
+- lib/templates/server.policy
+- generators/gfrake
+- generators/gfrake/templates
+- generators/gfrake/templates/glassfish.yml
 - modules/admin-cli.jar
+- modules/akuma.jar
+- modules/api-exporter.jar
+- modules/asm-all-repackaged.jar
+- modules/auto-depends.jar
+- modules/branding.jar
+- modules/cli-framework.jar
 - modules/common-util.jar
 - modules/config-api.jar
 - modules/config.jar
@@ -63,103 +75,96 @@ files:
 - modules/deployment-common.jar
 - modules/flashlight-agent.jar
 - modules/flashlight-framework.jar
-- modules/glassfish-api.jar
-- modules/grizzly-jruby.jar
 - modules/gf-jruby-connector.jar
+- modules/glassfish-api.jar
+- modules/glassfish-gem.jar
+- modules/glassfish.jar
+- modules/grizzly-framework.jar
+- modules/grizzly-http.jar
 - modules/grizzly-jruby-module.jar
-- modules/command_line_parser.rb
-- modules/version.rb
-- modules/glassfish.rb
-- modules/rdoc_usage.rb
-- modules/asadmin.rb
+- modules/grizzly-jruby.jar
+- modules/grizzly-portunif.jar
+- modules/grizzly-rcm.jar
+- modules/grizzly-utils.jar
+- modules/hk2-core.jar
+- modules/hk2.jar
+- modules/internal-api.jar
+- modules/kernel.jar
+- modules/launcher.jar
+- modules/pkg-client.jar
+- modules/tiger-types-osgi.jar
 - config/asadminenv.conf
 - config/asenv.bat
 - config/asenv.conf
 - config/glassfish.container
 - domains/domain1
-- domains/domain1/master-password
-- domains/domain1/docroot
-- domains/domain1/config
 - domains/domain1/applications
+- domains/domain1/config
+- domains/domain1/docroot
 - domains/domain1/generated
 - domains/domain1/logs
+- domains/domain1/master-password
 - domains/domain1/session-store
-- domains/domain1/docroot/index.html
-- domains/domain1/docroot/favicon.gif
-- domains/domain1/config/wss-server-config-2.0.xml
-- domains/domain1/config/wss-server-config-1.0.xml
-- domains/domain1/config/sun-acc.xml
-- domains/domain1/config/server.policy
-- domains/domain1/config/login.conf
-- domains/domain1/config/logging.properties
-- domains/domain1/config/keystore.jks
-- domains/domain1/config/keyfile
-- domains/domain1/config/domain.xml
-- domains/domain1/config/domain-passwords
-- domains/domain1/config/default-web.xml
-- domains/domain1/config/cacerts.jks
+- domains/domain1/applications/j2ee-apps
+- domains/domain1/applications/j2ee-modules
+- domains/domain1/applications/lifecycle-modules
+- domains/domain1/applications/mbeans
 - domains/domain1/config/admin-keyfile
+- domains/domain1/config/cacerts.jks
 - domains/domain1/config/default-config
+- domains/domain1/config/default-web.xml
+- domains/domain1/config/domain-passwords
+- domains/domain1/config/domain.xml
+- domains/domain1/config/glassfish_gem_version.yml
+- domains/domain1/config/keyfile
+- domains/domain1/config/keystore.jks
+- domains/domain1/config/logging.properties
+- domains/domain1/config/login.conf
+- domains/domain1/config/server.policy
+- domains/domain1/config/sun-acc.xml
+- domains/domain1/config/wss-server-config-1.0.xml
+- domains/domain1/config/wss-server-config-2.0.xml
 - domains/domain1/config/default-config/docroot
 - domains/domain1/config/default-config/lib
 - domains/domain1/config/default-config/lib/ext
-- domains/domain1/applications/j2ee-apps
-- domains/domain1/applications/j2ee-modules
-- domains/domain1/applications/lifecycle-modules
-- domains/domain1/applications/mbeans
+- domains/domain1/docroot/favicon.gif
+- domains/domain1/docroot/index.html
 - domains/domain1/generated/ejb
 - domains/domain1/generated/jsp
 - domains/domain1/generated/xml
 - LICENSE.txt
 - COPYRIGHT
-rubygems_version: 1.0.1
-rdoc_options: []
-
-signing_key: 
-cert_chain: []
-
-name: glassfish
-has_rdoc: true
-platform: universal-java
-summary: GlassFish V3 Application Server for JRuby
-default_executable: glassfish
-bindir: bin
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  version: 
   requirements: 
   - - '>='
     - !ruby/object:Gem::Version 
       version: "0"
-required_ruby_version: !ruby/object:Gem::Requirement 
   version: 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-require_paths: 
-- modules
-specification_version: 2
+extensions: []
+
+rubygems_version: 1.2.0
+requirements: []
+
+authors: 
+- Vivek Pandey, Jerome Dochez
+date: 2009-03-15 07:00:00 +00:00
+platform: universal-java
 test_files: []
 
+version: !ruby/object:Gem::Version 
+  version: 0.9.3
+require_paths: 
+- lib
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
-  version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
-    version: 
     requirements: 
     - - '>='
       - !ruby/object:Gem::Version 
         version: 0.4.0
-description: GlassFish gem is an embedded GlassFish V3 application server which would
-  help run your Ruby on Rails application
-email: vivek.pandey@sun.com, jerome.dochez@sun.com
-authors: 
-- Vivek Pandey, Jerome Dochez
-extra_rdoc_files: 
-- LICENSE.txt
-- COPYRIGHT
-requirements: []
-
-rubyforge_project: glassfishgem
-autorequire: 
+    version: 
+  type: :runtime
+  version_requirement: 
+  name: rack
+bindir: bin
+has_rdoc: true