diff --git a/lib/liberty_buildpack/container/liberty.rb b/lib/liberty_buildpack/container/liberty.rb
index 6be4cd704..a0540f318 100644
--- a/lib/liberty_buildpack/container/liberty.rb
+++ b/lib/liberty_buildpack/container/liberty.rb
@@ -550,7 +550,8 @@ def download_and_install_liberty
 
         # read opt-out of service bindings information from env (manifest.yml), and initialise
         # services manager, which will be used to list dependencies for any bound services.
-        @services_manager = ServicesManager.new(@vcap_services, runtime_vars_dir(root), @environment['services_autoconfig_excludes'])
+        context = { app_dir: @app_dir, java_home: @java_home }
+        @services_manager = ServicesManager.new(@vcap_services, runtime_vars_dir(root), @environment['services_autoconfig_excludes'], context)
 
         # if the liberty feature manager and repository are not being used to install server
         # features, download the required files from the various configured locations. If the
diff --git a/lib/liberty_buildpack/container/services_manager.rb b/lib/liberty_buildpack/container/services_manager.rb
index 7cb1f05c8..78da964db 100644
--- a/lib/liberty_buildpack/container/services_manager.rb
+++ b/lib/liberty_buildpack/container/services_manager.rb
@@ -32,10 +32,11 @@ module LibertyBuildpack::Container
   # The class that encapsulate access to services and services information.
   class ServicesManager
 
-    def initialize(vcap_services, server_dir, opt_out_string)
+    def initialize(vcap_services, server_dir, opt_out_string, context = nil)
       @logger = LibertyBuildpack::Diagnostics::LoggerFactory.get_logger
       @logger.debug("init: server dir is #{server_dir}, vcap_services is #{LibertyBuildpack::Util.safe_vcap_services(vcap_services)} and opt_out is #{opt_out_string}")
       @opt_out = parse_opt_out(opt_out_string)
+      @context = context
       FileUtils.mkdir_p(server_dir)
       # The collection of service instances that require full autoconfig
       @services_full_autoconfig = []
@@ -411,7 +412,11 @@ def create_instance(element, type, config, instance_data)
       # require the file
       filename = File.join(File.expand_path('..', File.dirname(__FILE__)), 'services', file)
       require filename
-      instance = class_name.constantize.new(type, config)
+      if class_name.constantize.instance_method(:initialize).parameters.map(&:last).map(&:to_s).include? 'context'
+        instance = class_name.constantize.new(type, config, @context)
+      else
+        instance = class_name.constantize.new(type, config)
+      end
       instance.parse_vcap_services(element, instance_data)
       instance
     end
