diff --git a/lib/Drupal/search/ViewsSearchQuery.php b/lib/Drupal/search/ViewsSearchQuery.php
new file mode 100644
index 0000000000000000000000000000000000000000..3d8bd0d303378f4756b4a31a15afdb4e380c26e5
--- /dev/null
+++ b/lib/Drupal/search/ViewsSearchQuery.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Drupal\search;
+
+/**
+ * Extends the core SearchQuery.
+ *
+ * @todo: Make this class PSR-0 compatible.
+ */
+class ViewsSearchQuery extends SearchQuery {
+ public function &conditions() {
+ return $this->conditions;
+ }
+ public function words() {
+ return $this->words;
+ }
+
+ public function simple() {
+ return $this->simple;
+ }
+
+ public function matches() {
+ return $this->matches;
+ }
+
+ public function publicParseSearchExpression() {
+ return $this->parseSearchExpression();
+ }
+
+ function condition_replace_string($search, $replace, &$condition) {
+ if ($condition['field'] instanceof DatabaseCondition) {
+ $conditions =& $condition['field']->conditions();
+ foreach ($conditions as $key => &$subcondition) {
+ if (is_numeric($key)) {
+ $this->condition_replace_string($search, $replace, $subcondition);
+ }
+ }
+ }
+ else {
+ $condition['field'] = str_replace($search, $replace, $condition['field']);
+ }
+ }
+}
diff --git a/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php b/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php
similarity index 93%
rename from lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php
rename to lib/Views/aggregator/Plugin/views/argument/CategoryCid.php
index 9f558a27e17ccd3f192a46104ea0009176991a0a..745a881925cd5b1d960efdfe519266b69fc3be41 100644
--- a/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/CategoryCid.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_aggregator_category_cid.
*/
-namespace Drupal\aggregator\Plugin\views\argument;
+namespace Views\aggregator\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\Numeric;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/aggregator/Plugin/views/argument/Fid.php b/lib/Views/aggregator/Plugin/views/argument/Fid.php
similarity index 93%
rename from lib/Drupal/aggregator/Plugin/views/argument/Fid.php
rename to lib/Views/aggregator/Plugin/views/argument/Fid.php
index 5101455f0ae03f4a313a34e1afc8f2b6e83e4736..ede22115390879988e80220e93c2ebb645293345 100644
--- a/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/Fid.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_aggregator_fid.
*/
-namespace Drupal\aggregator\Plugin\views\argument;
+namespace Views\aggregator\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\Numeric;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/aggregator/Plugin/views/argument/Iid.php b/lib/Views/aggregator/Plugin/views/argument/Iid.php
similarity index 94%
rename from lib/Drupal/aggregator/Plugin/views/argument/Iid.php
rename to lib/Views/aggregator/Plugin/views/argument/Iid.php
index b1fd3c1424dd1fbe3589cb09affe70d02a3f8ff4..e27482dd13a2a21be3c91c66c10018c664edb39b 100644
--- a/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
+++ b/lib/Views/aggregator/Plugin/views/argument/Iid.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_aggregator_iid.
*/
-namespace Drupal\aggregator\Plugin\views\argument;
+namespace Views\aggregator\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\Numeric;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/aggregator/Plugin/views/field/Category.php b/lib/Views/aggregator/Plugin/views/field/Category.php
similarity index 97%
rename from lib/Drupal/aggregator/Plugin/views/field/Category.php
rename to lib/Views/aggregator/Plugin/views/field/Category.php
index f486c6c4230469c7c333f5efa83d0775ca3e7e27..eff1875e28a41497f2b4c87a61d59cb715f40ee0 100644
--- a/lib/Drupal/aggregator/Plugin/views/field/Category.php
+++ b/lib/Views/aggregator/Plugin/views/field/Category.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_aggregator_category.
*/
-namespace Drupal\aggregator\Plugin\views\field;
+namespace Views\aggregator\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php b/lib/Views/aggregator/Plugin/views/field/TitleLink.php
similarity index 96%
rename from lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
rename to lib/Views/aggregator/Plugin/views/field/TitleLink.php
index aa2c0757cea8549d362576f1c51ff56e2e4801c7..35e53f0d263578de777a8cf362a9e532d557b32c 100644
--- a/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
+++ b/lib/Views/aggregator/Plugin/views/field/TitleLink.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_aggregator_title_link.
*/
-namespace Drupal\aggregator\Plugin\views\field;
+namespace Views\aggregator\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/aggregator/Plugin/views/field/Xss.php b/lib/Views/aggregator/Plugin/views/field/Xss.php
similarity index 90%
rename from lib/Drupal/aggregator/Plugin/views/field/Xss.php
rename to lib/Views/aggregator/Plugin/views/field/Xss.php
index fd65e8def4133c8e51121c23834d94c778669719..5680ba1ce5b7d5a20544a5aa8572d45f3012672e 100644
--- a/lib/Drupal/aggregator/Plugin/views/field/Xss.php
+++ b/lib/Views/aggregator/Plugin/views/field/Xss.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_aggregator_xss.
*/
-namespace Drupal\aggregator\Plugin\views\field;
+namespace Views\aggregator\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php b/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
similarity index 93%
rename from lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php
rename to lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
index f7c6f54e7595ac0e922f94d3c4dc4e418b1e8017..dec3a576bd9de542fda32c794d97289fe7346f60 100644
--- a/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php
+++ b/lib/Views/aggregator/Plugin/views/filter/CategoryCid.php
@@ -5,7 +5,7 @@
* Definition of views_handler_filter_aggregator_category_cid.
*/
-namespace Drupal\aggregator\Plugin\views\filter;
+namespace Views\aggregator\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\InOperator;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/aggregator/Plugin/views/row/Rss.php b/lib/Views/aggregator/Plugin/views/row/Rss.php
similarity index 98%
rename from lib/Drupal/aggregator/Plugin/views/row/Rss.php
rename to lib/Views/aggregator/Plugin/views/row/Rss.php
index be14968642cbd94edada19e23e73706e86e0d7e8..15286d666d20329b969c606ca83540e1834083fc 100644
--- a/lib/Drupal/aggregator/Plugin/views/row/Rss.php
+++ b/lib/Views/aggregator/Plugin/views/row/Rss.php
@@ -5,7 +5,7 @@
* Contains the Aggregator Item RSS row style plugin.
*/
-namespace Drupal\aggregator\Plugin\views\row;
+namespace Views\aggregator\Plugin\views\row;
use Drupal\views\Plugin\views\row\RowPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/book/Plugin/views/argument_default/Root.php b/lib/Views/book/Plugin/views/argument_default/Root.php
similarity index 93%
rename from lib/Drupal/book/Plugin/views/argument_default/Root.php
rename to lib/Views/book/Plugin/views/argument_default/Root.php
index 1c0fdb136db691706e7f9571a477eed585f3fa60..b4213e1560e5f81ae71358650553d070f491154f 100644
--- a/lib/Drupal/book/Plugin/views/argument_default/Root.php
+++ b/lib/Views/book/Plugin/views/argument_default/Root.php
@@ -4,7 +4,7 @@
* Contains the book root from current node argument default plugin.
*/
-namespace Drupal\book\Plugin\views\argument_default;
+namespace Views\book\Plugin\views\argument_default;
use Views\node\Plugin\views\argument_default\Node;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/argument/UserUid.php b/lib/Views/comment/Plugin/views/argument/UserUid.php
similarity index 97%
rename from lib/Drupal/comment/Plugin/views/argument/UserUid.php
rename to lib/Views/comment/Plugin/views/argument/UserUid.php
index 8ed7be356312616790a7b6bc8afef03bec242af7..543cfb613a1a66082bec0707c7a5e54d5bfac5bf 100644
--- a/lib/Drupal/comment/Plugin/views/argument/UserUid.php
+++ b/lib/Views/comment/Plugin/views/argument/UserUid.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_comment_user_uid.
*/
-namespace Drupal\comment\Plugin\views\argument;
+namespace Views\comment\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/field/Comment.php b/lib/Views/comment/Plugin/views/field/Comment.php
similarity index 98%
rename from lib/Drupal/comment/Plugin/views/field/Comment.php
rename to lib/Views/comment/Plugin/views/field/Comment.php
index a6e6363a9e32c54b05e33fe96f37d902550c5992..9f1ee99aed9c27f40c25bda5f8d9a818d303273f 100644
--- a/lib/Drupal/comment/Plugin/views/field/Comment.php
+++ b/lib/Views/comment/Plugin/views/field/Comment.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_comment.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/field/Depth.php b/lib/Views/comment/Plugin/views/field/Depth.php
similarity index 82%
rename from lib/Drupal/comment/Plugin/views/field/Depth.php
rename to lib/Views/comment/Plugin/views/field/Depth.php
index 3dd386db7d0cccec05859188259a6d2b1edc4fc9..9fc6bab20cc456cd2d084f720a7d31266c5ec4da 100644
--- a/lib/Drupal/comment/Plugin/views/field/Depth.php
+++ b/lib/Views/comment/Plugin/views/field/Depth.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_comment_depth.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\field\FieldPluginBase;
@@ -21,7 +21,7 @@
* plugin_id = "comment_depth"
* )
*/
-class views_handler_field_comment_depth extends FieldPluginBase {
+class Depth extends FieldPluginBase {
/**
* Work out the depth of this comment
*/
diff --git a/lib/Drupal/comment/Plugin/views/field/LInkDelete.php b/lib/Views/comment/Plugin/views/field/LInkDelete.php
similarity index 94%
rename from lib/Drupal/comment/Plugin/views/field/LInkDelete.php
rename to lib/Views/comment/Plugin/views/field/LInkDelete.php
index 5c0ad1000fa92332ca5409fbc8f07a00e1fb9d3c..eb051ddee9ce796aa31bd0212ff9365d9852e529 100644
--- a/lib/Drupal/comment/Plugin/views/field/LInkDelete.php
+++ b/lib/Views/comment/Plugin/views/field/LInkDelete.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_comment_link_delete.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php b/lib/Views/comment/Plugin/views/field/LastTimestamp.php
similarity index 94%
rename from lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
rename to lib/Views/comment/Plugin/views/field/LastTimestamp.php
index 62ba3a8c71514139d87aa4165d07feadccba5ab8..69da9dcd61112aaa6054a75dfcd10dbc8fb1eab2 100644
--- a/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
+++ b/lib/Views/comment/Plugin/views/field/LastTimestamp.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_last_comment_timestamp.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\Date;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/field/Link.php b/lib/Views/comment/Plugin/views/field/Link.php
similarity index 96%
rename from lib/Drupal/comment/Plugin/views/field/Link.php
rename to lib/Views/comment/Plugin/views/field/Link.php
index 07dc1e73671e8b953a844777ebcbb2c05cfe7e9b..042c3993fbc28a484327a3c20b9f23eb5315afbc 100644
--- a/lib/Drupal/comment/Plugin/views/field/Link.php
+++ b/lib/Views/comment/Plugin/views/field/Link.php
@@ -5,9 +5,10 @@
* Definition of views_handler_field_comment_link.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\Entity;
+use Drupal\Core\Annotation\Plugin;
/**
* Base field handler to present a link.
diff --git a/lib/Drupal/comment/Plugin/views/field/LinkApprove.php b/lib/Views/comment/Plugin/views/field/LinkApprove.php
similarity index 90%
rename from lib/Drupal/comment/Plugin/views/field/LinkApprove.php
rename to lib/Views/comment/Plugin/views/field/LinkApprove.php
index 401168e10258d06727b46913847685daf73f8669..44b41256b48552df50a5f1486d0802bc7eeb5de0 100644
--- a/lib/Drupal/comment/Plugin/views/field/LinkApprove.php
+++ b/lib/Views/comment/Plugin/views/field/LinkApprove.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_comment_link_approve.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\Core\Annotation\Plugin;
@@ -20,7 +20,7 @@
* plugin_id = "comment_link_approve"
* )
*/
-class views_handler_field_comment_link_approve extends Link {
+class LinkApprove extends Link {
function access() {
//needs permission to administer comments in general
return user_access('administer comments');
diff --git a/lib/Drupal/comment/Plugin/views/field/LinkEdit.php b/lib/Views/comment/Plugin/views/field/LinkEdit.php
similarity index 96%
rename from lib/Drupal/comment/Plugin/views/field/LinkEdit.php
rename to lib/Views/comment/Plugin/views/field/LinkEdit.php
index d143b473402785510321d916ceb7ed32e50e336c..cca0d62d0d45d2fb7bd94d4b8c50736f20513d15 100644
--- a/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/comment/Plugin/views/field/LinkEdit.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_comment_link_edit.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/field/LinkReply.php b/lib/Views/comment/Plugin/views/field/LinkReply.php
similarity index 94%
rename from lib/Drupal/comment/Plugin/views/field/LinkReply.php
rename to lib/Views/comment/Plugin/views/field/LinkReply.php
index e881e648beb52fc95f4997be0da41888b28dbe46..70b3d6fedc8452d64ee71eacbc1afd6324d545ce 100644
--- a/lib/Drupal/comment/Plugin/views/field/LinkReply.php
+++ b/lib/Views/comment/Plugin/views/field/LinkReply.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_comment_link_reply.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php b/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php
similarity index 97%
rename from lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
rename to lib/Views/comment/Plugin/views/field/NcsLastCommentName.php
index b386e82abf62cbaa4c4efe0bf1f6e7b060345bbc..2d2c1071ee7365eea69b1dc860d1ef40439fc540 100644
--- a/lib/Drupal/comment/Plugin/views/field/NcsLastCommentName.php
+++ b/lib/Views/comment/Plugin/views/field/NcsLastCommentName.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_ncs_last_comment_name.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\views\Join;
use Drupal\views\Plugin\views\field\FieldPluginBase;
diff --git a/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php b/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php
similarity index 94%
rename from lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php
rename to lib/Views/comment/Plugin/views/field/NcsLastUpdated.php
index bdd9df6a709b3adf32a37248623eb0451571257c..b7de1f71a085ed40e6f8c0702dbcb7ef5c1b593e 100644
--- a/lib/Drupal/comment/Plugin/views/field/NcsLastUpdated.php
+++ b/lib/Views/comment/Plugin/views/field/NcsLastUpdated.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_ncs_last_updated.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\Date;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/field/NodeComment.php b/lib/Views/comment/Plugin/views/field/NodeComment.php
similarity index 93%
rename from lib/Drupal/comment/Plugin/views/field/NodeComment.php
rename to lib/Views/comment/Plugin/views/field/NodeComment.php
index 415d4f8eb7342e309ff80d8d2eeaa2ca306bf8e5..6fb42b17daeaf5cc9f5d34ce25c2c857d4593cd5 100644
--- a/lib/Drupal/comment/Plugin/views/field/NodeComment.php
+++ b/lib/Views/comment/Plugin/views/field/NodeComment.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_node_comment.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/field/NodeLink.php b/lib/Views/comment/Plugin/views/field/NodeLink.php
similarity index 97%
rename from lib/Drupal/comment/Plugin/views/field/NodeLink.php
rename to lib/Views/comment/Plugin/views/field/NodeLink.php
index b3218ea243adab4dec5fd2b06944eb5e0699c275..b970014701528585d8e58b49b7ddbac76012655a 100644
--- a/lib/Drupal/comment/Plugin/views/field/NodeLink.php
+++ b/lib/Views/comment/Plugin/views/field/NodeLink.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_comment_node_link.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\Entity;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/lib/Views/comment/Plugin/views/field/NodeNewComments.php
similarity index 98%
rename from lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
rename to lib/Views/comment/Plugin/views/field/NodeNewComments.php
index f2abd1c49675b9dbd4c510f121e80ae8c6bdaaa7..5b63b2edfdae9cf03fad25f0bd73f2adc2d2072e 100644
--- a/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
+++ b/lib/Views/comment/Plugin/views/field/NodeNewComments.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_node_new_comments.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\Numeric;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/field/Username.php b/lib/Views/comment/Plugin/views/field/Username.php
similarity index 97%
rename from lib/Drupal/comment/Plugin/views/field/Username.php
rename to lib/Views/comment/Plugin/views/field/Username.php
index ceae5630619cf9a97913142aee0bed43c10d3ed6..0bd43e1f7e7c759f6b18dee10612c0735237046a 100644
--- a/lib/Drupal/comment/Plugin/views/field/Username.php
+++ b/lib/Views/comment/Plugin/views/field/Username.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_comment_username.
*/
-namespace Drupal\comment\Plugin\views\field;
+namespace Views\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php b/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php
similarity index 94%
rename from lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php
rename to lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php
index 80c8b36324747d423477e9c29213c4bc4401bc7c..d4efb39cfea48302af796c35c991892f26ea13e9 100644
--- a/lib/Drupal/comment/Plugin/views/filter/NcsLastUpdated.php
+++ b/lib/Views/comment/Plugin/views/filter/NcsLastUpdated.php
@@ -5,7 +5,7 @@
* Definition of views_handler_filter_ncs_last_updated.
*/
-namespace Drupal\comment\Plugin\views\filter;
+namespace Views\comment\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\Date;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/filter/NodeComment.php b/lib/Views/comment/Plugin/views/filter/NodeComment.php
similarity index 92%
rename from lib/Drupal/comment/Plugin/views/filter/NodeComment.php
rename to lib/Views/comment/Plugin/views/filter/NodeComment.php
index 71bd2bdaad6c9d17825dfb768b31aae2ba62c46b..5cf22ef0f581bf9ffbe5ed47e507cd93e6c52e74 100644
--- a/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
+++ b/lib/Views/comment/Plugin/views/filter/NodeComment.php
@@ -5,7 +5,7 @@
* Definition of views_handler_filter_node_comment.
*/
-namespace Drupal\comment\Plugin\views\filter;
+namespace Views\comment\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\InOperator;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/filter/UserUid.php b/lib/Views/comment/Plugin/views/filter/UserUid.php
similarity index 95%
rename from lib/Drupal/comment/Plugin/views/filter/UserUid.php
rename to lib/Views/comment/Plugin/views/filter/UserUid.php
index 1f49d6294cdcb72aa9d13b50a71326f4d389e473..05c54ee0d6cdcd0728cd8c2401a89540a467ca23 100644
--- a/lib/Drupal/comment/Plugin/views/filter/UserUid.php
+++ b/lib/Views/comment/Plugin/views/filter/UserUid.php
@@ -5,7 +5,7 @@
* Definition of views_handler_filter_comment_user_uid.
*/
-namespace Drupal\comment\Plugin\views\filter;
+namespace Views\comment\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/comment/Plugin/views/row/Rss.php b/lib/Views/comment/Plugin/views/row/Rss.php
similarity index 98%
rename from lib/Drupal/comment/Plugin/views/row/Rss.php
rename to lib/Views/comment/Plugin/views/row/Rss.php
index cd9c3e0812754a6b4ad4850272ded7072c288b6b..2bc90ff7ef10ab6e5bd0f9f312e3db8bc2f8257c 100644
--- a/lib/Drupal/comment/Plugin/views/row/Rss.php
+++ b/lib/Views/comment/Plugin/views/row/Rss.php
@@ -5,7 +5,7 @@
* Contains the comment RSS row style plugin.
*/
-namespace Drupal\comment\Plugin\views\row;
+namespace Views\comment\Plugin\views\row;
use Drupal\views\Plugin\views\row\RowPluginBase;
use Drupal\Core\Annotation\Plugin;
@@ -22,7 +22,7 @@
* base = {"comment"},
* uses_options = TRUE,
* type = "feed",
- * help_topic" = "style-comment-rss"
+ * help_topic = "style-comment-rss"
* )
*/
class Rss extends RowPluginBase {
diff --git a/lib/Drupal/comment/Plugin/views/row/View.php b/lib/Views/comment/Plugin/views/row/View.php
similarity index 97%
rename from lib/Drupal/comment/Plugin/views/row/View.php
rename to lib/Views/comment/Plugin/views/row/View.php
index cef07287cd4399bb541edca1daf576edcbceca05..856fc119b7e2d0f5ba52daa3c11d4b39d1ac5f7f 100644
--- a/lib/Drupal/comment/Plugin/views/row/View.php
+++ b/lib/Views/comment/Plugin/views/row/View.php
@@ -5,7 +5,7 @@
* Contains the node RSS row style plugin.
*/
-namespace Drupal\comment\Plugin\views\row;
+namespace Views\comment\Plugin\views\row;
use Drupal\views\Plugin\views\row\RowPluginBase;
use Drupal\Core\Annotation\Plugin;
@@ -22,7 +22,7 @@
* base = {"comment"},
* uses_options = TRUE,
* type = "normal",
- * help_topic" = "style-comment"
+ * help_topic = "style-comment"
* )
*/
class View extends RowPluginBase {
diff --git a/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php b/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php
similarity index 96%
rename from lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
rename to lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php
index 2330d46baf9983f8164cb19299a8df16c84f6002..e5b6d9fe5ee7a2b623e751bc675f20f83115982f 100644
--- a/lib/Drupal/comment/Plugin/views/sort/NcsLastCommentName.php
+++ b/lib/Views/comment/Plugin/views/sort/NcsLastCommentName.php
@@ -5,7 +5,7 @@
* Definition of views_handler_sort_ncs_last_comment_name.
*/
-namespace Drupal\comment\Plugin\views\sort;
+namespace Views\comment\Plugin\views\sort;
use Drupal\views\Join;
use Drupal\views\Plugin\views\sort\SortPluginBase;
diff --git a/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php b/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php
similarity index 89%
rename from lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php
rename to lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php
index 75a911c70b38d4b74369d868dd71feed26f82e50..bf850dd01b0aca8e3be56bccb50897868dde92e8 100644
--- a/lib/Drupal/comment/Plugin/views/sort/NcsLastUpdated.php
+++ b/lib/Views/comment/Plugin/views/sort/NcsLastUpdated.php
@@ -5,7 +5,7 @@
* Definition of views_handler_sort_ncs_last_updated.
*/
-namespace Drupal\comment\Plugin\views\sort;
+namespace Views\comment\Plugin\views\sort;
use Drupal\views\Plugin\views\sort\Date;
use Drupal\Core\Annotation\Plugin;
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = 'ncs_last_updated'
+ * plugin_id = "ncs_last_updated"
* )
*/
class NcsLastUpdated extends Date {
diff --git a/lib/Drupal/comment/Plugin/views/sort/Thread.php b/lib/Views/comment/Plugin/views/sort/Thread.php
similarity index 92%
rename from lib/Drupal/comment/Plugin/views/sort/Thread.php
rename to lib/Views/comment/Plugin/views/sort/Thread.php
index 9986c567d34ab88c36e38236023f3f5902c13d78..6bdf70855aea47f679f1481668cbfa238fa5a8fc 100644
--- a/lib/Drupal/comment/Plugin/views/sort/Thread.php
+++ b/lib/Views/comment/Plugin/views/sort/Thread.php
@@ -5,7 +5,7 @@
* Definition of views_handler_sort_comment_thread.
*/
-namespace Drupal\comment\Plugin\views\sort;
+namespace Views\comment\Plugin\views\sort;
use Drupal\views\Plugin\views\sort\SortPluginBase;
use Drupal\Core\Annotation\Plugin;
@@ -18,7 +18,7 @@
/**
* @Plugin(
- * plugin_id = 'comment_thread'
+ * plugin_id = "comment_thread"
* )
*/
class Thread extends SortPluginBase {
diff --git a/lib/Drupal/contact/Plugin/views/field/ContactLink.php b/lib/Views/contact/Plugin/views/field/ContactLink.php
similarity index 94%
rename from lib/Drupal/contact/Plugin/views/field/ContactLink.php
rename to lib/Views/contact/Plugin/views/field/ContactLink.php
index a7cd8f39a33931d318b4933f9a4f2621c7ba1d2c..f8614b837db250e094179e6b3b91c96974735d38 100644
--- a/lib/Drupal/contact/Plugin/views/field/ContactLink.php
+++ b/lib/Views/contact/Plugin/views/field/ContactLink.php
@@ -5,9 +5,9 @@
* Definition of views_handler_field_contact_link.
*/
-namespace Drupal\contact\Plugin\views\field;
+namespace Views\contact\Plugin\views\field;
-use Drupal\user\Plugins\views\field\UserLink;
+use Views\user\Plugin\views\field\UserLink;
use Drupal\Core\Annotation\Plugin;
/**
diff --git a/lib/Drupal/field/Plugin/views/argument/FieldList.php b/lib/Views/field/Plugin/views/argument/FieldList.php
similarity index 97%
rename from lib/Drupal/field/Plugin/views/argument/FieldList.php
rename to lib/Views/field/Plugin/views/argument/FieldList.php
index 5218ef678ffd8be5eff20518690cd78a6aa5b2bc..7083e8a25538ff0ed73327b2f6f1e04cdbe642ff 100644
--- a/lib/Drupal/field/Plugin/views/argument/FieldList.php
+++ b/lib/Views/field/Plugin/views/argument/FieldList.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_field_list.
*/
-namespace Drupal\field\Plugin\views\argument;
+namespace Views\field\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\Numeric;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/field/Plugin/views/argument/ListString.php b/lib/Views/field/Plugin/views/argument/ListString.php
similarity index 97%
rename from lib/Drupal/field/Plugin/views/argument/ListString.php
rename to lib/Views/field/Plugin/views/argument/ListString.php
index 73c94c17b5a091d7bc2529b792200ef58643e459..c4a4a772b434b3c196eec1ebfa447d7c89be4e8a 100644
--- a/lib/Drupal/field/Plugin/views/argument/ListString.php
+++ b/lib/Views/field/Plugin/views/argument/ListString.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_field_list_text.
*/
-namespace Drupal\field\Plugin\views\argument;
+namespace Views\field\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\String;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/field/Plugin/views/field/Field.php b/lib/Views/field/Plugin/views/field/Field.php
similarity index 99%
rename from lib/Drupal/field/Plugin/views/field/Field.php
rename to lib/Views/field/Plugin/views/field/Field.php
index 881754863c3cfa077036d0d98dc4492097123830..45dc678ba95458ce1bbabef693b4b35c33936dbc 100644
--- a/lib/Drupal/field/Plugin/views/field/Field.php
+++ b/lib/Views/field/Plugin/views/field/Field.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_field.
*/
-namespace Drupal\field\Plugin\views\field;
+namespace Views\field\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/field/Plugin/views/filter/FieldList.php b/lib/Views/field/Plugin/views/filter/FieldList.php
similarity index 92%
rename from lib/Drupal/field/Plugin/views/filter/FieldList.php
rename to lib/Views/field/Plugin/views/filter/FieldList.php
index af147bcf03b0d0c0eb18945c1566733cd0a49a76..9285d3b7588354c2ac9539b93144b4a285bb07eb 100644
--- a/lib/Drupal/field/Plugin/views/filter/FieldList.php
+++ b/lib/Views/field/Plugin/views/filter/FieldList.php
@@ -5,7 +5,7 @@
* Definition of views_handler_filter_field_list.
*/
-namespace Drupal\field\Plugin\views\filter;
+namespace Views\field\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\InOperator;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php b/lib/Views/field/Plugin/views/relationship/EntityReverse.php
similarity index 98%
rename from lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
rename to lib/Views/field/Plugin/views/relationship/EntityReverse.php
index 2ad5de0aa3b8487f9af4ef3a5ae658cceae880b4..b44bedf8ecf69214bf28d824d068fe5e12f4d899 100644
--- a/lib/Drupal/field/Plugin/views/relationship/EntityReverse.php
+++ b/lib/Views/field/Plugin/views/relationship/EntityReverse.php
@@ -5,7 +5,7 @@
* Definition of views_handler_relationship_entity_reverse.
*/
-namespace Drupal\field\Plugin\views\relationship;
+namespace Views\field\Plugin\views\relationship;
use Drupal\views\Join;
use Drupal\views\Plugin\views\relationship\RelationshipPluginBase;
diff --git a/lib/Drupal/filter/Plugin/views/field/FormatName.php b/lib/Views/filter/Plugin/views/field/FormatName.php
similarity index 96%
rename from lib/Drupal/filter/Plugin/views/field/FormatName.php
rename to lib/Views/filter/Plugin/views/field/FormatName.php
index b0f85986881a664eebfaafe87869817c66b2f17b..d77f4f1bbd5d68979371cab52ee4fd8ae3daf50e 100644
--- a/lib/Drupal/filter/Plugin/views/field/FormatName.php
+++ b/lib/Views/filter/Plugin/views/field/FormatName.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_filter_format_name.
*/
-namespace Drupal\filter\Plugin\views\field;
+namespace Views\filter\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/locale/Plugin/views/argument/Group.php b/lib/Views/locale/Plugin/views/argument/Group.php
similarity index 95%
rename from lib/Drupal/locale/Plugin/views/argument/Group.php
rename to lib/Views/locale/Plugin/views/argument/Group.php
index 8a62ce109f42d298934473456c1274ed1f34e775..d257152da5b54bfe705272323bc3c340cfc621e2 100644
--- a/lib/Drupal/locale/Plugin/views/argument/Group.php
+++ b/lib/Views/locale/Plugin/views/argument/Group.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_locale_group.
*/
-namespace Drupal\locale\Plugin\views\argument;
+namespace Views\locale\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/locale/Plugin/views/argument/Language.php b/lib/Views/locale/Plugin/views/argument/Language.php
similarity index 95%
rename from lib/Drupal/locale/Plugin/views/argument/Language.php
rename to lib/Views/locale/Plugin/views/argument/Language.php
index fe9eca43293684f16a896cdfca6f17780dd388aa..b6c979f03a85d9ae52bb06b24fe8686b0f28b482 100644
--- a/lib/Drupal/locale/Plugin/views/argument/Language.php
+++ b/lib/Views/locale/Plugin/views/argument/Language.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_locale_language.
*/
-namespace Drupal\locale\Plugin\views\argument;
+namespace Views\locale\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/locale/Plugin/views/field/Group.php b/lib/Views/locale/Plugin/views/field/Group.php
similarity index 93%
rename from lib/Drupal/locale/Plugin/views/field/Group.php
rename to lib/Views/locale/Plugin/views/field/Group.php
index b11734d1f7cb29e499c2d3915a89f38b1e35a1a4..420e630b5f79e2ac07fa03cc56c2e64db1d054fc 100644
--- a/lib/Drupal/locale/Plugin/views/field/Group.php
+++ b/lib/Views/locale/Plugin/views/field/Group.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_locale_group.
*/
-namespace Drupal\locale\Plugin\views\field;
+namespace Views\locale\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/locale/Plugin/views/field/Language.php b/lib/Views/locale/Plugin/views/field/Language.php
similarity index 96%
rename from lib/Drupal/locale/Plugin/views/field/Language.php
rename to lib/Views/locale/Plugin/views/field/Language.php
index 448c79d85ba36c5f10d134309d283d0bf6b517a9..1ad05341b87bd92fec32233aa7546191ed35d299 100644
--- a/lib/Drupal/locale/Plugin/views/field/Language.php
+++ b/lib/Views/locale/Plugin/views/field/Language.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_locale_language.
*/
-namespace Drupal\locale\Plugin\views\field;
+namespace Views\locale\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/locale/Plugin/views/field/LinkEdit.php b/lib/Views/locale/Plugin/views/field/LinkEdit.php
similarity index 97%
rename from lib/Drupal/locale/Plugin/views/field/LinkEdit.php
rename to lib/Views/locale/Plugin/views/field/LinkEdit.php
index b3c6d9da25ffecb2ea06e0a192e6095e3db5370f..da75127e57966db6a231476531e04ffa9b2ea8cd 100644
--- a/lib/Drupal/locale/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/locale/Plugin/views/field/LinkEdit.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_locale_link_edit.
*/
-namespace Drupal\locale\Plugin\views\field;
+namespace Views\locale\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/locale/Plugin/views/field/NodeLanguage.php b/lib/Views/locale/Plugin/views/field/NodeLanguage.php
similarity index 93%
rename from lib/Drupal/locale/Plugin/views/field/NodeLanguage.php
rename to lib/Views/locale/Plugin/views/field/NodeLanguage.php
index d350e6ef0fd1ae90b05b7b495d024fb30eaf7cb6..7e75622e3a006397c296ebe0249144059f61e073 100644
--- a/lib/Drupal/locale/Plugin/views/field/NodeLanguage.php
+++ b/lib/Views/locale/Plugin/views/field/NodeLanguage.php
@@ -5,9 +5,9 @@
* Definition of views_handler_field_node_language.
*/
-namespace Drupal\locale\Plugin\views\field;
+namespace Views\locale\Plugin\views\field;
-use Drupal\node\Plugin\views\field\Node;
+use Views\node\Plugin\views\field\Node;
use Drupal\Core\Annotation\Plugin;
/**
diff --git a/lib/Drupal/locale/Plugin/views/filter/Group.php b/lib/Views/locale/Plugin/views/filter/Group.php
similarity index 92%
rename from lib/Drupal/locale/Plugin/views/filter/Group.php
rename to lib/Views/locale/Plugin/views/filter/Group.php
index c5193fb7fc1049b4f37384be1259529d99842c36..10a06e7ba8c63703a9c83626ea5e86b4b912470f 100644
--- a/lib/Drupal/locale/Plugin/views/filter/Group.php
+++ b/lib/Views/locale/Plugin/views/filter/Group.php
@@ -5,7 +5,7 @@
* Definition of views_handler_filter_locale_group.
*/
-namespace Drupal\locale\Plugin\views\filter;
+namespace Views\locale\Plugin\views\filter;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\filter\InOperator;
diff --git a/lib/Drupal/locale/Plugin/views/filter/Language.php b/lib/Views/locale/Plugin/views/filter/Language.php
similarity index 87%
rename from lib/Drupal/locale/Plugin/views/filter/Language.php
rename to lib/Views/locale/Plugin/views/filter/Language.php
index 6b743ba8ba60f610deee98dc36baaa718e280233..7f01044790f52a190bed0172bb94aeb22885827c 100644
--- a/lib/Drupal/locale/Plugin/views/filter/Language.php
+++ b/lib/Views/locale/Plugin/views/filter/Language.php
@@ -5,7 +5,7 @@
* Definition of views_handler_filter_locale_language.
*/
-namespace Drupal\locale\Plugin\views\filter;
+namespace Views\locale\Plugin\views\filter;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\filter\InOperator;
@@ -15,6 +15,12 @@
*
* @ingroup views_filter_handlers
*/
+
+/**
+ * @Plugin(
+ * plugin_id = "locale_language"
+ * )
+ */
class Language extends InOperator {
function get_value_options() {
if (!isset($this->value_options)) {
diff --git a/lib/Drupal/locale/Plugin/views/filter/NodeLanguage.php b/lib/Views/locale/Plugin/views/filter/NodeLanguage.php
similarity index 94%
rename from lib/Drupal/locale/Plugin/views/filter/NodeLanguage.php
rename to lib/Views/locale/Plugin/views/filter/NodeLanguage.php
index a3928dd837b8bf8578a15e5374e1dac233feefed..1e7944215f1d92e71f71aaf3828da72e13a04db4 100644
--- a/lib/Drupal/locale/Plugin/views/filter/NodeLanguage.php
+++ b/lib/Views/locale/Plugin/views/filter/NodeLanguage.php
@@ -5,7 +5,7 @@
* Definition of views_handler_filter_node_language.
*/
-namespace Drupal\locale\Plugin\views\filter;
+namespace Views\locale\Plugin\views\filter;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\filter\InOperator;
diff --git a/lib/Drupal/locale/Plugin/views/filter/Version.php b/lib/Views/locale/Plugin/views/filter/Version.php
similarity index 95%
rename from lib/Drupal/locale/Plugin/views/filter/Version.php
rename to lib/Views/locale/Plugin/views/filter/Version.php
index b63e13a4b0f0361d164bc1f0c0edcace7c90df37..8ba99dfc048a34c315ad0fed42f07e5827a10ace 100644
--- a/lib/Drupal/locale/Plugin/views/filter/Version.php
+++ b/lib/Views/locale/Plugin/views/filter/Version.php
@@ -5,7 +5,7 @@
* Definition of views_handler_filter_locale_version.
*/
-namespace Drupal\locale\Plugin\views\filter;
+namespace Views\locale\Plugin\views\filter;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\filter\InOperator;
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedDay.php b/lib/Views/node/Plugin/views/argument/CreatedDay.php
similarity index 96%
rename from lib/Drupal/node/Plugin/views/argument/CreatedDay.php
rename to lib/Views/node/Plugin/views/argument/CreatedDay.php
index 9454a765585604a949aa496d8cf231615d322702..c196179850022b8ca9596e280fd2ec30374ab4ef 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedDay.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedDay.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\argument\Date;
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php b/lib/Views/node/Plugin/views/argument/CreatedFullDate.php
similarity index 95%
rename from lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php
rename to lib/Views/node/Plugin/views/argument/CreatedFullDate.php
index 0a157d2f75444fca3f3841d888d9c4f700bd6c04..50daefe40fd50496df43b2357508e060ce45d140 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedFullDate.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\argument\Date;
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php b/lib/Views/node/Plugin/views/argument/CreatedMonth.php
similarity index 96%
rename from lib/Drupal/node/Plugin/views/argument/CreatedMonth.php
rename to lib/Views/node/Plugin/views/argument/CreatedMonth.php
index e0d30493b684a1bf603a04570e8ebbd507125e12..b9c3cfea8730fb12ff9b1d191a737de68ceeeb19 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedMonth.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\argument\Date;
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php b/lib/Views/node/Plugin/views/argument/CreatedWeek.php
similarity index 93%
rename from lib/Drupal/node/Plugin/views/argument/CreatedWeek.php
rename to lib/Views/node/Plugin/views/argument/CreatedWeek.php
index 49b8645698b21001c0999bec100cb6250ca45de2..a40a655850a83d61ab72a2ca1159ceab123a8968 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedWeek.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\argument\Date;
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedYear.php b/lib/Views/node/Plugin/views/argument/CreatedYear.php
similarity index 90%
rename from lib/Drupal/node/Plugin/views/argument/CreatedYear.php
rename to lib/Views/node/Plugin/views/argument/CreatedYear.php
index dfa939f10bf1d1b04ea2437349c5a6002bd2e95a..0559ec83a2504dbff34be405d5db857bd9bf5d76 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedYear.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedYear.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\argument\Date;
diff --git a/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
similarity index 95%
rename from lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php
rename to lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
index d2b2e5721f2345c431cb530dedc888a4a3ebdeca..0133ca90d2166f1c578bd68795d15c5c4e0b5560 100644
--- a/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php
+++ b/lib/Views/node/Plugin/views/argument/CreatedYearMonth.php
@@ -1,6 +1,6 @@
<?php
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugin\views\argument\Date;
diff --git a/lib/Drupal/node/Plugin/views/argument/Language.php b/lib/Views/node/Plugin/views/argument/Language.php
similarity index 95%
rename from lib/Drupal/node/Plugin/views/argument/Language.php
rename to lib/Views/node/Plugin/views/argument/Language.php
index e45dce890885b65a738ed73c938c41a557fbfefe..8637eff79a4ed2d174211d3fde23753a3f932794 100644
--- a/lib/Drupal/node/Plugin/views/argument/Language.php
+++ b/lib/Views/node/Plugin/views/argument/Language.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_node_language.
*/
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/node/Plugin/views/argument/Nid.php b/lib/Views/node/Plugin/views/argument/Nid.php
similarity index 92%
rename from lib/Drupal/node/Plugin/views/argument/Nid.php
rename to lib/Views/node/Plugin/views/argument/Nid.php
index 1a3384b0b2091bdbff89f37fd619b72af99e1417..299c0ca6786c96eeadc2a492354205cd5d1b7c43 100644
--- a/lib/Drupal/node/Plugin/views/argument/Nid.php
+++ b/lib/Views/node/Plugin/views/argument/Nid.php
@@ -5,7 +5,7 @@
* Provide node nid argument handler.
*/
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\Numeric;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/node/Plugin/views/argument/Type.php b/lib/Views/node/Plugin/views/argument/Type.php
similarity index 95%
rename from lib/Drupal/node/Plugin/views/argument/Type.php
rename to lib/Views/node/Plugin/views/argument/Type.php
index 48c3550d12addf5db09f03ffd3f4e7b2dcac82b1..b1f686aaa9e44044a27ebfa6cbc57b3362b67f13 100644
--- a/lib/Drupal/node/Plugin/views/argument/Type.php
+++ b/lib/Views/node/Plugin/views/argument/Type.php
@@ -5,7 +5,7 @@
* Definition of views_handler_argument_node_type.
*/
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\String;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/node/Plugin/views/argument/UidRevision.php b/lib/Views/node/Plugin/views/argument/UidRevision.php
similarity index 88%
rename from lib/Drupal/node/Plugin/views/argument/UidRevision.php
rename to lib/Views/node/Plugin/views/argument/UidRevision.php
index feedeb2db43f657720325bb7e45c2e95c35dbc56..241799bf8ba2bce02c16190e4dd4ca9d9d25ba3b 100644
--- a/lib/Drupal/node/Plugin/views/argument/UidRevision.php
+++ b/lib/Views/node/Plugin/views/argument/UidRevision.php
@@ -5,9 +5,9 @@
* Defintion of views_handler_argument_node_uid_revision.
*/
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
-use Drupal\user\Plugin\views\argument\UserUid;
+use Views\user\Plugin\views\argument\UserUid;
use Drupal\Core\Annotation\Plugin;
/**
diff --git a/lib/Drupal/node/Plugin/views/argument/Vid.php b/lib/Views/node/Plugin/views/argument/Vid.php
similarity index 95%
rename from lib/Drupal/node/Plugin/views/argument/Vid.php
rename to lib/Views/node/Plugin/views/argument/Vid.php
index 51c13e819bc7be530e855fc395adeff579cf93e5..0e096ddbff20364f93f3ee920f0478d957ad96c0 100644
--- a/lib/Drupal/node/Plugin/views/argument/Vid.php
+++ b/lib/Views/node/Plugin/views/argument/Vid.php
@@ -5,7 +5,7 @@
* Provide node vid argument handler.
*/
-namespace Drupal\node\Plugin\views\argument;
+namespace Views\node\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\Numeric;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/node/Plugin/views/argument_default/Node.php b/lib/Views/node/Plugin/views/argument_default/Node.php
similarity index 93%
rename from lib/Drupal/node/Plugin/views/argument_default/Node.php
rename to lib/Views/node/Plugin/views/argument_default/Node.php
index 9e169b03ac69526005542bd26c01b5c677b26388..034a4ee2aab0981911e22a1182414b67644c50cb 100644
--- a/lib/Drupal/node/Plugin/views/argument_default/Node.php
+++ b/lib/Views/node/Plugin/views/argument_default/Node.php
@@ -5,7 +5,7 @@
* Contains the node from URL argument default plugin.
*/
-namespace Drupal\node\Plugin\views\argument_default;
+namespace Views\node\Plugin\views\argument_default;
use Drupal\Core\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/node/Plugin/views/argument_validator/Node.php b/lib/Views/node/Plugin/views/argument_validator/Node.php
similarity index 98%
rename from lib/Drupal/node/Plugin/views/argument_validator/Node.php
rename to lib/Views/node/Plugin/views/argument_validator/Node.php
index 52f1741023a40363637d5bfcaea06e33c5fd3cb3..23cc7d8c0674bcbd001e06e96596475f89738df3 100644
--- a/lib/Drupal/node/Plugin/views/argument_validator/Node.php
+++ b/lib/Views/node/Plugin/views/argument_validator/Node.php
@@ -5,7 +5,7 @@
* Contains the 'node' argument validator plugin.
*/
-namespace Drupal\node\Plugin\views\argument_validator;
+namespace Views\node\Plugin\views\argument_validator;
use Drupal\Core\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php b/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php
similarity index 94%
rename from lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php
rename to lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php
index 2c70b6657c2d87f0018574166b4eded5a2475677..b2e138ae37d90e893e582b6aacb9581b6cf17aab 100644
--- a/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php
+++ b/lib/Views/node/Plugin/views/field/HistoryUserTimestamp.php
@@ -5,9 +5,9 @@
* Definition of views_handler_field_history_user_timestamp.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
-use Drupal\node\Plugin\views\field\Node;
+use Views\node\Plugin\views\field\Node;
use Drupal\Core\Annotation\Plugin;
/**
@@ -18,6 +18,12 @@
*
* @ingroup views_field_handlers
*/
+
+/**
+ * @Plugin(
+ * plugin_id = "node_history_user_timestamp"
+ * )
+ */
class HistoryUserTimestamp extends Node {
function init(&$view, &$options) {
parent::init($view, $options);
diff --git a/lib/Drupal/node/Plugin/views/field/Link.php b/lib/Views/node/Plugin/views/field/Link.php
similarity index 97%
rename from lib/Drupal/node/Plugin/views/field/Link.php
rename to lib/Views/node/Plugin/views/field/Link.php
index 0fd2637908d3a5c9b04f8136856a95b943ce73fb..f4e8f61ea492095c0fc8a3383b1f0339e2395e68 100644
--- a/lib/Drupal/node/Plugin/views/field/Link.php
+++ b/lib/Views/node/Plugin/views/field/Link.php
@@ -5,7 +5,7 @@
* Definition of views_handler_field_node_link.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
use Drupal\views\Plugin\views\field\Entity;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/node/Plugin/views/field/LinkDelete.php b/lib/Views/node/Plugin/views/field/LinkDelete.php
similarity index 90%
rename from lib/Drupal/node/Plugin/views/field/LinkDelete.php
rename to lib/Views/node/Plugin/views/field/LinkDelete.php
index 0b2362658ee7a933a447cd4273f474df608d7dda..ba7a00f9cfe10def82a24d62a64dd5484c8034dc 100644
--- a/lib/Drupal/node/Plugin/views/field/LinkDelete.php
+++ b/lib/Views/node/Plugin/views/field/LinkDelete.php
@@ -5,9 +5,9 @@
* Definition of views_handler_field_node_link_delete.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
-use Drupal\node\Plugin\views\field\Link;
+use Views\node\Plugin\views\field\Link;
use Drupal\Core\Annotation\Plugin;
/**
diff --git a/lib/Drupal/node/Plugin/views/field/LinkEdit.php b/lib/Views/node/Plugin/views/field/LinkEdit.php
similarity index 90%
rename from lib/Drupal/node/Plugin/views/field/LinkEdit.php
rename to lib/Views/node/Plugin/views/field/LinkEdit.php
index 7e8568b1ef436f30ed5cc8d8f17c9f024a9061e8..f5c828504016de11f5e0a5111ed2a929dba87949 100644
--- a/lib/Drupal/node/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/node/Plugin/views/field/LinkEdit.php
@@ -5,9 +5,9 @@
* Definition of views_handler_field_node_link_edit.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
-use Drupal\node\Plugin\views\field\Link;
+use Views\node\Plugin\views\field\Link;
use Drupal\Core\Annotation\Plugin;
/**
diff --git a/lib/Drupal/node/Plugin/views/field/Node.php b/lib/Views/node/Plugin/views/field/Node.php
similarity index 98%
rename from lib/Drupal/node/Plugin/views/field/Node.php
rename to lib/Views/node/Plugin/views/field/Node.php
index 0ef73c1178efc47d6c5f307cc6cda4f15125a732..7f139343af67275f5be1565155635170ef39d6e2 100644
--- a/lib/Drupal/node/Plugin/views/field/Node.php
+++ b/lib/Views/node/Plugin/views/field/Node.php
@@ -5,7 +5,7 @@
* Contains the basic 'node' field handler.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/node/Plugin/views/field/Path.php b/lib/Views/node/Plugin/views/field/Path.php
similarity index 96%
rename from lib/Drupal/node/Plugin/views/field/Path.php
rename to lib/Views/node/Plugin/views/field/Path.php
index 482e6348750c369344f2772bbc0f103cbfa0914f..7090887816832f10b9ba3c22b691213c9efb44d7 100644
--- a/lib/Drupal/node/Plugin/views/field/Path.php
+++ b/lib/Views/node/Plugin/views/field/Path.php
@@ -5,7 +5,7 @@
* Handler for node path field.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\Core\Annotation\Plugin;
diff --git a/lib/Drupal/node/Plugin/views/field/Revision.php b/lib/Views/node/Plugin/views/field/Revision.php
similarity index 96%
rename from lib/Drupal/node/Plugin/views/field/Revision.php
rename to lib/Views/node/Plugin/views/field/Revision.php
index a20d337259e1ed44246a980b6beeb39f60b01df7..116db1b1dc84f77b85d2461d317df8c88ad44947 100644
--- a/lib/Drupal/node/Plugin/views/field/Revision.php
+++ b/lib/Views/node/Plugin/views/field/Revision.php
@@ -5,9 +5,9 @@
* Definition of views_handler_field_node_revision.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
-use Drupal\node\Plugin\views\field\Node;
+use Views\node\Plugin\views\field\Node;
use Drupal\Core\Annotation\Plugin;
/**
diff --git a/lib/Drupal/node/Plugin/views/field/RevisionLink.php b/lib/Views/node/Plugin/views/field/RevisionLink.php
similarity index 95%
rename from lib/Drupal/node/Plugin/views/field/RevisionLink.php
rename to lib/Views/node/Plugin/views/field/RevisionLink.php
index 23a20d8a81c8a0b4c2299ad0e8635a4799de8dd3..a1e216bb0465b16bae4d561f4fdaab779d6ac31e 100644
--- a/lib/Drupal/node/Plugin/views/field/RevisionLink.php
+++ b/lib/Views/node/Plugin/views/field/RevisionLink.php
@@ -5,9 +5,9 @@
* Definition of views_handler_field_node_revision_link.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
-use Drupal\node\Plugin\views\field\Link;
+use Views\node\Plugin\views\field\Link;
use Drupal\Core\Annotation\Plugin;
/**
diff --git a/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php b/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php
similarity index 91%
rename from lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php
rename to lib/Views/node/Plugin/views/field/RevisionLinkDelete.php
index 153698a4194e61d570a88340dce9272a0fa6b831..51e5d6f714beb9c8b1d11efbd41bc31e92a67654 100644
--- a/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php
+++ b/lib/Views/node/Plugin/views/field/RevisionLinkDelete.php
@@ -5,9 +5,9 @@
* Definition of views_handler_field_node_revision_link_delete.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
-use Drupal\node\Plugin\views\field\RevisionLink;
+use Views\node\Plugin\views\field\RevisionLink;
use Drupal\Core\Annotation\Plugin;
/**
diff --git a/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php b/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php
similarity index 91%
rename from lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php
rename to lib/Views/node/Plugin/views/field/RevisionLinkRevert.php
index 986e5331de8cbe3db8263a578874a7ca4d723fac..99f676858e367719543ea54f3133bff122a9b7b7 100644
--- a/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php
+++ b/lib/Views/node/Plugin/views/field/RevisionLinkRevert.php
@@ -5,9 +5,9 @@
* Definition of views_handler_field_node_revision_link_revert.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
-use Drupal\node\Plugin\views\field\RevisionLink;
+use Views\node\Plugin\views\field\RevisionLink;
use Drupal\Core\Annotation\Plugin;
/**
diff --git a/lib/Drupal/node/Plugin/views/field/Type.php b/lib/Views/node/Plugin/views/field/Type.php
similarity index 92%
rename from lib/Drupal/node/Plugin/views/field/Type.php
rename to lib/Views/node/Plugin/views/field/Type.php
index fd452ac941169e9d4f2a41889f9daff318895615..4f6e3439cc6c535439e5b5015eb15dd5c5c210dc 100644
--- a/lib/Drupal/node/Plugin/views/field/Type.php
+++ b/lib/Views/node/Plugin/views/field/Type.php
@@ -5,9 +5,10 @@
* Definition of views_handler_field_node_type.
*/
-namespace Drupal\node\Plugin\views\field;
+namespace Views\node\Plugin\views\field;
-use Drupal\node\Plugin\views\field\Node;
+use Views\node\Plugin\views\field\Node;
+use Drupal\Core\Annotation\Plugin;
/**
* Field handler to translate a node type into its readable form.
diff --git a/lib/Drupal/node/Plugin/views/filter/Access.php b/lib/Views/node/Plugin/views/filter/Access.php
similarity index 93%
rename from lib/Drupal/node/Plugin/views/filter/Access.php
rename to lib/Views/node/Plugin/views/filter/Access.php
index e0349330c864e0a1548aee4273f46d5d002b61d9..c90bc655de1150d25de26f48e53817c98da2abda 100644
--- a/lib/Drupal/node/Plugin/views/filter/Access.php
+++ b/lib/Views/node/Plugin/views/filter/Access.php
@@ -5,9 +5,10 @@
* Definition of views_handler_filter_node_access.
*/
-namespace Drupal\node\Plugin\views\filter;
+namespace Views\node\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
+use Drupal\Core\Annotation\Plugin;
/**
* Filter by node_access records.
diff --git a/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php b/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php
similarity index 97%
rename from lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php
rename to lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php
index c280a9d27e703fb4e2e8406260235dda2e267115..f9e8b27e32f06f9b60e8200a47e89b0214de62fb 100644
--- a/lib/Drupal/node/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/lib/Views/node/Plugin/views/filter/HistoryUserTimestamp.php
@@ -5,9 +5,10 @@
* Definition of views_handler_filter_history_user_timestamp.
*/
-namespace Drupal\node\Plugin\views\filter;
+namespace Views\node\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
+use Drupal\Core\Annotation\Plugin;
/**
* Filter for new content.
diff --git a/lib/Drupal/node/Plugin/views/filter/Status.php b/lib/Views/node/Plugin/views/filter/Status.php
similarity index 90%
rename from lib/Drupal/node/Plugin/views/filter/Status.php
rename to lib/Views/node/Plugin/views/filter/Status.php
index 7926a902b3bae925240c968fc83e2b069721c3d6..3c38f702ed7cf2168533aa9d3c46c04f30cc6247 100644
--- a/lib/Drupal/node/Plugin/views/filter/Status.php
+++ b/lib/Views/node/Plugin/views/filter/Status.php
@@ -5,9 +5,10 @@
* Definition of Drupal\node\Plugins\views\filter\Status
*/
-namespace Drupal\node\Plugin\views\filter;
+namespace Views\node\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
+use Drupal\Core\Annotation\Plugin;
/**
* Filter by published status.
diff --git a/lib/Drupal/node/Plugin/views/filter/Type.php b/lib/Views/node/Plugin/views/filter/Type.php
similarity index 89%
rename from lib/Drupal/node/Plugin/views/filter/Type.php
rename to lib/Views/node/Plugin/views/filter/Type.php
index a591a041981380a7c9b46577653683daa03835bd..5577f2321a4bb663d89d9de73d0074d8231f55bc 100644
--- a/lib/Drupal/node/Plugin/views/filter/Type.php
+++ b/lib/Views/node/Plugin/views/filter/Type.php
@@ -5,9 +5,10 @@
* Definition of views_handler_filter_node_type.
*/
-namespace Drupal\node\Plugin\views\filter;
+namespace Views\node\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\InOperator;
+use Drupal\Core\Annotation\Plugin;
/**
* Filter by node type.
diff --git a/lib/Drupal/node/Plugin/views/filter/UidRevision.php b/lib/Views/node/Plugin/views/filter/UidRevision.php
similarity index 86%
rename from lib/Drupal/node/Plugin/views/filter/UidRevision.php
rename to lib/Views/node/Plugin/views/filter/UidRevision.php
index 016befa7b03d94014e6ff7163aa25e21891bd1a9..a2461e68ce3dd40381128e8827051985cf25a847 100644
--- a/lib/Drupal/node/Plugin/views/filter/UidRevision.php
+++ b/lib/Views/node/Plugin/views/filter/UidRevision.php
@@ -5,9 +5,10 @@
* Definition of views_handler_filter_node_uid_revision.
*/
-namespace Drupal\node\Plugin\views\filter;
+namespace Views\node\Plugin\views\filter;
-use Drupal\user\Plugin\views\filter\Name;
+use Views\user\Plugin\views\filter\Name;
+use Drupal\Core\Annotation\Plugin;
/**
* Filter handler to check for revisions a certain user has created.
diff --git a/lib/Drupal/node/Plugin/views/row/Rss.php b/lib/Views/node/Plugin/views/row/Rss.php
similarity index 99%
rename from lib/Drupal/node/Plugin/views/row/Rss.php
rename to lib/Views/node/Plugin/views/row/Rss.php
index ed565a7a46c51a496bf31e88957defb92a23cbd9..acf5bcb8bcc6269e8277efe9e2e2929179fd5675 100644
--- a/lib/Drupal/node/Plugin/views/row/Rss.php
+++ b/lib/Views/node/Plugin/views/row/Rss.php
@@ -5,7 +5,7 @@
* Contains the node RSS row style plugin.
*/
-namespace Drupal\node\Plugin\views\row;
+namespace Views\node\Plugin\views\row;
use Drupal\Core\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/node/Plugin/views/row/View.php b/lib/Views/node/Plugin/views/row/View.php
similarity index 98%
rename from lib/Drupal/node/Plugin/views/row/View.php
rename to lib/Views/node/Plugin/views/row/View.php
index 03b7b28d3c3a7a46ec95814efe691c44b5f68839..2d66f558fa83194f6ec3b1e62d0afcc381b61de0 100644
--- a/lib/Drupal/node/Plugin/views/row/View.php
+++ b/lib/Views/node/Plugin/views/row/View.php
@@ -5,7 +5,7 @@
* Contains the node view row style plugin.
*/
-namespace Drupal\node\Plugin\views\row;
+namespace Views\node\Plugin\views\row;
use Drupal\Core\Annotation\Plugin;
use Drupal\Core\Annotation\Translation;
diff --git a/lib/Drupal/search/Plugin/views/argument/views_handler_argument_search.inc b/lib/Views/search/Plugin/views/argument/Search.php
similarity index 95%
rename from lib/Drupal/search/Plugin/views/argument/views_handler_argument_search.inc
rename to lib/Views/search/Plugin/views/argument/Search.php
index f95efe7f9ae1ef8e29389cebc35e5434e73f2c2d..f6cd2195039d4af96927b0b1e10fdf8ff052cd54 100644
--- a/lib/Drupal/search/Plugin/views/argument/views_handler_argument_search.inc
+++ b/lib/Views/search/Plugin/views/argument/Search.php
@@ -5,15 +5,24 @@
* Definition of views_handler_argument_search.
*/
+namespace Views\node\Plugin\views\argument;
+
use Drupal\views\Join;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
+use Drupal\Core\Annotation\Plugin;
/**
* Argument that accepts query keys for search.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_search extends views_handler_argument {
+
+/**
+ * @Plugin(
+ * plugin_id = "search"
+ * )
+ */
+class Search extends ArgumentPluginBase {
/**
* Take sure that parseSearchExpression is runned and everything is set up for it.
diff --git a/lib/Drupal/search/Plugin/views/field/views_handler_field_search_score.inc b/lib/Views/search/Plugin/views/field/Score.php
similarity index 94%
rename from lib/Drupal/search/Plugin/views/field/views_handler_field_search_score.inc
rename to lib/Views/search/Plugin/views/field/Score.php
index c899dbbd06c1d9e5cbd93c0fb061e63fc37b3fde..f21c33cb172e06e872198da26ecbd200f843d7c6 100644
--- a/lib/Drupal/search/Plugin/views/field/views_handler_field_search_score.inc
+++ b/lib/Views/search/Plugin/views/field/Score.php
@@ -5,14 +5,23 @@
* Definition of views_handler_field_search_score.
*/
+namespace Views\search\Plugin\views\field;
+
use Drupal\views\Plugin\views\field\Numeric;
+use Drupal\Core\Annotation\Plugin;
/**
* Field handler to provide simple renderer that allows linking to a node.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_search_score extends Numeric {
+
+/**
+ * @Plugin(
+ * plugin_id = "search_score"
+ * )
+ */
+class Score extends Numeric {
function option_definition() {
$options = parent::option_definition();
diff --git a/lib/Drupal/search/Plugin/views/filter/views_handler_filter_search.inc b/lib/Views/search/Plugin/views/filter/Search.php
similarity index 84%
rename from lib/Drupal/search/Plugin/views/filter/views_handler_filter_search.inc
rename to lib/Views/search/Plugin/views/filter/Search.php
index 8df82eca8291ac7041b548d17a8dcb4d6f927ddc..10835d8b5a62880b04541050d326d830aa821b8f 100644
--- a/lib/Drupal/search/Plugin/views/filter/views_handler_filter_search.inc
+++ b/lib/Views/search/Plugin/views/filter/Search.php
@@ -5,16 +5,25 @@
* Contains a search filter handler.
*/
+namespace Views\search\Plugin\views\filter;
+
use Drupal\views\Join;
use Drupal\search\SearchQuery;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
+use Drupal\Core\Annotation\Plugin;
/**
* Field handler to provide simple renderer that allows linking to a node.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_search extends FilterPluginBase {
+
+/**
+ * @Plugin(
+ * plugin_id = "search"
+ * )
+ */
+class Search extends FilterPluginBase {
var $always_multiple = TRUE;
/**
@@ -91,7 +100,7 @@ function exposed_validate(&$form, &$form_state) {
function query_parse_search_expression($input) {
if (!isset($this->search_query)) {
$this->parsed = TRUE;
- $this->search_query = db_select('search_index', 'i', array('target' => 'slave'))->extend('viewsSearchQuery');
+ $this->search_query = db_select('search_index', 'i', array('target' => 'slave'))->extend('Drupal\search\ViewsSearchQuery');
$this->search_query->searchExpression($input, $this->view->base_table);
$this->search_query->publicParseSearchExpression();
}
@@ -178,43 +187,3 @@ function query() {
$this->search_query = NULL;
}
}
-
-/**
- * Extends the core SearchQuery.
- *
- * @todo: Make this class PSR-0 compatible.
- */
-class viewsSearchQuery extends SearchQuery {
- public function &conditions() {
- return $this->conditions;
- }
- public function words() {
- return $this->words;
- }
-
- public function simple() {
- return $this->simple;
- }
-
- public function matches() {
- return $this->matches;
- }
-
- public function publicParseSearchExpression() {
- return $this->parseSearchExpression();
- }
-
- function condition_replace_string($search, $replace, &$condition) {
- if ($condition['field'] instanceof DatabaseCondition) {
- $conditions =& $condition['field']->conditions();
- foreach ($conditions as $key => &$subcondition) {
- if (is_numeric($key)) {
- $this->condition_replace_string($search, $replace, $subcondition);
- }
- }
- }
- else {
- $condition['field'] = str_replace($search, $replace, $condition['field']);
- }
- }
-}
diff --git a/lib/Drupal/search/Plugin/views/row/views_plugin_row_search_view.inc b/lib/Views/search/Plugin/views/row/View.php
similarity index 83%
rename from lib/Drupal/search/Plugin/views/row/views_plugin_row_search_view.inc
rename to lib/Views/search/Plugin/views/row/View.php
index 5806edad652e21fe3fb820a4407137feca3a134e..b1ccdb0fac2429fff18f115c71a505792b137556 100644
--- a/lib/Drupal/search/Plugin/views/row/views_plugin_row_search_view.inc
+++ b/lib/Views/search/Plugin/views/row/View.php
@@ -5,12 +5,19 @@
* Definition of views_plugin_row_search_view.
*/
+namespace Views\search\Plugin\views\row;
+
use Drupal\views\Plugin\views\row\RowPluginBase;
+use Drupal\Core\Annotation\Plugin;
/**
* Plugin which performs a node_view on the resulting object.
+ *
+ * @Plugin(
+ * plugin_id = "search_view"
+ * )
*/
-class views_plugin_row_search_view extends RowPluginBase {
+class View extends RowPluginBase {
function option_definition() {
$options = parent::option_definition();
diff --git a/lib/Drupal/search/Plugin/views/sort/views_handler_sort_search_score.inc b/lib/Views/search/Plugin/views/sort/Score.php
similarity index 93%
rename from lib/Drupal/search/Plugin/views/sort/views_handler_sort_search_score.inc
rename to lib/Views/search/Plugin/views/sort/Score.php
index afe303f7a8b35a0eed864f6665a36a7019ac990b..6174b50a0c0bb37ec560c8fcfdd1be1dea8824b0 100644
--- a/lib/Drupal/search/Plugin/views/sort/views_handler_sort_search_score.inc
+++ b/lib/Views/search/Plugin/views/sort/Score.php
@@ -5,6 +5,8 @@
* Definition of views_handler_sort_search_score.
*/
+namespace Views\search\Plugin\views\sort;
+
use Drupal\views\Plugin\views\sort\SortPluginBase;
use Drupal\Core\Annotation\Plugin;
@@ -19,7 +21,7 @@
* plugin_id = "search_score"
* )
*/
-class views_handler_sort_search_score extends SortPluginBase {
+class Score extends SortPluginBase {
function query() {
// Check to see if the search filter/argument added 'score' to the table.
// Our filter stores it as $handler->search_score -- and we also
diff --git a/lib/Drupal/statistics/Plugin/views/field/views_handler_field_accesslog_path.inc b/lib/Views/statistics/Plugin/views/field/AccesslogPath.php
similarity index 88%
rename from lib/Drupal/statistics/Plugin/views/field/views_handler_field_accesslog_path.inc
rename to lib/Views/statistics/Plugin/views/field/AccesslogPath.php
index 2d55b3b2047d204287b3257470424ef5a77e8852..27f967319270b73f744a631b98071c1a30105bad 100644
--- a/lib/Drupal/statistics/Plugin/views/field/views_handler_field_accesslog_path.inc
+++ b/lib/Views/statistics/Plugin/views/field/AccesslogPath.php
@@ -5,14 +5,23 @@
* Definition of views_handler_field_accesslog_path.
*/
+namespace Views\statistics\Plugin\views\field;
+
use Drupal\views\Plugin\views\field\FieldPluginBase;
+use Drupal\Core\Annotation\Plugin;
/**
* Field handler to provide simple renderer that turns a URL into a clickable link.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_accesslog_path extends FieldPluginBase {
+
+/**
+ * @Plugin(
+ * plugin_id = "statistics_accesslog_path"
+ * )
+ */
+class AccesslogPath extends FieldPluginBase {
/**
* Override init function to provide generic option to link to node.
*/
diff --git a/lib/Drupal/system/Plugin/views/argument/views_handler_argument_file_fid.inc b/lib/Views/system/Plugin/views/argument/views_handler_argument_file_fid.inc
similarity index 100%
rename from lib/Drupal/system/Plugin/views/argument/views_handler_argument_file_fid.inc
rename to lib/Views/system/Plugin/views/argument/views_handler_argument_file_fid.inc
diff --git a/lib/Drupal/system/Plugin/views/field/views_handler_field_file.inc b/lib/Views/system/Plugin/views/field/views_handler_field_file.inc
similarity index 100%
rename from lib/Drupal/system/Plugin/views/field/views_handler_field_file.inc
rename to lib/Views/system/Plugin/views/field/views_handler_field_file.inc
diff --git a/lib/Drupal/system/Plugin/views/field/views_handler_field_file_extension.inc b/lib/Views/system/Plugin/views/field/views_handler_field_file_extension.inc
similarity index 100%
rename from lib/Drupal/system/Plugin/views/field/views_handler_field_file_extension.inc
rename to lib/Views/system/Plugin/views/field/views_handler_field_file_extension.inc
diff --git a/lib/Drupal/system/Plugin/views/field/views_handler_field_file_filemime.inc b/lib/Views/system/Plugin/views/field/views_handler_field_file_filemime.inc
similarity index 100%
rename from lib/Drupal/system/Plugin/views/field/views_handler_field_file_filemime.inc
rename to lib/Views/system/Plugin/views/field/views_handler_field_file_filemime.inc
diff --git a/lib/Drupal/system/Plugin/views/field/views_handler_field_file_status.inc b/lib/Views/system/Plugin/views/field/views_handler_field_file_status.inc
similarity index 100%
rename from lib/Drupal/system/Plugin/views/field/views_handler_field_file_status.inc
rename to lib/Views/system/Plugin/views/field/views_handler_field_file_status.inc
diff --git a/lib/Drupal/system/Plugin/views/field/views_handler_field_file_uri.inc b/lib/Views/system/Plugin/views/field/views_handler_field_file_uri.inc
similarity index 100%
rename from lib/Drupal/system/Plugin/views/field/views_handler_field_file_uri.inc
rename to lib/Views/system/Plugin/views/field/views_handler_field_file_uri.inc
diff --git a/lib/Drupal/system/Plugin/views/filter/views_handler_filter_file_status.inc b/lib/Views/system/Plugin/views/filter/views_handler_filter_file_status.inc
similarity index 100%
rename from lib/Drupal/system/Plugin/views/filter/views_handler_filter_file_status.inc
rename to lib/Views/system/Plugin/views/filter/views_handler_filter_file_status.inc
diff --git a/lib/Drupal/system/Plugin/views/filter/views_handler_filter_system_type.inc b/lib/Views/system/Plugin/views/filter/views_handler_filter_system_type.inc
similarity index 100%
rename from lib/Drupal/system/Plugin/views/filter/views_handler_filter_system_type.inc
rename to lib/Views/system/Plugin/views/filter/views_handler_filter_system_type.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_taxonomy.inc b/lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_taxonomy.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_taxonomy.inc
rename to lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_taxonomy.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid.inc b/lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid.inc
rename to lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid_depth.inc b/lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid_depth.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid_depth.inc
rename to lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid_depth.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid_depth_modifier.inc b/lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid_depth_modifier.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid_depth_modifier.inc
rename to lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_term_node_tid_depth_modifier.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_machine_name.inc b/lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_machine_name.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_machine_name.inc
rename to lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_machine_name.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_vid.inc b/lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_vid.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_vid.inc
rename to lib/Views/taxonomy/Plugin/views/argument/views_handler_argument_vocabulary_vid.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/argument_default/views_plugin_argument_default_taxonomy_tid.inc b/lib/Views/taxonomy/Plugin/views/argument_default/views_plugin_argument_default_taxonomy_tid.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/argument_default/views_plugin_argument_default_taxonomy_tid.inc
rename to lib/Views/taxonomy/Plugin/views/argument_default/views_plugin_argument_default_taxonomy_tid.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/argument_validate/views_plugin_argument_validate_taxonomy_term.inc b/lib/Views/taxonomy/Plugin/views/argument_validate/views_plugin_argument_validate_taxonomy_term.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/argument_validate/views_plugin_argument_validate_taxonomy_term.inc
rename to lib/Views/taxonomy/Plugin/views/argument_validate/views_plugin_argument_validate_taxonomy_term.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/field/views_handler_field_taxonomy.inc b/lib/Views/taxonomy/Plugin/views/field/views_handler_field_taxonomy.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/field/views_handler_field_taxonomy.inc
rename to lib/Views/taxonomy/Plugin/views/field/views_handler_field_taxonomy.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/field/views_handler_field_term_link_edit.inc b/lib/Views/taxonomy/Plugin/views/field/views_handler_field_term_link_edit.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/field/views_handler_field_term_link_edit.inc
rename to lib/Views/taxonomy/Plugin/views/field/views_handler_field_term_link_edit.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/field/views_handler_field_term_node_tid.inc b/lib/Views/taxonomy/Plugin/views/field/views_handler_field_term_node_tid.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/field/views_handler_field_term_node_tid.inc
rename to lib/Views/taxonomy/Plugin/views/field/views_handler_field_term_node_tid.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/filter/views_handler_filter_term_node_tid.inc b/lib/Views/taxonomy/Plugin/views/filter/views_handler_filter_term_node_tid.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/filter/views_handler_filter_term_node_tid.inc
rename to lib/Views/taxonomy/Plugin/views/filter/views_handler_filter_term_node_tid.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/filter/views_handler_filter_term_node_tid_depth.inc b/lib/Views/taxonomy/Plugin/views/filter/views_handler_filter_term_node_tid_depth.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/filter/views_handler_filter_term_node_tid_depth.inc
rename to lib/Views/taxonomy/Plugin/views/filter/views_handler_filter_term_node_tid_depth.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/filter/views_handler_filter_vocabulary_machine_name.inc b/lib/Views/taxonomy/Plugin/views/filter/views_handler_filter_vocabulary_machine_name.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/filter/views_handler_filter_vocabulary_machine_name.inc
rename to lib/Views/taxonomy/Plugin/views/filter/views_handler_filter_vocabulary_machine_name.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/filter/views_handler_filter_vocabulary_vid.inc b/lib/Views/taxonomy/Plugin/views/filter/views_handler_filter_vocabulary_vid.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/filter/views_handler_filter_vocabulary_vid.inc
rename to lib/Views/taxonomy/Plugin/views/filter/views_handler_filter_vocabulary_vid.inc
diff --git a/lib/Drupal/taxonomy/Plugin/views/relationship/views_handler_relationship_node_term_data.inc b/lib/Views/taxonomy/Plugin/views/relationship/views_handler_relationship_node_term_data.inc
similarity index 100%
rename from lib/Drupal/taxonomy/Plugin/views/relationship/views_handler_relationship_node_term_data.inc
rename to lib/Views/taxonomy/Plugin/views/relationship/views_handler_relationship_node_term_data.inc
diff --git a/lib/Drupal/translation/Plugin/views/argument/views_handler_argument_node_tnid.inc b/lib/Views/translation/Plugin/views/argument/views_handler_argument_node_tnid.inc
similarity index 100%
rename from lib/Drupal/translation/Plugin/views/argument/views_handler_argument_node_tnid.inc
rename to lib/Views/translation/Plugin/views/argument/views_handler_argument_node_tnid.inc
diff --git a/lib/Drupal/translation/Plugin/views/field/views_handler_field_node_link_translate.inc b/lib/Views/translation/Plugin/views/field/views_handler_field_node_link_translate.inc
similarity index 100%
rename from lib/Drupal/translation/Plugin/views/field/views_handler_field_node_link_translate.inc
rename to lib/Views/translation/Plugin/views/field/views_handler_field_node_link_translate.inc
diff --git a/lib/Drupal/translation/Plugin/views/field/views_handler_field_node_translation_link.inc b/lib/Views/translation/Plugin/views/field/views_handler_field_node_translation_link.inc
similarity index 100%
rename from lib/Drupal/translation/Plugin/views/field/views_handler_field_node_translation_link.inc
rename to lib/Views/translation/Plugin/views/field/views_handler_field_node_translation_link.inc
diff --git a/lib/Drupal/translation/Plugin/views/filter/views_handler_filter_node_tnid.inc b/lib/Views/translation/Plugin/views/filter/views_handler_filter_node_tnid.inc
similarity index 100%
rename from lib/Drupal/translation/Plugin/views/filter/views_handler_filter_node_tnid.inc
rename to lib/Views/translation/Plugin/views/filter/views_handler_filter_node_tnid.inc
diff --git a/lib/Drupal/translation/Plugin/views/filter/views_handler_filter_node_tnid_child.inc b/lib/Views/translation/Plugin/views/filter/views_handler_filter_node_tnid_child.inc
similarity index 100%
rename from lib/Drupal/translation/Plugin/views/filter/views_handler_filter_node_tnid_child.inc
rename to lib/Views/translation/Plugin/views/filter/views_handler_filter_node_tnid_child.inc
diff --git a/lib/Drupal/translation/Plugin/views/relationship/views_handler_relationship_translation.inc b/lib/Views/translation/Plugin/views/relationship/views_handler_relationship_translation.inc
similarity index 100%
rename from lib/Drupal/translation/Plugin/views/relationship/views_handler_relationship_translation.inc
rename to lib/Views/translation/Plugin/views/relationship/views_handler_relationship_translation.inc
diff --git a/lib/Drupal/user/Plugin/views/argument/views_handler_argument_user_uid.inc b/lib/Views/user/Plugin/views/argument/views_handler_argument_user_uid.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/argument/views_handler_argument_user_uid.inc
rename to lib/Views/user/Plugin/views/argument/views_handler_argument_user_uid.inc
diff --git a/lib/Drupal/user/Plugin/views/argument/views_handler_argument_users_roles_rid.inc b/lib/Views/user/Plugin/views/argument/views_handler_argument_users_roles_rid.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/argument/views_handler_argument_users_roles_rid.inc
rename to lib/Views/user/Plugin/views/argument/views_handler_argument_users_roles_rid.inc
diff --git a/lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_current_user.inc b/lib/Views/user/Plugin/views/argument_default/views_plugin_argument_default_current_user.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_current_user.inc
rename to lib/Views/user/Plugin/views/argument_default/views_plugin_argument_default_current_user.inc
diff --git a/lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_user.inc b/lib/Views/user/Plugin/views/argument_default/views_plugin_argument_default_user.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/argument_default/views_plugin_argument_default_user.inc
rename to lib/Views/user/Plugin/views/argument_default/views_plugin_argument_default_user.inc
diff --git a/lib/Drupal/user/Plugin/views/argument_validate/views_plugin_argument_validate_user.inc b/lib/Views/user/Plugin/views/argument_validate/views_plugin_argument_validate_user.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/argument_validate/views_plugin_argument_validate_user.inc
rename to lib/Views/user/Plugin/views/argument_validate/views_plugin_argument_validate_user.inc
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_name.inc b/lib/Views/user/Plugin/views/field/Name.php
similarity index 93%
rename from lib/Drupal/user/Plugin/views/field/views_handler_field_user_name.inc
rename to lib/Views/user/Plugin/views/field/Name.php
index 8947db1aa21e9d494a7b420c2fdfb35dba5d08ce..ce2cda7e88d697c432897f706c103aad1ef6da21 100644
--- a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_name.inc
+++ b/lib/Views/user/Plugin/views/field/Name.php
@@ -5,12 +5,23 @@
* Definition of views_handler_field_user_name.
*/
+namespace Views\user\Plugin\views\field;
+
+use Views\user\Plugin\views\field\User;
+use Drupal\Core\Annotation\Plugin;
+
/**
* Field handler to provide simple renderer that allows using a themed user link.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_user_name extends views_handler_field_user {
+
+/**
+ * @Plugin(
+ * plugin_id = "user_name"
+ * )
+ */
+class Name extends User {
/**
* Add uid in the query so we can test for anonymous if needed.
*/
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user.inc b/lib/Views/user/Plugin/views/field/User.php
similarity index 87%
rename from lib/Drupal/user/Plugin/views/field/views_handler_field_user.inc
rename to lib/Views/user/Plugin/views/field/User.php
index f6b15b5bc11259321289d5a0530d56dc230e5e37..068569dc518828e311d05cac390a4f6027d83ec4 100644
--- a/lib/Drupal/user/Plugin/views/field/views_handler_field_user.inc
+++ b/lib/Views/user/Plugin/views/field/User.php
@@ -5,12 +5,23 @@
* Definition of views_handler_field_user.
*/
+namespace Views\user\Plugin\views\field;
+
+use Drupal\views\Plugin\views\field\FieldPluginBase;
+use Drupal\Core\Annotation\Plugin;
+
/**
* Field handler to provide simple renderer that allows linking to a user.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_user extends views_handler_field {
+
+/**
+ * @Plugin(
+ * plugin_id = "user"
+ * )
+ */
+class User extends FieldPluginBase {
/**
* Override init function to provide generic option to link to user.
*/
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_link.inc b/lib/Views/user/Plugin/views/field/UserLink.php
similarity index 85%
rename from lib/Drupal/user/Plugin/views/field/views_handler_field_user_link.inc
rename to lib/Views/user/Plugin/views/field/UserLink.php
index 03b5e0d4ae2f232b9972ddce47a24d3b04e1607a..e63b4916db4fa8efc2e12a92531d60785531b9f4 100644
--- a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_link.inc
+++ b/lib/Views/user/Plugin/views/field/UserLink.php
@@ -5,12 +5,23 @@
* Definition of views_handler_field_user_link.
*/
+namespace Views\user\Plugin\views\field;
+
+use Drupal\views\Plugin\views\field\FieldPluginBase;
+use Drupal\Core\Annotation\Plugin;
+
/**
* Field handler to present a link to the user.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_user_link extends views_handler_field {
+
+/**
+ * @Plugin(
+ * plugin_id = "user_link"
+ * )
+ */
+class UserLink extends FieldPluginBase {
function construct() {
parent::construct();
$this->additional_fields['uid'] = 'uid';
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_language.inc b/lib/Views/user/Plugin/views/field/views_handler_field_user_language.inc
similarity index 92%
rename from lib/Drupal/user/Plugin/views/field/views_handler_field_user_language.inc
rename to lib/Views/user/Plugin/views/field/views_handler_field_user_language.inc
index e29da31a14db32107cd8725bf7f6802e9c617008..d8e6997351bc3ea66ce9496191f3ffcb6e70731f 100644
--- a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_language.inc
+++ b/lib/Views/user/Plugin/views/field/views_handler_field_user_language.inc
@@ -10,7 +10,7 @@
*
* @ingroup views_field_handlers
*/
-class views_handler_field_user_language extends views_handler_field_user {
+class user_language extends User {
function render_link($data, $values) {
$uid = $this->get_value($values, 'uid');
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_link_cancel.inc b/lib/Views/user/Plugin/views/field/views_handler_field_user_link_cancel.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/field/views_handler_field_user_link_cancel.inc
rename to lib/Views/user/Plugin/views/field/views_handler_field_user_link_cancel.inc
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_link_edit.inc b/lib/Views/user/Plugin/views/field/views_handler_field_user_link_edit.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/field/views_handler_field_user_link_edit.inc
rename to lib/Views/user/Plugin/views/field/views_handler_field_user_link_edit.inc
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_mail.inc b/lib/Views/user/Plugin/views/field/views_handler_field_user_mail.inc
similarity index 93%
rename from lib/Drupal/user/Plugin/views/field/views_handler_field_user_mail.inc
rename to lib/Views/user/Plugin/views/field/views_handler_field_user_mail.inc
index 82d193388c37c98c3daae3468665fb3e61180807..70652a4bfb1da46f8db704d8da022a3a17318509 100644
--- a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_mail.inc
+++ b/lib/Views/user/Plugin/views/field/views_handler_field_user_mail.inc
@@ -10,7 +10,7 @@
*
* @ingroup views_field_handlers
*/
-class views_handler_field_user_mail extends views_handler_field_user {
+class user_mail extends User {
function option_definition() {
$options = parent::option_definition();
$options['link_to_user'] = array('default' => 'mailto');
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_permissions.inc b/lib/Views/user/Plugin/views/field/views_handler_field_user_permissions.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/field/views_handler_field_user_permissions.inc
rename to lib/Views/user/Plugin/views/field/views_handler_field_user_permissions.inc
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_picture.inc b/lib/Views/user/Plugin/views/field/views_handler_field_user_picture.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/field/views_handler_field_user_picture.inc
rename to lib/Views/user/Plugin/views/field/views_handler_field_user_picture.inc
diff --git a/lib/Drupal/user/Plugin/views/field/views_handler_field_user_roles.inc b/lib/Views/user/Plugin/views/field/views_handler_field_user_roles.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/field/views_handler_field_user_roles.inc
rename to lib/Views/user/Plugin/views/field/views_handler_field_user_roles.inc
diff --git a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_name.inc b/lib/Views/user/Plugin/views/filter/Name.php
similarity index 96%
rename from lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_name.inc
rename to lib/Views/user/Plugin/views/filter/Name.php
index 1b68d3e6d09f409c26a50a23b27d917da73dfb63..5bf3ded5e00e57f42018e6c09a1a269a52e7264c 100644
--- a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_name.inc
+++ b/lib/Views/user/Plugin/views/filter/Name.php
@@ -5,14 +5,23 @@
* Definition of views_handler_filter_user_name.
*/
+namespace Views\user\Plugin\views\filter;
+
use Drupal\views\Plugin\views\filter\InOperator;
+use Drupal\Core\Annotation\Plugin;
/**
* Filter handler for usernames.
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_user_name extends InOperator {
+
+/**
+ * @Plugin(
+ * plugin_id = "user_name"
+ * )
+ */
+class Name extends InOperator {
var $always_multiple = TRUE;
function value_form(&$form, &$form_state) {
diff --git a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_current.inc b/lib/Views/user/Plugin/views/filter/views_handler_filter_user_current.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_current.inc
rename to lib/Views/user/Plugin/views/filter/views_handler_filter_user_current.inc
diff --git a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_permissions.inc b/lib/Views/user/Plugin/views/filter/views_handler_filter_user_permissions.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_permissions.inc
rename to lib/Views/user/Plugin/views/filter/views_handler_filter_user_permissions.inc
diff --git a/lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_roles.inc b/lib/Views/user/Plugin/views/filter/views_handler_filter_user_roles.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/filter/views_handler_filter_user_roles.inc
rename to lib/Views/user/Plugin/views/filter/views_handler_filter_user_roles.inc
diff --git a/lib/Drupal/user/Plugin/views/row/views_plugin_row_user_view.inc b/lib/Views/user/Plugin/views/row/views_plugin_row_user_view.inc
similarity index 100%
rename from lib/Drupal/user/Plugin/views/row/views_plugin_row_user_view.inc
rename to lib/Views/user/Plugin/views/row/views_plugin_row_user_view.inc
diff --git a/modules/search.views.inc b/modules/search.views.inc
index 32b7549a7e579913138a57d0fbbc1432b9509d5f..32742b23b2bdd80b2402ef5b485c9b4696dfda54 100644
--- a/modules/search.views.inc
+++ b/modules/search.views.inc
@@ -63,7 +63,7 @@ function search_views_data() {
'title' => t('Score'),
'help' => t('The score of the search item. This will not be used if the search filter is not also present.'),
'field' => array(
- 'handler' => 'views_handler_field_search_score',
+ 'plugin_id' => 'search_score',
'click sortable' => TRUE,
'float' => TRUE,
'no group by' => TRUE,
@@ -86,7 +86,7 @@ function search_views_data() {
'title' => t('Links from'),
'help' => t('Other nodes that are linked from the node.'),
'argument' => array(
- 'handler' => 'views_handler_argument_node_nid',
+ 'plugin_id' => 'node_nid',
),
'filter' => array(
'plugin_id' => 'equality',
@@ -104,7 +104,7 @@ function search_views_data() {
'title' => t('Links to'),
'help' => t('Other nodes that link to the node.'),
'argument' => array(
- 'handler' => 'views_handler_argument_node_nid',
+ 'plugin_id' => 'node_nid',
),
'filter' => array(
'plugin_id' => 'equality',
@@ -117,11 +117,11 @@ function search_views_data() {
'help' => t('The terms to search for.'), // The help that appears on the UI,
// Information for searching terms using the full search syntax
'filter' => array(
- 'handler' => 'views_handler_filter_search',
+ 'plugin_id' => 'search',
'no group by' => TRUE,
),
'argument' => array(
- 'handler' => 'views_handler_argument_search',
+ 'plugin_id' => 'search',
'no group by' => TRUE,
),
);
@@ -134,7 +134,7 @@ function search_views_data() {
*/
function search_views_plugins() {
return;
- // DISABLED. This currently doesn't work.
+ // @todo: DISABLED. This currently doesn't work.
return array(
'module' => 'views', // This just tells our themes are elsewhere.
'row' => array(
@@ -147,9 +147,6 @@ function search_views_plugins() {
'base' => array('node'), // only works with 'node' as base.
'type' => 'normal',
),
- 'views_handler_argument_search' => array(
- 'parent' => 'views_handler_argument',
- ),
),
);
}
diff --git a/views.module b/views.module
index d3c5a82292b2034fd424eaefcfbedcc06d9446bb..6c8a54731827ab4fe68256892d381fa272ce4507 100644
--- a/views.module
+++ b/views.module
@@ -31,9 +31,9 @@ function views_init() {
$path = drupal_get_path('module', 'views');
$loader = drupal_classloader();
foreach ($core_modules as $module) {
- if (function_exists($module . '_views_api')) {
- $name = $module . '\\Plugin';
- $loader->registerNamespace('Drupal\\' . $name, DRUPAL_ROOT . '/' . $path . '/lib');
+ $function = $module . '_views_api';
+ if (function_exists($function)) {
+ $loader->registerNamespace('Views\\' . $module, DRUPAL_ROOT . '/' . $path . '/lib');
}
}
}