From 260efb32d6bbc3d7f2dc97af01d0dd4734e6eb91 Mon Sep 17 00:00:00 2001
From: Kris Wallsmith <kris.wallsmith@gmail.com>
Date: Fri, 25 Mar 2011 06:44:30 -0700
Subject: [PATCH] [AsseticBundle] removed configuration of default output
 strings

---
 .../AsseticBundle/DependencyInjection/AsseticExtension.php      | 2 --
 .../Bundle/AsseticBundle/DependencyInjection/Configuration.php  | 2 --
 .../AsseticBundle/Resources/config/schema/assetic-1.0.xsd       | 2 --
 .../Bundle/AsseticBundle/Resources/config/templating_php.xml    | 2 --
 .../Bundle/AsseticBundle/Resources/config/templating_twig.xml   | 2 --
 5 files changed, 10 deletions(-)

diff --git a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php
index 21c0c572a366..2658c9498b27 100644
--- a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php
+++ b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php
@@ -45,8 +45,6 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('assetic.use_controller', $config['use_controller']);
         $container->setParameter('assetic.read_from', $config['read_from']);
         $container->setParameter('assetic.write_to', $config['write_to']);
-        $container->setParameter('assetic.default_javascripts_output', $config['default_javascripts_output']);
-        $container->setParameter('assetic.default_stylesheets_output', $config['default_stylesheets_output']);
 
         if (isset($config['closure'])) {
             $container->setParameter('assetic.google_closure_compiler_jar', $config['closure']);
diff --git a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Configuration.php
index 7d5262734021..0be37a93bbe2 100644
--- a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Configuration.php
+++ b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Configuration.php
@@ -43,8 +43,6 @@ public function getConfigTree($debug, array $bundles)
                 ->scalarNode('write_to')->defaultValue('%assetic.read_from%')->end()
                 ->scalarNode('closure')->end()
                 ->scalarNode('yui')->end()
-                ->scalarNode('default_javascripts_output')->defaultValue('js/*.js')->end()
-                ->scalarNode('default_stylesheets_output')->defaultValue('css/*.css')->end()
             ->end()
             ->fixXmlConfig('bundle')
             ->children()
diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/schema/assetic-1.0.xsd b/src/Symfony/Bundle/AsseticBundle/Resources/config/schema/assetic-1.0.xsd
index 3979686e7813..85e13fc31d22 100644
--- a/src/Symfony/Bundle/AsseticBundle/Resources/config/schema/assetic-1.0.xsd
+++ b/src/Symfony/Bundle/AsseticBundle/Resources/config/schema/assetic-1.0.xsd
@@ -17,8 +17,6 @@
         <xsd:attribute name="write-to" type="xsd:string" />
         <xsd:attribute name="closure" type="xsd:string" />
         <xsd:attribute name="yui" type="xsd:string" />
-        <xsd:attribute name="default-javascripts-output" type="xsd:string" />
-        <xsd:attribute name="default-stylesheets-output" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:complexType name="bundle">
diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/templating_php.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/templating_php.xml
index ba344cab0e21..4ed77052e194 100644
--- a/src/Symfony/Bundle/AsseticBundle/Resources/config/templating_php.xml
+++ b/src/Symfony/Bundle/AsseticBundle/Resources/config/templating_php.xml
@@ -15,8 +15,6 @@
             <tag name="assetic.templating.php" />
             <argument type="service" id="assetic.asset_factory" />
             <argument>%assetic.debug%</argument>
-            <argument>%assetic.default_javascripts_output%</argument>
-            <argument>%assetic.default_stylesheets_output%</argument>
         </service>
         <service id="assetic.php_formula_loader" class="%assetic.cached_formula_loader.class%" public="false">
             <tag name="assetic.formula_loader" alias="php" />
diff --git a/src/Symfony/Bundle/AsseticBundle/Resources/config/templating_twig.xml b/src/Symfony/Bundle/AsseticBundle/Resources/config/templating_twig.xml
index b1a497d7b593..5e3d070eb4e4 100644
--- a/src/Symfony/Bundle/AsseticBundle/Resources/config/templating_twig.xml
+++ b/src/Symfony/Bundle/AsseticBundle/Resources/config/templating_twig.xml
@@ -16,8 +16,6 @@
             <tag name="assetic.templating.twig" />
             <argument type="service" id="assetic.asset_factory" />
             <argument>%assetic.debug%</argument>
-            <argument>%assetic.default_javascripts_output%</argument>
-            <argument>%assetic.default_stylesheets_output%</argument>
         </service>
         <service id="assetic.twig_formula_loader" class="%assetic.cached_formula_loader.class%" public="false">
             <tag name="assetic.formula_loader" alias="twig" />