diff --git a/lib/liberty_buildpack/services/compose_postgresql.rb b/lib/liberty_buildpack/services/compose_postgresql.rb
new file mode 100644
index 000000000..b7c90d434
--- /dev/null
+++ b/lib/liberty_buildpack/services/compose_postgresql.rb
@@ -0,0 +1,96 @@
+# Encoding: utf-8
+# IBM WebSphere Application Server Liberty Buildpack
+# Copyright 2014 the original author or authors.
+#
+# 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 'base64'
+require 'rexml/document'
+require 'liberty_buildpack/services/client_jar_utils'
+require 'liberty_buildpack/services/postgresql'
+
+module LibertyBuildpack::Services
+
+  #------------------------------------------------------------------------------------
+  # The ComposePostgreSQL class is the class for Compose for PostgreSQL relational database resources.
+  #------------------------------------------------------------------------------------
+  class ComposePostgreSQL < PostgreSQL
+
+    #------------------------------------------------------------------------------------
+    # Initialize
+    #
+    # @param type - the vcap_services type
+    # @param config - a hash containing the configuration data from the yml file.
+    #------------------------------------------------------------------------------------
+    def initialize(type, config, context)
+      super(type, config)
+      @config_type = 'compose-postgresql'
+      @app_dir = context[:app_dir]
+    end
+
+    #-----------------------------------------------------------------------------------------
+    # parse the vcap services and create cloud properties
+    #
+    # @param element - the root element of the REXML document for runtime-vars.xml
+    # @param instance - the hash containing the vcap_services data for this instance
+    #------------------------------------------------------------------------------------------
+    def parse_vcap_services(element, instance)
+      super
+
+      credentials = instance['credentials'] || {}
+
+      # fix the database name as the relational_db uses 'name' from vcap_services
+      # which does not match the actual database name in compose
+      service_uri = credentials['uri']
+      uri = URI.parse(service_uri)
+      db_var_name = "cloud.services.#{@service_name}.connection.db"
+      new_element = REXML::Element.new('variable', element)
+      new_element.add_attribute('name', db_var_name)
+      new_element.add_attribute('value', uri.path[1..-1])
+      @db_name = "${#{db_var_name}}"
+
+      @service_cert = credentials['ca_certificate_base64']
+      raise "Resource #{@service_name} does not contain a #{conn_prefix}uri property" if @service_cert.nil?
+    end
+
+    protected
+
+    #------------------------------------------------------------------------------------
+    # Method to customize properties - called on create or update.
+    #
+    # @param properties_element - the properties element
+    #------------------------------------------------------------------------------------
+    def modify_properties(properties_element)
+      save_cert
+
+      properties_element.add_attribute('ssl', 'true')
+      properties_element.add_attribute('sslMode', 'verify-ca')
+      properties_element.add_attribute('sslRootCert', "/home/vcap/app/#{CRT_DIRECTORY}/#{CRT_FILE}")
+    end
+
+    private
+
+    CRT_DIRECTORY = '.compose_postgresql'.freeze
+
+    CRT_FILE = 'cacert.pem'.freeze
+
+    def save_cert
+      cert_dir = File.join(@app_dir, CRT_DIRECTORY)
+      FileUtils.mkdir_p(cert_dir)
+      cert_file = File.join(cert_dir, CRT_FILE)
+      File.open(cert_file, 'w+') { |f| f.write(Base64.decode64(@service_cert)) }
+    end
+
+  end
+
+end
diff --git a/lib/liberty_buildpack/services/config/compose_postgresql.yml b/lib/liberty_buildpack/services/config/compose_postgresql.yml
new file mode 100644
index 000000000..46a7c868c
--- /dev/null
+++ b/lib/liberty_buildpack/services/config/compose_postgresql.yml
@@ -0,0 +1,34 @@
+# IBM WebSphere Application Server Liberty Buildpack
+# Copyright 2014 the original author or authors.
+#
+# 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.
+
+# Service configuration
+---
+# attributes required by all service plugins
+class_name : LibertyBuildpack::Services::ComposePostgreSQL
+class_file : compose_postgresql.rb
+server_xml_stanza : dataSource
+service_filter : 'compose-for-postgresql'
+
+# plugin specific attributes
+features: 
+ if: ['jdbc-4.0']
+ then: []
+ else: ['jdbc-4.1']
+
+client_jars : 'postgresql-.*.jar'
+
+driver:
+  version: 9.4.+
+  repository_root: "https://download.run.pivotal.io/postgresql-jdbc"
diff --git a/lib/liberty_buildpack/services/config/postgresql.yml b/lib/liberty_buildpack/services/config/postgresql.yml
index f05e109ab..04fec4a4a 100644
--- a/lib/liberty_buildpack/services/config/postgresql.yml
+++ b/lib/liberty_buildpack/services/config/postgresql.yml
@@ -19,7 +19,7 @@
 class_name : LibertyBuildpack::Services::PostgreSQL
 class_file : postgresql.rb
 server_xml_stanza : dataSource
-service_filter : 'postgresql|elephantsql'
+service_filter : '(?<!compose-for-)postgresql|elephantsql'
 
 # plugin specific attributes
 features: 
diff --git a/lib/liberty_buildpack/services/mysql.rb b/lib/liberty_buildpack/services/mysql.rb
index dfd7fb8e9..4c175f42d 100644
--- a/lib/liberty_buildpack/services/mysql.rb
+++ b/lib/liberty_buildpack/services/mysql.rb
@@ -51,63 +51,25 @@ def create_connection_manager(ds)
       cm.add_attribute('maxPoolSize', cp_size)
     end
 
+    protected
+
     #------------------------------------------------------------------------------------
-    # Method to create a jdbc driver.
-    # This method will also create the library associated with the jdbc driver.
+    # Method to customize jdbcDriver - called on create or update.
     #
-    # @param doc - the root element of the REXML::Document for server.xml
-    # @param lib_dir - the directory where client driver jars are located
-    # @raise if an internal inconsistency was found.
+    # @param jdbc_driver - an array containing all jdbcDriver elements with a given id.
     #------------------------------------------------------------------------------------
