torquebox-core 3.2.0-java → 4.0.0.alpha1-java

data/lib/torquebox/cli/war.rb

@@ -0,0 +1,140 @@
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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.
+
+require 'torquebox-core'
+
+module TorqueBox
+  class CLI
+    class War < Jar
+
+      def usage_parameters
+        "[options] [rackup_file]"
+      end
+
+      def option_defaults
+        super.merge(:war_name => "#{File.basename(Dir.pwd)}.war")
+      end
+
+      def available_options
+        super
+          .reject { |v| v[:name] == :jar_name }
+          .unshift(:name => :war_name,
+                   :switch => '--name NAME',
+                   :description => "Name of the war file (default: #{option_defaults[:war_name]})")
+          .push(:name => :resource_paths,
+                :switch => '--resource-paths PATHS',
+                :description => "Paths whose contents will be included at the top-level of the war\
+ (default: none)",
+                :type => Array)
+          .push(:name => :context_path,
+                :switch => '--context-path PATH',
+                :description => "Deploys the war to the given context path (default: the name of\
+ the war)")
+          .push(:name => :virtual_host,
+                :switch => '--virtual-host HOST',
+                :description => "Deploys the war to the named host defined in the WildFly config\
+ (default: none)")
+          .push(:name => :env,
+                :switch => '--env ENVIRONMENT',
+                :short => '-e',
+                :description => "Environment to run under (default: development)")
+      end
+
+      def run(argv, options)
+        unless argv.empty?
+          options[:rackup] = argv.shift
+        end
+        options = option_defaults.merge(options)
+        if options[:env]
+          options[:envvar]['RACK_ENV'] = options[:env]
+          options[:envvar]['RAILS_ENV'] = options[:env]
+        end
+        jar_options = options.dup
+        jar_options.delete(:destination)
+        jar_path = super(argv, jar_options)
+        begin
+          war_path = File.join(options[:destination], options[:war_name])
+          war_builder = org.torquebox.core.JarBuilder.new
+
+          (options[:resource_paths] || []).each do |path|
+            @logger.info("Copying contents of {} to war", path)
+            add_files(war_builder,
+                      :file_prefix => path,
+                      :pattern => "**/*")
+          end
+
+          add_web_xml(war_builder)
+          add_jboss_deployment_structure_xml(war_builder)
+          add_jboss_web_xml(war_builder, options)
+
+          war_builder.add_file("WEB-INF/lib/#{File.basename(jar_path)}", jar_path)
+
+          if File.exist?(war_path)
+            @logger.info("Removing {}", war_path)
+            FileUtils.rm_f(war_path)
+          end
+          @logger.info("Writing {}", war_path)
+          war_builder.create(war_path)
+        ensure
+          @logger.info("Removing {}", jar_path)
+          FileUtils.rm_f(jar_path)
+        end
+      end
+
+      protected
+
+      def add_web_xml(war_builder)
+        unless war_builder.has_entry('WEB-INF/web.xml')
+          war_builder.add_string('WEB-INF/web.xml',
+                                 read_base_xml('web.xml'))
+        end
+      end
+
+      def add_jboss_deployment_structure_xml(war_builder)
+        unless war_builder.has_entry('WEB-INF/jboss-deployment-structure.xml')
+          war_builder.add_string('WEB-INF/jboss-deployment-structure.xml',
+                                 read_base_xml('jboss-deployment-structure.xml'))
+        end
+      end
+
+      def add_jboss_web_xml(war_builder, options)
+        jboss_web = 'WEB-INF/jboss-web.xml'
+        context_path = options[:context_path]
+        virtual_host = options[:virtual_host]
+
+        if context_path || virtual_host
+          if war_builder.has_entry(jboss_web)
+            @logger.warn("context-path or virtual-host specified, but a #{jboss_web} exists in\
+ resource-paths. Ignoring options.")
+          else
+            root_el = context_path ? "  <context-root>#{context_path}</context-root>\n" : ''
+            host_el = virtual_host ? "  <virtual-host>#{virtual_host}</virtual-host>\n" : ''
+            war_builder.add_string(jboss_web,
+                                   "<jboss-web>\n#{root_el}#{host_el}</jboss-web>")
+          end
+        end
+      end
+
+      def read_base_xml(name)
+        java.lang.Thread.current_thread
+          .context_class_loader
+          .resource_as_string("base-xml/#{name}")
+      end
+
+    end
+  end
+end
+
+TorqueBox::CLI.register_extension('war', TorqueBox::CLI::War.new,
+                                  'Create a deployable war from an application')

data/lib/torquebox/codecs.rb

@@ -1,55 +1,44 @@
-# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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.
 
 # These codecs don't depend on anything outside Ruby stdlib
 require 'torquebox/codecs/marshal'
 require 'torquebox/codecs/marshal_base64'
 require 'torquebox/codecs/marshal_smart'
+require 'torquebox/codecs/text'
 
 # These codecs depend on external gems - attempt to load them
 # but ignore any load errors and we'll lazily try again later
 require 'torquebox/codecs/json' rescue nil
 require 'torquebox/codecs/edn' rescue nil
 
+java_import org.projectodd.wunderboss.codecs.Codecs
+java_import org.projectodd.wunderboss.codecs.None
+
 module TorqueBox
   module Codecs
     class << self
 
+      def add(codec)
+        java_codecs.add(codec)
+        self
+      end
+
       def [](key)
