From abfd92ec87966db48bcaef423a369cd931b16113 Mon Sep 17 00:00:00 2001
From: cdujeu <charles@ajaxplorer.info>
Date: Wed, 12 Oct 2016 08:22:37 +0200
Subject: [PATCH] Package cypher.encfs, action.timestamp, action.antivirus and
 index.elasticsearch by default in the standard distrib

---
 core/src/plugins/action.antivirus/manifest.xml            | 4 ++--
 core/src/plugins/action.timestamp/manifest.xml            | 2 +-
 core/src/plugins/cypher.encfs/manifest.xml                | 2 +-
 core/src/plugins/index.elasticsearch/composer.json        | 8 ++++++++
 core/src/plugins/index.elasticsearch/manifest.xml         | 4 ++--
 .../{ => src}/ElasticSearchIndexer.php                    | 2 --
 6 files changed, 14 insertions(+), 8 deletions(-)
 rename core/src/plugins/index.elasticsearch/{ => src}/ElasticSearchIndexer.php (99%)

diff --git a/core/src/plugins/action.antivirus/manifest.xml b/core/src/plugins/action.antivirus/manifest.xml
index 528b75f1cc..ae631d0e36 100644
--- a/core/src/plugins/action.antivirus/manifest.xml
+++ b/core/src/plugins/action.antivirus/manifest.xml
@@ -6,10 +6,10 @@
 
 	<!-- plugin information -->
 	<plugin_info>
-		<plugin_author>Sylvain Letreguilly</plugin_author>
+		<plugin_author>Sylvain Letreguilly, Pydio Team</plugin_author>
 		<plugin_uri>no</plugin_uri>
 		<plugin_version>1</plugin_version>
-	        <core_relation packaged="false" tested_version="4.3.3"/>
+        <core_relation packaged="true" tested_version="7.0"/>
 	</plugin_info>
 
 	<client_settings>
diff --git a/core/src/plugins/action.timestamp/manifest.xml b/core/src/plugins/action.timestamp/manifest.xml
index 6108890b60..d8c105e1b2 100644
--- a/core/src/plugins/action.timestamp/manifest.xml
+++ b/core/src/plugins/action.timestamp/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin id="action.timestamp"  enabled="false" label="CONF_MESSAGE[timestamp]" description="CONF_MESSAGE[Allow timestamp files with Universign.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
     <plugin_info>
-        <core_relation packaged="false" tested_version="4.3.3"/>
+        <core_relation packaged="true" tested_version="7.0"/>
         <plugin_author>FDecourt</plugin_author>
         <plugin_version>1.0</plugin_version>
     </plugin_info>
diff --git a/core/src/plugins/cypher.encfs/manifest.xml b/core/src/plugins/cypher.encfs/manifest.xml
index 36f782509a..9a16f144d8 100644
--- a/core/src/plugins/cypher.encfs/manifest.xml
+++ b/core/src/plugins/cypher.encfs/manifest.xml
@@ -2,7 +2,7 @@
 <ajxp_plugin enabled="false" label="CONF_MESSAGE[Encfs Mount]" description="CONF_MESSAGE[Dynamically create/mount/umount an encfs filesystem]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
     <plugin_info>
-        <core_relation packaged="false" tested_version="4.2.2"/>
+        <core_relation packaged="true" tested_version="7.0"/>
         <plugin_author>Charles du Jeu</plugin_author>
     </plugin_info>
     <client_settings>
diff --git a/core/src/plugins/index.elasticsearch/composer.json b/core/src/plugins/index.elasticsearch/composer.json
index 43f09bfc29..839729fc9b 100644
--- a/core/src/plugins/index.elasticsearch/composer.json
+++ b/core/src/plugins/index.elasticsearch/composer.json
@@ -1,4 +1,12 @@
 {
+  "name": "ElasticSearchIndexer",
+  "description": "Search engine using ElasticSearch as a backend",
+  "homepage": "https://pydio.com/",
+  "autoload": {
+    "psr-4": {
+      "Pydio\\Access\\Indexer\\Implementation\\": "./src"
+    }
+  },
   "require":{
     "ruflin/elastica" : "3.2"
   }
diff --git a/core/src/plugins/index.elasticsearch/manifest.xml b/core/src/plugins/index.elasticsearch/manifest.xml
index 1d465515e8..6880711f77 100644
--- a/core/src/plugins/index.elasticsearch/manifest.xml
+++ b/core/src/plugins/index.elasticsearch/manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <indexer id="index.elasticsearch" enabled="false" label="CONF_MESSAGE[ElasticSearch Search Engine]" description="CONF_MESSAGE[ElasticSearch implementation to index all files and search a whole repository quickly.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
     <plugin_info>
-        <core_relation packaged="false" tested_version="1.0"/>
+        <core_relation packaged="true" tested_version="7.0"/>
     </plugin_info>
 
-    <class_definition filename="plugins/index.elasticsearch/ElasticSearchIndexer.php" classname="Pydio\Access\Indexer\Implementation\ElasticSearchIndexer"/>
+    <class_definition filename="plugins/index.elasticsearch/vendor/autoload.php" classname="Pydio\Access\Indexer\Implementation\ElasticSearchIndexer"/>
     <client_settings>
         <resources>
             <img_library alias="elastic_search_images" path="plugins/index.elasticsearch/resources/images"/>
diff --git a/core/src/plugins/index.elasticsearch/ElasticSearchIndexer.php b/core/src/plugins/index.elasticsearch/src/ElasticSearchIndexer.php
similarity index 99%
rename from core/src/plugins/index.elasticsearch/ElasticSearchIndexer.php
rename to core/src/plugins/index.elasticsearch/src/ElasticSearchIndexer.php
index b8daf5f07d..a4035a6bc1 100644
--- a/core/src/plugins/index.elasticsearch/ElasticSearchIndexer.php
+++ b/core/src/plugins/index.elasticsearch/src/ElasticSearchIndexer.php
@@ -35,8 +35,6 @@
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
 
-require_once (dirname(__FILE__)."/vendor/autoload.php");
-
 /**
  * Encapsultion of the Elastica component as a plugin
  * @package AjaXplorer_Plugins