-    def create_jdbcdriver(doc, jdbc_driver_id, lib_id, fileset_id, lib_dir)
-      # We assume a consistent server.xml. If the datasource did not exist, then this must be a pure "push app" use case. If it is a "push server.xml"
-      # case, then failure to find the datasource indicates server.xml is not consistent.
-      # TODO: surprisingly, the following will find the driver even if it is imbedded in another datasource.
-      # We could probably use XPATH /server/jdbcDriver to limit the search to global.
-      drivers = doc.elements.to_a("//jdbcDriver[@id='#{jdbc_driver_id}']")
-      # if we find an existing jdbc driver, then one of two things has occurred
-      # 1) case of pushing server.xml, but datasource not found (user error)
-      # 2) case of pushing a web app and multiple instances of a given resource type (db2) were bound. The JDBC driver was already created when
-      #    we created the datasource for a previously processed instance. All instances of a resource type share the same JDBCDriver and library.
-      if drivers.empty?
-        # Not found, create it. The JDBC Driver is created as a global element and not nested underneath the datasource.
-        # puts "jdbcDriver #{jdbc_driver_id} not found, creating it"
-        # create the jdbcDriver
-        driver = REXML::Element.new('jdbcDriver', doc.root)
-        driver.add_attribute('id', jdbc_driver_id)
-        driver.add_attribute('javax.sql.XADataSource', 'org.mariadb.jdbc.MySQLDataSource')
-        driver.add_attribute('javax.sql.ConnectionPoolDataSource', 'org.mariadb.jdbc.MySQLDataSource')
-        driver.add_attribute('libraryRef', lib_id)
-        # create the shared library. It should not exist.
-        ClientJarUtils.create_global_library(doc, lib_id, fileset_id, lib_dir, @client_jars_string)
-      end
+    def modify_jdbc_driver(jdbcdrivers)
+      Utils.find_and_update_attribute(jdbcdrivers, 'javax.sql.XADataSource', 'org.mariadb.jdbc.MySQLDataSource')
+      Utils.find_and_update_attribute(jdbcdrivers, 'javax.sql.ConnectionPoolDataSource', 'org.mariadb.jdbc.MySQLDataSource')
     end
 
     #------------------------------------------------------------------------------------
-    # Method to create/update a datasource stanza (and all related sub-artifacts such as the JDBCDriver) in server.xml.
+    # Method to customize dataSource - called on create or update.
     #
-    # @param doc - the root element of the REXML::Document for server.xml
-    # @param server_dir - the server directory which is the location for bootstrap.properties and jvm.options
-    # @param driver_dir - the symbolic name of the directory where client jars are installed
-    # @param available_jars - an array containing the names of all installed client driver jars.
-    # @param number_instances - the number of service instances that update the same service-specific server.xml stanzas
-    # @raise if a problem was discovered (incoherent or inconsistent existing configuration, for example)
+    # @param datasources - an array containing all dataSource stanzas with a given id.
     #------------------------------------------------------------------------------------
-    def update(doc, server_dir, driver_dir, available_jars, number_instances)
-      super
-      # Find the datasource config for this service instance.
-      datasource = find_datasource(doc, number_instances)
-      unless datasource.empty?
-        # Make sure the correct type is added if the datasource already exists.
-        Utils.find_and_update_attribute(datasource, 'type', 'javax.sql.ConnectionPoolDataSource')
-
-        # Update the javax.sql.ConnectionPoolDataSource to use the mysql implementation.
-        jdbc_attribute = Utils.find_attribute(datasource, 'jdbcDriverRef')
-        unless jdbc_attribute.nil?
-          driver = doc.elements.to_a("//jdbcDriver[@id='#{jdbc_attribute}']")
-          Utils.find_and_update_attribute(driver, 'javax.sql.ConnectionPoolDataSource', 'org.mariadb.jdbc.MySQLDataSource')
-        end
-      end
+    def modify_datasource(datasources)
+      Utils.find_and_update_attribute(datasources, 'type', 'javax.sql.ConnectionPoolDataSource')
     end
 
   end
diff --git a/lib/liberty_buildpack/services/postgresql.rb b/lib/liberty_buildpack/services/postgresql.rb
index d90ce5ccc..eb49bca84 100644
--- a/lib/liberty_buildpack/services/postgresql.rb
+++ b/lib/liberty_buildpack/services/postgresql.rb
@@ -37,63 +37,25 @@ def initialize(type, config)
       @properties_type = 'properties'
     end
 
+    protected
+
     #------------------------------------------------------------------------------------
