Merge branch with release

CHANGELOG.md

@@ -1,3 +1,13 @@
+CHANGELOG for 1.0.0-alpha6
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-alpha6 versions.
+
+* 1.0.0-alpha6 (2013-09-12)
+ * Maintenance Mode
+ * Instant messaging between the browser and the web server
+ * Asynchronous Module Definition of JS resources
+ * Added multiple sorting for a Grid
+
 CHANGELOG for 1.0.0-alpha5
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-alpha5 versions.

README.md

@@ -34,3 +34,10 @@ http://getcomposer.org/ or just run the following command:
 After installation you can login as application administrator using user name "admin" and password "admin".
 
 [1]:  http://getcomposer.org/
+
+Instant messaging between the browser and the web server
+--------------------------------------------------------
+To use this feature you need to configure parameters.yml websocket parameters and run server with console command
+
+ ```bash
+app/console clank:server

app/AppKernel.php

@@ -35,6 +35,8 @@ public function registerBundles()
             new APY\JsFormValidationBundle\APYJsFormValidationBundle(),
             new Genemu\Bundle\FormBundle\GenemuFormBundle(),
             new A2lix\TranslationFormBundle\A2lixTranslationFormBundle(),
+            new JDare\ClankBundle\JDareClankBundle(),
+            new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
 
             // BAP bundles
             new Oro\Bundle\FlexibleEntityBundle\OroFlexibleEntityBundle(),
@@ -43,7 +45,6 @@ public function registerBundles()
             new Oro\Bundle\JsFormValidationBundle\OroJsFormValidationBundle(),
             new Oro\Bundle\SoapBundle\OroSoapBundle(),
             new Oro\Bundle\SearchBundle\OroSearchBundle(),
-            new Oro\Bundle\DataFlowBundle\OroDataFlowBundle(),
             new Oro\Bundle\UserBundle\OroUserBundle(),
             new Oro\Bundle\MeasureBundle\OroMeasureBundle(),
             new Oro\Bundle\SegmentationTreeBundle\OroSegmentationTreeBundle(),
@@ -63,7 +64,11 @@ public function registerBundles()
             new Oro\Bundle\EntityBundle\OroEntityBundle(),
             new Oro\Bundle\EntityConfigBundle\OroEntityConfigBundle(),
             new Oro\Bundle\EntityExtendBundle\OroEntityExtendBundle(),
-            new Oro\Bundle\CronBundle\OroCronBundle()
+            new Oro\Bundle\CronBundle\OroCronBundle(),
+            new Oro\Bundle\WorkflowBundle\OroWorkflowBundle(),
+            new Oro\Bundle\SyncBundle\OroSyncBundle(),
+            new Oro\Bundle\PlatformBundle\OroPlatformBundle(),
+
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {

app/Resources/TwigBundle/views/Exception/error.html.twig

@@ -8,6 +8,9 @@
 {% block before_content %}
 {% endblock %}
 
+{% block scripts_before %}
+{% endblock %}
+
 {% block content %}
 <div class="pagination-centered popup-box-errors">
         <h1><span>{{ status_code }}</span> {{ status_text }}</h1>
@@ -20,5 +23,5 @@
 
 {% block head_script %}
     {{ parent() }}
-    <script type="text/javascript" src="{{ asset('bundles/oroui/js/errors.js') }}"></script>
+    <script type="text/javascript">require(['oroui/js/init-errors'])</script>
 {% endblock %}

app/Resources/views/Default/index.html.twig

@@ -7,6 +7,6 @@
 </div>
     <div class="version-container">
         {# TODO Replace hardcoded version with data from backend #}
-        <strong>Version:</strong> 1.0.0-alpha5
+        <strong>Version:</strong> 1.0.0-alpha6
     </div>
 {% endblock content %}

app/config/config.yml

@@ -18,20 +18,25 @@ framework:
     session:
         cookie_lifetime:      43200
         name:                 BAPID
+        handler_id:           session.handler.pdo
     fragments:
         enabled: true
         path: /_fragment # used for controller action in template
+    serializer:
+        enabled: true
 
 # Twig Configuration
 twig:
     debug:                    "%kernel.debug%"
     strict_variables:         "%kernel.debug%"
     exception_controller:     "FOS\RestBundle\Controller\ExceptionController::showAction"
     globals:
-        env: %kernel.environment%
         bap:
             layout:           ::base.html.twig  # default layout across all Oro bundles
             start_route:      oro_default
+        ws:
+            port:             "%websocket_port%"
+            host:             "%websocket_host%"
     form:
         resources:
             - 'OroUIBundle:Form:fields.html.twig'
@@ -55,6 +60,7 @@ assetic:
         - OroWindowsBundle
         - OroSegmentationTreeBundle
         - OroEntityExtendBundle
+        - JDareClankBundle
     #java: /usr/bin/java
     filters:
         cssrewrite: ~
@@ -160,13 +166,24 @@ stof_doctrine_extensions:
 
 services:
     oro.cache.abstract:
-        abstract: true
+        abstract:             true
         class:                Doctrine\Common\Cache\PhpFileCache
         arguments:            [%kernel.cache_dir%]
     twig.extension.intl:
-         class: Twig_Extensions_Extension_Intl
+         class:               Twig_Extensions_Extension_Intl
          tags:
              - { name: twig.extension }
+    doctrine.dbal.default.wrapped_connection:
+        factory_service:      doctrine.dbal.default_connection
+        factory_method:       getWrappedConnection
+        class:                PDO
+    session.handler.pdo:
+        class:                Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler
+        arguments:
+            - "@doctrine.dbal.default.wrapped_connection"
+            -
+              db_table:       oro_session
+              db_id_col:      id
 
 escape_wsse_authentication:
     authentication_provider_class: Oro\Bundle\UserBundle\Security\WsseUserProvider
@@ -184,16 +201,45 @@ genemu_form:
     select2: ~
     autocomplete: ~
 
+clank:
+    web_socket_server:
+        port:                 %websocket_port%                # The port the socket server will listen on
+        host:                 %websocket_host%                # (optional) The host ip to bind to
+    session_handler:          session.handler.pdo
+    periodic:
+        -
+            service:          "oro_wamp.db_ping"
+            time:             60000                           # the time in milliseconds between the "tick" function being called
+
+jms_di_extra:
+    doctrine_integration: false
+
+a2lix_translation_form:
+    locales: [en, fr]
+    templating: "OroUIBundle:Form:translateable.html.twig"
+
+lexik_maintenance:
+    authorized:
+        path:                 "maintenance|.*\.js"             # "maintenance" is only for demo purposes, remove in production!
+#        ips:                  ["127.0.0.1"]                   # Optional. Authorized ip addresses
+    driver:
+        class:                Lexik\Bundle\MaintenanceBundle\Drivers\FileDriver
+        options:
+            file_path:        %kernel.root_dir%/cache/lock
+
+#
+# ORO Bundles config
+#
 oro_search:
     engine:                   orm
     realtime_update:          true
 
 oro_ui:
     settings:
         application_name:
-            value: "Oro Platform"
+            value:            "Oro Platform"
         application_title:
-            value: "Oro Business Application Platform"
+            value:            "Oro Business Application Platform"
 
 oro_user:
     settings:
@@ -203,15 +249,8 @@ oro_user:
 oro_translation:
     js_translation:
         # order of domains reflects messages fallback
-        domains: [jsmessages, validators]
-
-jms_di_extra:
-    doctrine_integration: false
+        domains:              [jsmessages, validators]
 
 oro_entity_extend:
-    backend:        Dynamic
-    backup:         "%kernel.root_dir%/entities/Backup/"
-
-a2lix_translation_form:
-    locales: [en, fr]
-    templating: "OroUIBundle:Form:translateable.html.twig"
+    backend:                  Dynamic
+    backup:                   "%kernel.root_dir%/entities/Backup/"

app/config/parameters.yml.dist

@@ -27,5 +27,9 @@ parameters:
     mailer_user:            ~
     mailer_password:        ~
 
+    # WebSocket server config
+    websocket_host:         "127.0.0.1"
+    websocket_port:         8080
+
     locale:                 en
     secret:                 ThisTokenIsNotSoSecretChangeIt

app/config/routing.yml

@@ -54,9 +54,6 @@ oro_soap:
     resource: "@OroSoapBundle/Resources/config/routing.yml"
     prefix:   /api
 
-oro_dataflow:
-    resource: "@OroDataFlowBundle/Resources/config/routing.yml"
-
 oro_config:
     resource: "@OroConfigBundle/Resources/config/routing.yml"
 
@@ -69,6 +66,9 @@ oro_entity_config:
 oro_entity_extend:
     resource: "@OroEntityExtendBundle/Resources/config/routing.yml"
 
+oro_workflow:
+    resource: "@OroWorkflowBundle/Resources/config/routing.yml"
+
 oro_address:
     resource: "@OroAddressBundle/Resources/config/routing.yml"
 

install.bat

@@ -10,11 +10,11 @@ php app/console-framework oro:navigation:init --env %ENV% || goto :error
 php app/console-framework oro:entity-config:update --env %ENV% || goto :error
 php app/console-framework oro:entity-extend:create --env %ENV% || goto :error
 php app/console-framework cache:clear --env %ENV% || goto :error
-php app/console-framework doctrine:schema:update --force --env %ENV% || goto :error
+php app/console-framework doctrine:schema:update --env %ENV% --force || goto :error
 php app/console-framework oro:search:create-index --env %ENV% || goto :error
 php app/console-framework assets:install web --env %ENV% || goto :error
-php app/console assetic:dump --env %ENV% || goto :error
-php app/console oro:assetic:dump || goto :error
+php app/console-framework assetic:dump --env %ENV% || goto :error
+php app/console-framework oro:assetic:dump || goto :error
 goto :EOF
 
 :error