Merge remote-tracking branch 'remotes/dev/master'

oroinc · Jan 30, 2014 · b6c8d7f · b6c8d7f
2 parents 25b25ed + 97a8424
commit b6c8d7f
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+CHANGELOG for 1.0.0-rc2
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-rc2 versions.
+
+* 1.0.0-rc2 (2014-01-30)
+ * Package management
+ * Translations management
+ * FontAwesome web-application icons
+
 CHANGELOG for 1.0.0-rc1
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-rc1 versions.

diff --git a/app/DistributionKernel.php b/app/DistributionKernel.php
@@ -15,9 +15,11 @@ public function registerBundles()
             new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new \Symfony\Bundle\TwigBundle\TwigBundle(),
             new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new \Symfony\Bundle\MonologBundle\MonologBundle(),
             new Oro\Bundle\DistributionBundle\OroDistributionBundle(),
             new \Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new \Oro\Bundle\HelpBundle\OroHelpBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev'))) {
@@ -37,6 +39,17 @@ public function getCacheDir()
         return $this->rootDir . '/cache/dist/' . $this->environment;
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @api
+     */
+    public function getLogDir()
+    {
+        return $this->rootDir.'/logs/dist';
+    }
+
+
     /**
      * {@inheritdoc}
      */

diff --git a/app/OroRequirements.php b/app/OroRequirements.php
@@ -22,6 +22,9 @@ public function __construct()
         $nodeExists = new ProcessBuilder(array('node', '--version'));
         $nodeExists = $nodeExists->getProcess();
 
+        if (isset($_SERVER['PATH'])) {
+            $nodeExists->setEnv(['PATH' => $_SERVER['PATH']]);
+        }
         $nodeExists->run();
         while ($nodeExists->isRunning()) {
             // waiting for process to finish
@@ -112,24 +115,6 @@ function ($cfgValue) use ($mem) {
             'Install the <strong>NodeJS</strong>.'
         );
 
-        $this->addOroRequirement(
-            is_writable($baseDir . '/app/cache'),
-            'app/cache/ directory must be writable',
-            'Change the permissions of the "<strong>app/cache/</strong>" directory so that the web server can write into it.'
-        );
-
-        $this->addOroRequirement(
-            is_writable($baseDir . '/app/logs'),
-            'app/logs/ directory must be writable',
-            'Change the permissions of the "<strong>app/logs/</strong>" directory so that the web server can write into it.'
-        );
-
-        $this->addOroRequirement(
-            is_writable($baseDir . '/app/emails'),
-            'app/emails/ directory must be writable',
-            'Change the permissions of the "<strong>app/emails/</strong>" directory so that the web server can write into it.'
-        );
-
         $this->addOroRequirement(
             is_writable($baseDir . '/web/uploads'),
             'web/uploads/ directory must be writable',
@@ -142,13 +127,32 @@ function ($cfgValue) use ($mem) {
             'Change the permissions of the "<strong>web/bundles/</strong>" directory so that the web server can write into it.'
         );
 
-        $this->addOroRequirement(
-            is_writable($baseDir . '/web'),
-            'web directory must be writable',
-            'Change the permissions of the "<strong>web</strong>" directory so that the web server can write into it.'
-        );
-    }
+
+        if (is_dir($baseDir . '/web/js')) {
+            $this->addOroRequirement(
+                is_writable($baseDir . '/web/js'),
+                'web/js directory must be writable',
+                'Change the permissions of the "<strong>web/js</strong>" directory so that the web server can write into it.'
+            );
+        }
 
+        if (is_dir($baseDir . '/web/css')) {
+            $this->addOroRequirement(
+                is_writable($baseDir . '/web/css'),
+                'web/css directory must be writable',
+                'Change the permissions of the "<strong>web/css</strong>" directory so that the web server can write into it.'
+            );
+        }
+
+        if (!is_dir($baseDir . '/web/css') || !is_dir($baseDir . '/web/js')) {
+            $this->addOroRequirement(
+                is_writable($baseDir . '/web'),
+                'web directory must be writable',
+                'Change the permissions of the "<strong>web</strong>" directory so that the web server can write into it.'
+            );
+        }
+
+    }
 
     /**
      * Adds an Oro specific requirement.

diff --git a/app/config/dist/config.yml b/app/config/dist/config.yml
@@ -67,3 +67,19 @@ services:
          class:               Twig_Extensions_Extension_Intl
          tags:
              - { name: twig.extension }
+
+oro_help:
+    defaults:
+        server: http://help.orocrm.com/
+        prefix: Third_Party
+    vendors:
+        Oro:
+            prefix: ~
+            alias: Platform
+
+monolog:
+    handlers:
+        oro_distribution:
+            type: stream
+            path: %kernel.logs_dir%/%kernel.environment%.distribution.log
+            channels: oro_distribution
diff --git a/app/config/dist/config_test.yml b/app/config/dist/config_test.yml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: config.yml }
diff --git a/app/emails/.gitignore b/app/emails/.gitignore
diff --git a/composer.json b/composer.json
@@ -5,12 +5,11 @@
     "license": "MIT",
     "autoload": {
         "psr-0": { 
-           "": "src/",
-           "OroEmail\\": "app/emails"
+           "": "src/"
          }
     },
     "require": {
-        "oro/platform": "1.0.0-rc1",
+        "oro/platform": "1.0.0-rc2",
         "escapestudios/wsse-authentication-bundle": "2.3.x-dev#ac3f700a88966e6483ff84d5de2b751d7622736d"
     },
     "scripts": {
@@ -28,6 +27,7 @@
         ]
     },
     "minimum-stability": "dev",
+    "prefer-stable": true,
     "extra": {
         "symfony-app-dir": "app",
         "symfony-web-dir": "web",

diff --git a/web/install.php b/web/install.php
@@ -7,15 +7,10 @@
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\Loader\YamlFileLoader;
 use Symfony\Component\Yaml\Yaml;
-
-//todo: uncomment this then package installer will be completed
-//use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Request;
 
 require_once __DIR__ . '/../app/OroRequirements.php';
-//todo: uncomment this then package installer will be completed
-//require_once __DIR__ . '/../app/autoload.php';
-//todo: delete this then package installer will be completed
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../app/autoload.php';
 
 // check for installed system
 $paramFile = __DIR__ . '/../app/config/parameters.yml';
@@ -28,17 +23,14 @@
         && isset($data['parameters']['installed'])
         && false != $data['parameters']['installed']
     ) {
-        //todo: delete this then package installer will be completed
-        header('Location: /');
-        //todo: uncomment this then package installer will be completed
-        /*require_once __DIR__.'/../app/DistributionKernel.php';
+        require_once __DIR__.'/../app/DistributionKernel.php';
 
         $kernel = new DistributionKernel('prod', false);
         $kernel->loadClassCache();
         $request = Request::createFromGlobals();
         $response = $kernel->handle($request);
         $response->send();
-        $kernel->terminate($request, $response);*/
+        $kernel->terminate($request, $response);
 
         exit;
     }