Merge pull request #12 from kdambekalns/style-tweaks

TASK: Use PSR-4, adjust README, tweak composer manifest

Author: dfeyer

…mand/NodeIndexQueueCommandController.php …mand/NodeIndexQueueCommandController.phpClasses/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Command/NodeIndexQueueCommandController.php renamed to Classes/Command/NodeIndexQueueCommandController.php Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Command/NodeIndexQueueCommandController.php renamed to Classes/Command/NodeIndexQueueCommandController.php

@@ -6,8 +6,8 @@
 use Flowpack\JobQueue\Common\Job\JobInterface;
 use Flowpack\JobQueue\Common\Queue\Message;
 use Flowpack\JobQueue\Common\Queue\QueueInterface;
+use Neos\ContentRepository\Domain\Model\NodeData;
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Log\SystemLoggerInterface;
 use Neos\Flow\Utility\Algorithms;
 use Neos\ContentRepository\Domain\Factory\NodeFactory;
 use Neos\ContentRepository\Domain\Model\NodeInterface;

…Domain/Repository/NodeDataRepository.php …Domain/Repository/NodeDataRepository.phpClasses/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Domain/Repository/NodeDataRepository.php renamed to Classes/Domain/Repository/NodeDataRepository.php Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Domain/Repository/NodeDataRepository.php renamed to Classes/Domain/Repository/NodeDataRepository.php

@@ -1,11 +1,14 @@
-# Neos CMS ElasticSearch indexer based on beanstalkd (job queue)
+# Neos CMS Elasticsearch indexer based on a job queue
 
-This package can be used to index a huge amount of nodes in ElasticSearch indexes. This 
-package use Beanstalkd and the JobQueue package to handle ES indexing asynchronously.
+This package can be used to index a huge amount of nodes in Elasticsearch indexes. This
+package use the Flowpack JobQueue packages to handle the indexing asynchronously.
 
 # Breaking change after an upgrade to 3.0
 
-## Install and configure your Queue package
+Previously the Beanstalk queue package was installed by default, this is no longer
+the case.
+
+# Install and configure your Queue package
 
 You need to install the correct Queue package based on your needs.
 
@@ -18,10 +21,10 @@ Available packages:
 
 Please check the package documentation for specific configurations.
 
-The default configuration use Beanstalkd, but you need to install it manually:
+The default configuration uses Beanstalkd, but you need to install it manually:
 
     composer require flowpack/jobqueue-beanstalkd
-    
+
 Check the ```Settings.yaml``` to adapt based on the Queue package, you need to adapt the ```className```:
 
     Flowpack:
@@ -30,18 +33,16 @@ Check the ```Settings.yaml``` to adapt based on the Queue package, you need to a
           queues:
             'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':
               className: 'Flowpack\JobQueue\Beanstalkd\Queue\BeanstalkdQueue'
-    
+
             'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer.Live':
               className: 'Flowpack\JobQueue\Beanstalkd\Queue\BeanstalkdQueue'
 
-   
-
 # Batch Indexing
 
 ## How to build indexing job
 
     flow nodeindexqueue:build --workspace live
-    
+
 ## How to process indexing job
 
 You can use this CLI command to process indexing job:
@@ -56,20 +57,20 @@ You can disable async live indexing by editing ```Settings.yaml```:
       ElasticSearch:
         ContentRepositoryQueueIndexer:
           enableLiveAsyncIndexing: false
-          
+
 You can use this CLI command to process indexing job:
 
-    flow nodeindexqueue:work --queue live          
+    flow nodeindexqueue:work --queue live
 
 # Supervisord configuration
 
 You can use tools like ```supervisord``` to manage long runing process. Bellow you can
 found a basic configuration:
 
     [supervisord]
-   
+
     [supervisorctl]
-   
+
     [program:elasticsearch_batch_indexing]
     command=php flow nodeindexqueue:work --queue batch
     stdout_logfile=AUTO
@@ -80,7 +81,7 @@ found a basic configuration:
     autostart=true
     autorestart=true
     stopsignal=QUIT
-    
+
     [program:elasticsearch_live_indexing]
     command=php flow nodeindexqueue:work --queue live
     stdout_logfile=AUTO

…toryQueueIndexer/Indexer/NodeIndexer.php Classes/Indexer/NodeIndexer.phpClasses/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Indexer/NodeIndexer.php renamed to Classes/Indexer/NodeIndexer.php Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Indexer/NodeIndexer.php renamed to Classes/Indexer/NodeIndexer.php

@@ -1,15 +1,15 @@
 {
   "name": "flowpack/elasticsearch-contentrepositoryqueueindexer",
-  "type": "typo3-flow-package",
-  "description": "Neos CMS ElasticSearch indexer based on beanstalkd (job queue)",
+  "type": "neos-package",
+  "description": "Neos CMS Elasticsearch indexer based on a job queue",
   "license": "MIT",
   "require": {
     "flowpack/jobqueue-common": "^2.0.0",
     "flowpack/elasticsearch-contentrepositoryadaptor": "^4.0.0"
   },
   "autoload": {
-    "psr-0": {
-      "Flowpack\\ElasticSearch\\ContentRepositoryQueueIndexer": "Classes"
+    "psr-4": {
+      "Flowpack\\ElasticSearch\\ContentRepositoryQueueIndexer\\": "Classes"
     }
   },
   "extra": {