TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix services

Browse Source 
modifié:         core/lib/Thelia/Config/Resources/config.xml
This commit is contained in:
Benjamin Perche
2014-07-04 09:29:57 +02:00
parent ed3a932f92
commit d1a6d55a72
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -138,7 +138,7 @@
<<<<<<< HEAD <<<<<<< HEAD
======= =======
<!-- Archive builders and file formatters --> <!-- Archive builders -->
<service id="thelia.manager.archive_builder_manager" class="Thelia\Core\FileFormat\Archive\ArchiveBuilderManager"> <service id="thelia.manager.archive_builder_manager" class="Thelia\Core\FileFormat\Archive\ArchiveBuilderManager">
<argument>%kernel.environment%</argument> <argument>%kernel.environment%</argument>
@@ -156,17 +156,17 @@
<!-- tar.gz --> <!-- tar.gz -->
<service id="thelia.manager.tar_gz_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarGzArchiveBuilder"> <service id="thelia.manager.tar_gz_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarGzArchiveBuilder">
<argument id="compressionType" type="string">gz</argument>
<tag name="thelia.manager.archive_builder" /> <tag name="thelia.manager.archive_builder" />
</service> </service>
<!-- tar.bz2 --> <!-- tar.bz2 -->
<service id="thelia.manager.tar_bz2_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarBz2ArchiveBuilder"> <service id="thelia.manager.tar_bz2_archive_builder" class="Thelia\Core\FileFormat\Archive\ArchiveBuilder\TarBz2ArchiveBuilder">
<argument id="compressionType" type="string">bz2</argument>
<tag name="thelia.manager.archive_builder" /> <tag name="thelia.manager.archive_builder" />
</service> </service>
<!-- Formatters -->
<service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatter\FormatterManager" /> <service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatter\FormatterManager" />
<<<<<<< HEAD
</services> </services>
>>>>>>> Add archive builder manager and formatter manager services >>>>>>> Add archive builder manager and formatter manager services
@@ -199,5 +199,8 @@
<!-- Formatters --> <!-- Formatters -->
<service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatter\FormatterManager" /> <service id="thelia.manager.formatter_manager" class="Thelia\Core\FileFormat\Formatter\FormatterManager" />
=======
>>>>>>> Fix services
</services> </services>
</config> </config>