-    # Method to create a jdbc driver.
-    # This method will also create the library associated with the jdbc driver.
+    # Method to customize jdbcDriver - called on create or update.
     #
-    # @param doc - the root element of the REXML::Document for server.xml
-    # @param lib_dir - the directory where client driver jars are located
-    # @raise if an internal inconsistency was found.
+    # @param jdbc_driver - an array containing all jdbcDriver elements with a given id.
     #------------------------------------------------------------------------------------
-    def create_jdbcdriver(doc, jdbc_driver_id, lib_id, fileset_id, lib_dir)
-      # We assume a consistent server.xml. If the datasource did not exist, then this must be a pure "push app" use case. If it is a "push server.xml"
-      # case, then failure to find the datasource indicates server.xml is not consistent.
-      # TODO: surprisingly, the following will find the driver even if it is imbedded in another datasource.
-      # We could probably use XPATH /server/jdbcDriver to limit the search to global.
-      drivers = doc.elements.to_a("//jdbcDriver[@id='#{jdbc_driver_id}']")
-      # if we find an existing jdbc driver, then one of two things has occurred
-      # 1) case of pushing server.xml, but datasource not found (user error)
-      # 2) case of pushing a web app and multiple instances of a given resource type (db2) were bound. The JDBC driver was already created when
-      #    we created the datasource for a previously processed instance. All instances of a resource type share the same JDBCDriver and library.
-      if drivers.empty?
-        # Not found, create it. The JDBC Driver is created as a global element and not nested underneath the datasource.
-        # puts "jdbcDriver #{jdbc_driver_id} not found, creating it"
-        # create the jdbcDriver
-        driver = REXML::Element.new('jdbcDriver', doc.root)
-        driver.add_attribute('id', jdbc_driver_id)
-        driver.add_attribute('javax.sql.XADataSource', 'org.postgresql.xa.PGXADataSource')
-        driver.add_attribute('javax.sql.ConnectionPoolDataSource', 'org.postgresql.ds.PGConnectionPoolDataSource')
-        driver.add_attribute('libraryRef', lib_id)
-        # create the shared library. It should not exist.
-        ClientJarUtils.create_global_library(doc, lib_id, fileset_id, lib_dir, @client_jars_string)
-      end
+    def modify_jdbc_driver(jdbcdrivers)
+      Utils.find_and_update_attribute(jdbcdrivers, 'javax.sql.XADataSource', 'org.postgresql.xa.PGXADataSource')
+      Utils.find_and_update_attribute(jdbcdrivers, 'javax.sql.ConnectionPoolDataSource', 'org.postgresql.ds.PGConnectionPoolDataSource')
     end
 
     #------------------------------------------------------------------------------------
-    # Method to create/update a datasource stanza (and all related sub-artifacts such as the JDBCDriver) in server.xml.
+    # Method to customize dataSource - called on create or update.
     #
-    # @param doc - the root element of the REXML::Document for server.xml
-    # @param server_dir - the server directory which is the location for bootstrap.properties and jvm.options
-    # @param driver_dir - the symbolic name of the directory where client jars are installed
-    # @param available_jars - an array containing the names of all installed client driver jars.
-    # @param number_instances - the number of service instances that update the same service-specific server.xml stanzas
-    # @raise if a problem was discovered (incoherent or inconsistent existing configuration, for example)
+    # @param datasources - an array containing all dataSource stanzas with a given id.
     #------------------------------------------------------------------------------------
-    def update(doc, server_dir, driver_dir, available_jars, number_instances)
-      super
-      # Find the datasource config for this service instance.
-      datasource = find_datasource(doc, number_instances)
-      unless datasource.empty?
-        # Make sure the correct type is added if the datasource already exists.
-        Utils.find_and_update_attribute(datasource, 'type', 'javax.sql.ConnectionPoolDataSource')
-
-        # Update the javax.sql.ConnectionPoolDataSource to use the postgresql implementation.
-        jdbc_attribute = Utils.find_attribute(datasource, 'jdbcDriverRef')
-        unless jdbc_attribute.nil?
-          driver = doc.elements.to_a("//jdbcDriver[@id='#{jdbc_attribute}']")
-          Utils.find_and_update_attribute(driver, 'javax.sql.ConnectionPoolDataSource', 'org.postgresql.ds.PGConnectionPoolDataSource')
-        end
-      end
+    def modify_datasource(datasources)
+      Utils.find_and_update_attribute(datasources, 'type', 'javax.sql.ConnectionPoolDataSource')
     end
 
   end
