Merge pull request #34 from mgoldbeck/script-elastic130

[!!!][TASK]  Raise ElasticSearch Version Dependency to 1.2.0 - NEEDS ADDITIONAL CONFIGURATION of ElasticSearch

Please check the README to understand the relevant ElasticSearch configuration which needs to be done
in elasticsearch.yaml.

Author: skurfuerst

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Indexer/NodeIndexer.php

@@ -200,7 +200,10 @@ public function indexNode(Node $node, $targetWorkspaceName = NULL) {
 						'params' => array(
 							'newData' => $documentData
 						),
-						'upsert' => $documentData
+						'upsert' => $documentData,
+						'lang' => 'groovy'
+
+
 					)
 				);
 			} else {
@@ -263,10 +266,15 @@ protected function updateFulltext(Node $node, array $fulltextIndexOfNode, $targe
 						ctx._source.__fulltextParts = new LinkedHashMap();
 					}
 					ctx._source.__fulltextParts[identifier] = fulltext;
-
 					ctx._source.__fulltext = new LinkedHashMap();
-					foreach (fulltextByNode : ctx._source.__fulltextParts.entrySet()) {
-						foreach (element : fulltextByNode.value.entrySet()) {
+
+					Iterator fulltextByNode = ctx._source.__fulltextParts.iterator();
+					for (fulltextByNode; fulltextByNode.hasNext();) {
+
+						Iterator elementIterator = fulltextByNode.next().iterator();
+						for (elementIterator; elementIterator.hasNext();) {
+
+							Map.Entry<String, String> element = elementIterator.next();
 							if (ctx._source.__fulltext.containsKey(element.key)) {
 								ctx._source.__fulltext[element.key] += " " + element.value;
 							} else {
@@ -284,7 +292,8 @@ protected function updateFulltext(Node $node, array $fulltextIndexOfNode, $targe
 					'__fulltextParts' => array(
 						$node->getIdentifier() => $fulltextIndexOfNode
 					)
-				)
+				),
+				'lang' => 'groovy'
 			)
 		);
 	}

README.md

@@ -1,5 +1,7 @@
 # TYPO3 Neos ElasticSearch Adapter
 
+*supporting ElasticSearch Version 1.2.x and 1.3.x*
+
 Created by Sebastian Kurfürst; contributions by Karsten Dambekalns and Robert Lemke.
 
 This project connects the TYPO3 Content Repository (TYPO3CR) to ElasticSearch; enabling two
@@ -30,6 +32,40 @@ Relevant Packages:
 
 The configuration from Version 1 to Version 2 has changed; here's what to change:
 
+**elasticsearch.yaml**
+
+Due to the fact that the default scripting language has changed from marvel to groovy since elasticsearch 1.3.0,
+there is a need, depending on your running installation of ElasticSearch, to add following lines of configuration to your
+ElasticSearch Configuration File `elasticsearch.yaml`.
+
+If you are using ElasticSearch version 1.2 you have also to install groovy as a plugin. To install the plugin just run
+the following command in the root folder of your elastic:
+
+```
+bin/plugin -install elasticsearch/elasticsearch-lang-groovy/2.2.0.
+```
+
+```
+script.disable_dynamic: false
+script.default_lang: groovy
+
+```
+
+For running with version > 1.3.x, what is recommended, it is sufficient to add following lines to your
+`elasticsearch.yaml`.
+
+
+```
+script.groovy.sandbox.class_whitelist: java.util.LinkedHashMap
+script.groovy.sandbox.receiver_whitelist:  java.util.Iterator, java.lang.Object, java.util.Map, java.util.Map$Entry
+```
+
+You can get further information about this topic here:
+
+http://www.elasticsearch.org/blog/elasticsearch-1-3-0-released/
+http://www.elasticsearch.org/blog/scripting-security/
+http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-scripting.html
+
 **Settings.yaml**
 
 1. Change the base namespace for configuration from `Flowpack.ElasticSearch.ContentRepositoryAdaptor`