-        case key
-        when :edn
-          # This is only so any issues requiring the edn codec bubble
-          # up when it gets used
-          require 'torquebox/codecs/edn' unless defined?(TorqueBox::Codecs::EDN)
-          TorqueBox::Codecs::EDN
-        when :json
-          # This is only so any issues requiring the json codec bubble
-          # up when it gets used
-          require 'torquebox/codecs/json' unless defined?(TorqueBox::Codecs::JSON)
-          TorqueBox::Codecs::JSON
-        when :marshal
-          TorqueBox::Codecs::Marshal
-        when :marshal_base64
-          MarshalBase64
-        when :marshal_smart
-          MarshalSmart
-        else
-          raise "Unsupported codec #{key}"
-        end
+        java_codecs.for_content_type(key.to_s) ||
+          java_codecs.for_name(key.to_s) ||
+          fail("Unsupported codec #{key}")
       end
 
       def encode(data, encoding)
@@ -60,6 +49,16 @@ module TorqueBox
         self[encoding].decode(data)
       end
 
+      def java_codecs
+        @codecs ||= org.projectodd.wunderboss.codecs.Codecs.new
+      end
     end
   end
 end
+
+TorqueBox::Codecs.add(TorqueBox::Codecs::EDN.new)
+TorqueBox::Codecs.add(TorqueBox::Codecs::JSON.new)
+TorqueBox::Codecs.add(TorqueBox::Codecs::Marshal.new)
+TorqueBox::Codecs.add(TorqueBox::Codecs::MarshalBase64.new)
+TorqueBox::Codecs.add(TorqueBox::Codecs::MarshalSmart.new)
+TorqueBox::Codecs.add(TorqueBox::Codecs::Text.new)

data/lib/torquebox/codecs/edn.rb

@@ -1,36 +1,51 @@
-# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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.
 
-require 'edn'
+java_import org.projectodd.wunderboss.codecs.StringCodec
 
 module TorqueBox
   module Codecs
-    module EDN
-      class << self
+    class EDN < StringCodec
 
-        def encode(data)
-          data.to_edn
-        end
+      def initialize
+        super("edn", "application/edn")
+      end
 
-        def decode(data)
-          ::EDN.read(data) unless data.nil?
+      # @api private
+      def require_edn
+        # We don't ship our own edn, but can use it if the user
+        # installs it.
+        unless defined?(::EDN)
+          begin
+            require 'edn'
+          rescue LoadError
+            raise RuntimeError.new("Unable to load the edn gem. Verify that "\
+                                   "is installed and in your Gemfile (if using Bundler)")
+          end
         end
+      end
 
+      def encode(data)
+        require_edn
+        data.to_edn
       end
+
+      def decode(data)
+        require_edn
+        ::EDN.read(data) unless data.nil?
+      end
+
     end
   end
 end

data/lib/torquebox/codecs/json.rb

@@ -1,61 +1,62 @@
-# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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.
 
+java_import org.projectodd.wunderboss.codecs.StringCodec
 
 module TorqueBox
   module Codecs
-    module JSON
-      class << self
+    class JSON < StringCodec
 
-        # @api private
-        def require_json
-          # We can't ship our own json, as it may collide with the gem
-          # requirement for the app.
-          if !defined?( ::JSON )
-            begin
-              require 'json'
-            rescue LoadError => ex
-              raise RuntimeError.new( "Unable to load the json gem. Verify that is installed and in your Gemfile (if using Bundler)" )
-            end
-          end
-        end
+      def initialize
+        super("json", "application/json")
+      end
 
-        def encode(data)
-          require_json
+      # @api private
+      def require_json
+        # We can't ship our own json, as it may collide with the gem
+        # requirement for the app.
+        unless defined?(::JSON)
           begin
-            if ( data.respond_to?( :as_json ) )
-              data = data.as_json
-            end
-            ::JSON.fast_generate( data ) unless data.nil?
-          rescue ::JSON::GeneratorError
-            ::JSON.dump(data)
+            require 'json'
+          rescue LoadError
+            raise RuntimeError.new("Unable to load the json gem. Verify that "\
+                                   "is installed and in your Gemfile (if using Bundler)")
           end
         end
+      end
 
-        def decode(data)
-          require_json
-          begin
-            ::JSON.parse( data, :symbolize_names => true ) unless data.nil?
-          rescue ::JSON::ParserError
-            ::JSON.load(data)
+      def encode(data)
+        require_json
+        begin
+          if data.respond_to?(:as_json)
+            data = data.as_json
           end
+          ::JSON.fast_generate(data) unless data.nil?
+        rescue ::JSON::GeneratorError
+          ::JSON.dump(data)
         end
+      end
 
+      def decode(data)
+        require_json
+        begin
+          ::JSON.parse(data, :symbolize_names => true) unless data.nil?
+        rescue ::JSON::ParserError
+          ::JSON.load(data)
+        end
       end
+
     end
   end
 end

data/lib/torquebox/codecs/marshal.rb

@@ -1,35 +1,35 @@
-# Copyright 2008-2013 Red Hat, Inc, and individual contributors.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+# Copyright 2014 Red Hat, Inc, and individual contributors.
+#
+# 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.
 
+java_import org.projectodd.wunderboss.codecs.BytesCodec
 
 module TorqueBox
   module Codecs
-    module Marshal
-      class << self
+    class Marshal < BytesCodec
 
-        def encode(data)
-          ::Marshal.dump(data) unless data.nil?
-        end
-        
-        def decode(data)
-          ::Marshal.restore(data) unless data.nil?
-        end
+      def initialize
+        super("marshal", "application/ruby-marshal")
+      end
+
+      def encode(data)
+        ::Marshal.dump(data).to_java_bytes unless data.nil?
+      end
 
+      def decode(data)
+        ::Marshal.restore(String.from_java_bytes(data)) unless data.nil?
       end
+
     end
   end
 end