diff --git a/lib/liberty_buildpack/services/relational_db.rb b/lib/liberty_buildpack/services/relational_db.rb
index 8d525436a..a648fdf62 100644
--- a/lib/liberty_buildpack/services/relational_db.rb
+++ b/lib/liberty_buildpack/services/relational_db.rb
@@ -163,23 +163,52 @@ def update(doc, server_dir, driver_dir, available_jars, number_instances)
         @logger.debug("datasource #{@datasource_id} not found, creating it")
         create_datasource(doc, @driver_dir)
       else
+        modify_datasource(datasources)
         # Find the jdbc driver. Use the jdbc driver to find the shared library.
         jdbc_driver = find_jdbc_driver(doc, datasources)
+        modify_jdbc_driver(jdbc_driver)
         library = find_shared_library(doc, jdbc_driver)
         ClientJarUtils.update_library(doc, @service_name, library, @fileset_id, @driver_dir, @client_jars_string)
 
         # Do not update datasource attributes. Specifically, do not update the jndi name. We do need to update the properties attributes though.
         # find the instance that contains the properties. Liberty only allows one instance of properties.
         properties_element = find_datasource_properties(datasources)
-        update_element_attribute(properties_element, 'databaseName', @db_name)
-        update_element_attribute(properties_element, 'user', @user)
-        update_element_attribute(properties_element, 'password', @password)
-        update_element_attribute(properties_element, 'serverName', @host)
-        update_element_attribute(properties_element, 'portNumber', @port)
+        properties_element.add_attribute('databaseName', @db_name)
+        properties_element.add_attribute('user', @user)
+        properties_element.add_attribute('password', @password)
+        properties_element.add_attribute('serverName', @host)
+        properties_element.add_attribute('portNumber', @port)
+        modify_properties(properties_element)
         Utils.add_features(doc, @features)
       end
     end
 
+    protected
+
+    #------------------------------------------------------------------------------------
+    # Method to customize dataSource - called on create or update.
+    #
+    # @param datasources - an array containing all dataSource stanzas with a given id.
+    #------------------------------------------------------------------------------------
+    def modify_datasource(datasources)
+    end
+
+    #------------------------------------------------------------------------------------
+    # Method to customize properties - called on create or update.
+    #
+    # @param properties_element - the properties element
+    #------------------------------------------------------------------------------------
+    def modify_properties(properties_element)
+    end
+
+    #------------------------------------------------------------------------------------
+    # Method to customize jdbcDriver - called on create or update.
+    #
+    # @param jdbc_driver - an array containing all jdbcDriver elements with a given id.
+    #------------------------------------------------------------------------------------
+    def modify_jdbc_driver(jdbcdrivers)
+    end
+
     private
 
     def get_cloud_property(properties, element, name, value)
@@ -221,18 +250,6 @@ def find_datasource_properties(datasources)
       props
     end
 
-    #------------------------------------------------------------------------------------
-    # A utility method that can be used to update an attribute for an element.
-    #
-    # @param element - the Element containing the attribute
-    # @param attribute - the String name of attribute to update
-    # @param value - the String value of the attribute
-    #------------------------------------------------------------------------------------
-    def update_element_attribute(element, attribute, value)
-      # Simply overwrite the attribute if it exists.
-      element.add_attribute(attribute, value)
-    end
-
     #------------------------------------------------------------------------------------
     # A private worker method for the create_or_update_datasource method.
     # This method will only be called when a datasource does not exist.
@@ -251,6 +268,8 @@ def create_datasource(doc, lib_dir)
       # We don't presently support XA in the cloud. Although Liberty defaults to connection pooled, we need to explicitly specify ConnectionPooledDataSource as some
       # vendors use a single class to implement all datasource types, in which case Liberty will use an XA connection. Avoid this.
       ds.add_attribute('type', 'javax.sql.ConnectionPoolDataSource')
+      modify_datasource([ds])
+
       # add properties element and standard set of attributes.
       props = REXML::Element.new(@properties_type, ds)
       props.add_attribute('id', @properties_id)
@@ -259,6 +278,8 @@ def create_datasource(doc, lib_dir)
       props.add_attribute('password', @password)
       props.add_attribute('portNumber', @port)
       props.add_attribute('serverName', @host)
+      modify_properties(props)
+
       # allow types that need it to add a ConnectionManager
       create_connection_manager(ds)
       # create the JDBC driver. The JDBC driver will create the shared library.
