From 64be10447de535ee85f1cc2511ea55e943642df9 Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Mon, 16 Jun 2014 22:33:04 +1000
Subject: [PATCH] Move Search annotation

---
 Annotation/Search.php    | 16 ++++++++++++++++
 CHANGELOG-3.0.md         |  3 ++-
 Configuration/Search.php | 19 ++++++++++++++-----
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 Annotation/Search.php

diff --git a/Annotation/Search.php b/Annotation/Search.php
new file mode 100644
index 0000000..26e1dbf
--- /dev/null
+++ b/Annotation/Search.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace FOS\ElasticaBundle\Annotation;
+
+/**
+ * Annotation class for setting search repository.
+ *
+ * @author Richard Miller <info@limethinking.co.uk>
+ * @Annotation
+ * @Target("CLASS")
+ */
+class Search
+{
+    /** @var string */
+    public $repositoryClass;
+}
diff --git a/CHANGELOG-3.0.md b/CHANGELOG-3.0.md
index 095c268..62e347a 100644
--- a/CHANGELOG-3.0.md
+++ b/CHANGELOG-3.0.md
@@ -14,6 +14,7 @@ To generate a changelog summary since the last version, run
 
 * 3.0.0-ALPHA6
 
+ * Annotation @Search moved to FOS\ElasticaBundle\Annotation\Search with FOS\ElasticaBundle\Configuration\Search deprecated
  * Deprecated FOS\ElasticaBundle\Client in favour of FOS\ElasticaBundle\Elastica\Client
  * Deprecated FOS\ElasticaBundle\DynamicIndex in favour of FOS\ElasticaBundle\Elastica\Index
  * Deprecated FOS\ElasticaBundle\IndexManager in favour of FOS\ElasticaBundle\Index\IndexManager
@@ -21,7 +22,7 @@ To generate a changelog summary since the last version, run
 
 * 3.0.0-ALPHA5 (2014-05-23)
 
-* Doctrine Provider speed up by disabling persistence logging while populating documents
+ * Doctrine Provider speed up by disabling persistence logging while populating documents
 
 * 3.0.0-ALPHA4 (2014-04-10)
 
diff --git a/Configuration/Search.php b/Configuration/Search.php
index cee10ab..1306f92 100644
--- a/Configuration/Search.php
+++ b/Configuration/Search.php
@@ -1,16 +1,25 @@
 <?php
 
+/**
+ * This file is part of the FOSElasticaBundle project.
+ *
+ * (c) Tim Nagel <tim@nagel.com.au>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace FOS\ElasticaBundle\Configuration;
 
+use FOS\ElasticaBundle\Annotation\Search as BaseSearch;
+
 /**
  * Annotation class for setting search repository.
  *
- * @author Richard Miller <info@limethinking.co.uk>
  * @Annotation
+ * @deprecated Use FOS\ElasticaBundle\Annotation\Search instead
  * @Target("CLASS")
  */
-class Search
+class Search extends BaseSearch
 {
-    /** @var string */
-    public $repositoryClass;
-}
+}