@@ -299,6 +320,7 @@ def create_jdbcdriver(doc, jdbc_driver_id, lib_id, fileset_id, lib_dir)
         driver = REXML::Element.new('jdbcDriver', doc.root)
         driver.add_attribute('id', jdbc_driver_id)
         driver.add_attribute('libraryRef', lib_id)
+        modify_jdbc_driver([driver])
         # create the shared library. It should not exist.
         ClientJarUtils.create_global_library(doc, lib_id, fileset_id, lib_dir, @client_jars_string)
       end
diff --git a/spec/liberty_buildpack/services/compose_postgresql_spec.rb b/spec/liberty_buildpack/services/compose_postgresql_spec.rb
new file mode 100644
index 000000000..7fb13707e
--- /dev/null
+++ b/spec/liberty_buildpack/services/compose_postgresql_spec.rb
@@ -0,0 +1,196 @@
+# Encoding: utf-8
+# IBM WebSphere Application Server Liberty Buildpack
+# Copyright 2014 the original author or authors.
+#
+# 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 'logging_helper'
+require 'spec_helper'
+require 'liberty_buildpack/container/services_manager'
+require 'liberty_buildpack/util/heroku'
+
+module LibertyBuildpack::Services
+
+  describe 'PostgreSQL' do
+
+    include_context 'logging_helper'
+
+    #----------------
+    # Helper method to check an xml file agains expected results.
+    #
+    # @param xml - the name of the xml file file containing the results (server.xml, runtime_vars.xml)
+    # @param - expected - the array of strings we expect to find in the xml file, in order.
+    #----------------
+    def validate_xml(server_xml, expected)
+      # Collapse XML into one long String (no cr or lf).
+      server_xml_contents_array = File.readlines(server_xml).each(&:strip!)
+      server_xml_contents = server_xml_contents_array.join
+      # For each String in the expected array, make sure there is a corresponding entry in server.xml
+      # make sure we consume all entries in the expected array.
+      expected.each do |line|
+        expect(server_xml_contents).to include(line)
+      end
+    end
+
+    describe 'Generate configuration' do
+
+      #----------------------------------------------------------
+      # Helper methods to return constants used in checking server.xml contents
+      #----------------------------------------------------------
+      def get_ds_id
+        'compose-postgresql-myDatabase'
+      end
+
+      def get_props_id
+        'compose-postgresql-myDatabase-props'
+      end
+
+      def get_driver_id
+        'compose-postgresql-driver'
+      end
+
+      def get_lib_id
+        'compose-postgresql-library'
+      end
+
+      def get_fileset_id
+        'compose-postgresql-fileset'
+      end
+
+      def get_lib_dir
+        '${server.config.dir}/lib'
+      end
+
+      def get_jndi
+        'jdbc/myDatabase'
+      end
+
+      def get_host
+        '${cloud.services.myDatabase.connection.host}'
+      end
+
+      def get_port
+        '${cloud.services.myDatabase.connection.port}'
+      end
+
+      def get_user
+        '${cloud.services.myDatabase.connection.user}'
+      end
+
+      def get_password
+        '${cloud.services.myDatabase.connection.password}'
+      end
+
+      def get_name
+        '${cloud.services.myDatabase.connection.db}'
+      end
+
+      def check_variables(root, vcap_services)
+        expected_vars = []
+        expected_vars << '<variable name=\'cloud.services.myDatabase.connection.name\' value=\'foobar\'/>'
+        expected_vars << '<variable name=\'cloud.services.myDatabase.connection.db\' value=\'myDb\'/>'
+        expected_vars << '<variable name=\'cloud.services.myDatabase.connection.host\' value=\'myHost.com\'/>'
+        expected_vars << '<variable name=\'cloud.services.myDatabase.connection.port\' value=\'5432\'/>'
+        expected_vars << '<variable name=\'cloud.services.myDatabase.connection.user\' value=\'myUser\'/>'
+        expected_vars << '<variable name=\'cloud.services.myDatabase.connection.password\' value=\'myPassword\'/>'
+        expected_vars << '<variable name=\'cloud.services.myDatabase.connection.uri\' value=\'postgres://myUser:myPassword@myHost.com:5432/myDb\'/>'
+
+        runtime_vars = File.join(root, 'runtime-vars.xml')
+        validate_xml(runtime_vars, expected_vars)
+      end
+
+      def check_server_xml_create(root, sm)
+        server_xml = File.join(root, 'server.xml')
+        server_xml_doc = REXML::Document.new('<server><featureManager/></server>')
+
+        sm.update_configuration(server_xml_doc, true, root)
+
+        File.open(server_xml, 'w') { |file| server_xml_doc.write(file) }
+
+        expected_config = []
+        expected_config << '<feature>jdbc-4.1</feature>'
+        t1 = "<dataSource id='#{get_ds_id}' jdbcDriverRef='#{get_driver_id}' jndiName='#{get_jndi}' transactional='true' type='javax.sql.ConnectionPoolDataSource'>"
+        ssl_opts = "ssl='true' sslMode='verify-ca' sslRootCert='/home/vcap/app/.compose_postgresql/cacert.pem'"
+        t2 = "<properties databaseName='#{get_name}' id='#{get_props_id}' password='#{get_password}' portNumber='#{get_port}' serverName='#{get_host}' #{ssl_opts} user='#{get_user}'/>"
+        t3 = '</dataSource>'
+        expected_config << t1 + t2 + t3
+        driver_info = "javax.sql.ConnectionPoolDataSource='org.postgresql.ds.PGConnectionPoolDataSource' javax.sql.XADataSource='org.postgresql.xa.PGXADataSource'"
+        expected_config << "<jdbcDriver id='#{get_driver_id}' #{driver_info} libraryRef='#{get_lib_id}'/>"
+        expected_config << "<library id='#{get_lib_id}'><fileset dir='#{get_lib_dir}' id='#{get_fileset_id}'/></library>"
+        validate_xml(server_xml, expected_config)
+      end
+
+      def check_server_xml_update(root, sm) # rubocop:disable MethodLength
+        driver_info = "javax.sql.ConnectionPoolDataSource='org.postgresql.ds.PGConnectionPoolDataSource' javax.sql.XADataSource='org.postgresql.xa.PGXADataSource'"
+
+        contents = []
+        contents << '<server>'
+        contents << '<featureManager><feature>jsp-2.2</feature></featureManager>'
+        t1 = "<dataSource id='#{get_ds_id}' jdbcDriverRef='myDriver' jndiName='myJndi' transactional='true'>"
+        t2 = "<properties databaseName='noName' password='noPassword' portNumber='1111' serverName='noHost' user='noUser'/>"
+        t3 = '</dataSource>'
+        contents << t1 + t2 + t3
+        contents << "<jdbcDriver id='myDriver' libraryRef='myLibrary'/>"
+        contents << "<library id='myLibrary'><fileset dir='lib' id='lib-id'/></library>"
+        contents << '</server>'
+
+        server_xml_doc = REXML::Document.new(contents.join)
+        server_xml = File.join(root, 'server.xml')
+        sm.update_configuration(server_xml_doc, false, root)
+
+        File.open(server_xml, 'w') { |file| server_xml_doc.write(file) }
+
+        # check if dataSource properties and library were updated. Other elements should not be updated.
+        expected_config = []
+        expected_config << '<feature>jsp-2.2</feature>'
+        expected_config << '<feature>jdbc-4.1</feature>'
+        t1 = "<dataSource id='#{get_ds_id}' jdbcDriverRef='myDriver' jndiName='myJndi' transactional='true' type='javax.sql.ConnectionPoolDataSource'>"
+        ssl_opts = "ssl='true' sslMode='verify-ca' sslRootCert='/home/vcap/app/.compose_postgresql/cacert.pem'"
+        t2 = "<properties databaseName='#{get_name}' password='#{get_password}' portNumber='#{get_port}' serverName='#{get_host}' #{ssl_opts} user='#{get_user}'/>"
+        t3 = '</dataSource>'
+        expected_config << t1 + t2 + t3
+        expected_config << "<jdbcDriver id='myDriver' #{driver_info} libraryRef='myLibrary'/>"
+        expected_config << "<library id='myLibrary'><fileset dir='lib' id='lib-id'/><fileset dir='#{get_lib_dir}'/></library>"
+        validate_xml(server_xml, expected_config)
+      end
+
+      def run_test(vcap_services)
+        Dir.mktmpdir do |root|
+          context = { app_dir: root }
+          sm = LibertyBuildpack::Container::ServicesManager.new(vcap_services, root, nil, context)
+          check_variables(root, sm)
+          check_server_xml_create(root, sm)
+          check_server_xml_update(root, sm)
+        end
+      end
+
+      it 'on Bluemix (compose for postgresql)' do
+        vcap_services = {}
+        postgresql = {}
+        postgresql['name'] = 'myDatabase'
+        postgresql['label'] = 'compose-for-postgresql'
+        postgresql_credentials = {}
+        postgresql_credentials['name'] = 'foobar'
+        postgresql_credentials['uri'] = 'postgres://myUser:myPassword@myHost.com:5432/myDb'
+        postgresql_credentials['ca_certificate_base64'] = 'LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNDVENDQVkrZ0F3SUJBZ0lRYUVwWWNJQnI4SThDK3ZiZTZMQ1FrREFLQmdncWhrak9QUVFEQXpCR01Rc3dDUVlEVlFRR0V3SkQKVGpFYU1CZ0dBMVVFQ2hNUlYyOVRhV2R1SUVOQklFeHBiV2wwWldReEd6QVpCZ05WQkFNVEVrTkJJRmR2VTJsbmJpQkZRME1nVW05dgpkREFlRncweE5ERXhNRGd3TURVNE5UaGFGdzAwTkRFeE1EZ3dNRFU0TlRoYU1FWXhDekFKQmdOVkJBWVRBa05PTVJvd0dBWURWUVFLCkV4RlhiMU5wWjI0Z1EwRWdUR2x0YVhSbFpERWJNQmtHQTFVRUF4TVNRMEVnVjI5VGFXZHVJRVZEUXlCU2IyOTBNSFl3RUFZSEtvWkkKemowQ0FRWUZLNEVFQUNJRFlnQUU0ZjJPdUVNa3E1WjdoY0s2QzYyTjREcmpKTG5Tc2I2SU9zcS9Tcmo1N3l3dnIxRlFQRWQxYlBpVQp0NXY4S0I3RlZNeGpuUlpMVThIbklLdk5yQ1hTZjQvQ3dWcUNYakNMZWxUT0E3V1JmNnFVME5HS1NNeUNCU2FoMVZFUzFuczJvMEl3ClFEQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVXF2M1ZXcVAyaDRzeWhmM1IKTWx1QVJaUHpBN2d3Q2dZSUtvWkl6ajBFQXdNRGFBQXdaUUl4QU9Ta2hMQ0IxVDJ3ZEt5VXBPZ09QUUIwVEtHWGEva05VVHloMlR2MApEYXVwbjc1T2NzcUYxTm5zdFRKRkdHK3JyUUl3ZmNmM2FXTXZvZUdZN3hNUTBYay8wZjdxTzMvZVZ2U1FzUlVSMkxJaUZkQXZ3eVl1CmEvR1JzcEJsOUpybWtPNUsKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo='
+        postgresql['credentials'] = postgresql_credentials
+        vcap_services['compose-for-postgresql'] = [postgresql]
+
+        run_test(vcap_services)
+      end
+
+    end
+
+  end
+
+end
diff --git a/spec/liberty_buildpack/services/mysql_spec.rb b/spec/liberty_buildpack/services/mysql_spec.rb
index 764108611..cedb75f3f 100644
--- a/spec/liberty_buildpack/services/mysql_spec.rb
+++ b/spec/liberty_buildpack/services/mysql_spec.rb
@@ -127,7 +127,7 @@ def check_server_xml_create(root, sm)
       end
 
       def check_server_xml_update(root, sm)
-        driver_info = "javax.sql.ConnectionPoolDataSource='org.mariadb.jdbc.MySQLDataSource'"
+        driver_info = "javax.sql.ConnectionPoolDataSource='org.mariadb.jdbc.MySQLDataSource' javax.sql.XADataSource='org.mariadb.jdbc.MySQLDataSource'"
 
         contents = []
         contents << '<server>'
diff --git a/spec/liberty_buildpack/services/postgresql_spec.rb b/spec/liberty_buildpack/services/postgresql_spec.rb
index d4786bd46..241b06602 100644
--- a/spec/liberty_buildpack/services/postgresql_spec.rb
+++ b/spec/liberty_buildpack/services/postgresql_spec.rb
@@ -129,7 +129,7 @@ def check_server_xml_create(root, sm)
       end
 
       def check_server_xml_update(root, sm)
-        driver_info = "javax.sql.ConnectionPoolDataSource='org.postgresql.ds.PGConnectionPoolDataSource'"
+        driver_info = "javax.sql.ConnectionPoolDataSource='org.postgresql.ds.PGConnectionPoolDataSource' javax.sql.XADataSource='org.postgresql.xa.PGXADataSource'"
 
         contents = []
         contents << '<server>'