Permalink
Browse files

Move again Meta and Metastore inside Access namespace, along with Ind…

…exer.
  • Loading branch information...
1 parent 5d6660e commit cdeb94886d85bf99ce25f4728c8a5084e508cbad @cdujeu cdujeu committed Jun 22, 2016
Showing with 88 additions and 91 deletions.
  1. +1 −1 core/src/core/src/pydio/Core/Http/Dav/Node.php
  2. +1 −1 core/src/core/src/pydio/Core/PluginFramework/PluginsService.php
  3. +3 −2 core/src/plugins/action.share/res/react/ShareDialog.js
  4. +3 −3 core/src/plugins/action.share/src/Legacy/LegacyPubliclet.php
  5. +3 −2 core/src/plugins/action.share/src/Model/CompositeShare.php
  6. +8 −7 core/src/plugins/action.share/src/ShareCenter.php
  7. +4 −4 core/src/plugins/action.share/src/Store/ShareRightsManager.php
  8. +1 −1 core/src/plugins/core.access/src/Model/AJXP_Node.php
  9. +1 −1 core/src/plugins/core.index/AbstractSearchEngineIndexer.php
  10. +1 −1 core/src/plugins/core.meta/AbstractMetaSource.php
  11. +2 −4 core/src/plugins/core.metastore/IMetaStoreProvider.php
  12. +3 −3 core/src/plugins/meta.comments/CommentsMetaManager.php
  13. +1 −1 core/src/plugins/meta.comments/manifest.xml
  14. +2 −2 core/src/plugins/meta.exif/ExifMetaManager.php
  15. +2 −2 core/src/plugins/meta.exif/ExifXmlMessage.php
  16. +2 −2 core/src/plugins/meta.exif/GeoConversion.php
  17. +1 −1 core/src/plugins/meta.exif/manifest.xml
  18. +4 −4 core/src/plugins/meta.filehasher/FileHasher.php
  19. +1 −1 core/src/plugins/meta.filehasher/manifest.xml
  20. +3 −3 core/src/plugins/meta.git/GitManager.php
  21. +1 −1 core/src/plugins/meta.git/manifest.xml
  22. +2 −2 core/src/plugins/meta.monitor_fs/FSMonitoringManager.php
  23. +1 −1 core/src/plugins/meta.monitor_fs/manifest.xml
  24. +2 −2 core/src/plugins/meta.mount/FilesystemMounter.php
  25. +1 −1 core/src/plugins/meta.mount/manifest.xml
  26. +2 −2 core/src/plugins/meta.quota/QuotaComputer.php
  27. +1 −1 core/src/plugins/meta.quota/manifest.xml
  28. +3 −3 core/src/plugins/meta.simple_lock/SimpleLockManager.php
  29. +1 −1 core/src/plugins/meta.simple_lock/manifest.xml
  30. +2 −2 core/src/plugins/meta.svn/SvnManager.php
  31. +1 −1 core/src/plugins/meta.svn/manifest.xml
  32. +2 −2 core/src/plugins/meta.syncable/ChangesTracker.php
  33. +1 −1 core/src/plugins/meta.syncable/manifest.xml
  34. +3 −3 core/src/plugins/meta.user/UserMetaManager.php
  35. +1 −1 core/src/plugins/meta.user/manifest.xml
  36. +3 −3 core/src/plugins/meta.watch/WatchRegister.php
  37. +1 −1 core/src/plugins/meta.watch/manifest.xml
  38. +3 −5 core/src/plugins/metastore.s3/S3MetaStore.php
  39. +1 −1 core/src/plugins/metastore.s3/manifest.xml
  40. +3 −5 core/src/plugins/metastore.serial/SerialMetaStore.php
  41. +1 −1 core/src/plugins/metastore.serial/manifest.xml
  42. +4 −4 core/src/plugins/metastore.xattr/XAttrMetaStore.php
  43. +1 −1 core/src/plugins/metastore.xattr/manifest.xml
@@ -28,7 +28,7 @@
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\Controller\Controller;
use Pydio\Core\PluginFramework\PluginsService;
-use Pydio\Metastore\Core\IMetaStoreProvider;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -40,7 +40,7 @@
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\Utils;
use Pydio\Log\Core\AJXP_Logger;
-use Pydio\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -685,8 +685,9 @@
buildLabel: function(){
var link = this.props.linkData;
- var host = link.HOST || link.invitation.HOST;
- var user = link.USER || link.invitation.USER;
+ var host = link.HOST || (link.invitation ? link.invitation.HOST : null);
+ var user = link.USER || (link.invitation ? link.invitation.USER : null);
+ if(!host || !user) return "Error";
return user + " @ " + host ;
},
@@ -21,12 +21,12 @@
namespace Pydio\Share\Legacy;
-use MetaWatchRegister;
use Pydio\Access\Core\AbstractAccessDriver;
use Pydio\Access\Core\Filter\ContentFilter;
use Pydio\Access\Core\Model\AJXP_Node;
use Pydio\Access\Core\Model\Repository;
use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Access\Meta\Watch\WatchRegister;
use Pydio\Core\Model\Context;
use Pydio\Core\Model\ContextInterface;
@@ -85,7 +85,7 @@ public static function render($data, $options, $shareStore){
* @param $shareMeta
* @param ShareStore $shareStore
* @param PublicAccessManager $publicAccessManager
- * @param MetaWatchRegister|null $watcher
+ * @param WatchRegister|null $watcher
* @param $node
* @return array|false
* @throws \Exception
@@ -115,7 +115,7 @@ public static function publicletToJson(ContextInterface $ctx, $shareId, $shareMe
$elementWatch = $watcher->hasWatchOnNode(
$node,
$ctx->getUser()->getId(),
- MetaWatchRegister::$META_WATCH_USERS_NAMESPACE,
+ WatchRegister::$META_WATCH_USERS_NAMESPACE,
$result
);
if ($elementWatch && !in_array($shareId, $result)) {
@@ -23,6 +23,7 @@
use Pydio\Access\Core\Model\AJXP_Node;
use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Meta\Watch\WatchRegister;
use Pydio\Core\Model\ContextInterface;
@@ -115,7 +116,7 @@ public function isInvalid(){
}
/**
- * @param \MetaWatchRegister|false $watcher
+ * @param WatchRegister|false $watcher
* @param ShareRightsManager $rightsManager
* @param PublicAccessManager $publicAccessManager
* @param array $messages
@@ -129,7 +130,7 @@ public function toJson(ContextInterface $ctx, $watcher, $rightsManager, $publicA
$elementWatch = $watcher->hasWatchOnNode(
$repoRootNode,
$ctx->getUser()->getId(),
- \MetaWatchRegister::$META_WATCH_NAMESPACE
+ WatchRegister::$META_WATCH_NAMESPACE
);
}
$sharedEntries = $rightsManager->computeSharedRepositoryAccessRights($this->getRepositoryId(), true, $repoRootNode);
@@ -22,7 +22,7 @@
use DOMNode;
use DOMXPath;
-use MetaWatchRegister;
+
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Pydio\Access\Core\AbstractAccessDriver;
@@ -31,6 +31,7 @@
use Pydio\Access\Core\Model\NodesList;
use Pydio\Access\Core\Model\Repository;
use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Access\Meta\Watch\WatchRegister;
use Pydio\Core\Controller\CliRunner;
use Pydio\Core\Http\Message\UserMessage;
use Pydio\Core\Http\Response\SerializableResponseStream;
@@ -91,7 +92,7 @@ class ShareCenter extends Plugin
private $publicAccessManager;
/**
- * @var \MetaWatchRegister
+ * @var WatchRegister
*/
private $watcher = false;
@@ -431,7 +432,7 @@ protected function toggleWatchOnSharedRepository($childRepoId, $userId, $toggle
$this->watcher->setWatchOnFolder(
$rootNode,
$userId,
- MetaWatchRegister::$META_WATCH_USERS_CHANGE,
+ WatchRegister::$META_WATCH_USERS_CHANGE,
array($parentUserId)
);
} else {
@@ -448,7 +449,7 @@ protected function toggleWatchOnSharedRepository($childRepoId, $userId, $toggle
$this->watcher->setWatchOnFolder(
$rootNode,
$userId,
- MetaWatchRegister::$META_WATCH_BOTH);
+ WatchRegister::$META_WATCH_BOTH);
} else {
@@ -737,7 +738,7 @@ public function switchAction(ServerRequestInterface &$requestInterface, Response
$this->watcher->setWatchOnFolder(
$selectedNode,
$ctxUser->getId(),
- MetaWatchRegister::$META_WATCH_USERS_READ,
+ WatchRegister::$META_WATCH_USERS_READ,
array($elementId)
);
} else {
@@ -753,7 +754,7 @@ public function switchAction(ServerRequestInterface &$requestInterface, Response
$this->watcher->setWatchOnFolder(
$selectedNode,
$ctxUser->getId(),
- MetaWatchRegister::$META_WATCH_BOTH
+ WatchRegister::$META_WATCH_BOTH
);
} else {
$this->watcher->removeWatchFromFolder(
@@ -2025,7 +2026,7 @@ public function shareToJson(ContextInterface $ctx, $shareId, $shareMeta, $node =
$elementWatch = $this->watcher->hasWatchOnNode(
$watchNode,
$ctx->hasUser()?$ctx->getUser()->getId():"shared",
- MetaWatchRegister::$META_WATCH_NAMESPACE
+ WatchRegister::$META_WATCH_NAMESPACE
);
}
if($node != null){
@@ -20,10 +20,10 @@
*/
namespace Pydio\Share\Store;
-use MetaWatchRegister;
use Pydio\Access\Core\Model\AJXP_Node;
use Pydio\Access\Core\Filter\AJXP_PermissionMask;
use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Meta\Watch\WatchRegister;
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\Model\UserInterface;
@@ -54,7 +54,7 @@
class ShareRightsManager
{
/**
- * @var MetaWatchRegister|bool
+ * @var WatchRegister|bool
*/
var $watcher;
/**
@@ -75,7 +75,7 @@ class ShareRightsManager
* @param ContextInterface $context
* @param array $options
* @param ShareStore $store
- * @param MetaWatchRegister|bool $watcher
+ * @param WatchRegister|bool $watcher
*/
public function __construct(ContextInterface $context, $options, $store, $watcher = false)
{
@@ -340,7 +340,7 @@ public function computeSharedRepositoryAccessRights($repoId, $mixUsersAndGroups,
$WATCH = $this->watcher->hasWatchOnNode(
$watcherNode,
$userId,
- MetaWatchRegister::$META_WATCH_USERS_NAMESPACE
+ WatchRegister::$META_WATCH_USERS_NAMESPACE
);
}
$ID = $userId;
@@ -35,7 +35,7 @@
use Pydio\Core\PluginFramework\PluginsService;
use Pydio\Core\Services\RepositoryService;
use Pydio\Core\Utils\Utils;
-use Pydio\Metastore\Core\IMetaStoreProvider;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
/**
@@ -28,7 +28,7 @@
use Pydio\Core\Utils\StatHelper;
use Pydio\Core\Utils\Utils;
use Pydio\Core\Utils\VarsFilter;
-use Pydio\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
/**
* Class AbstractSearchEngineIndexer
@@ -18,7 +18,7 @@
*
* The latest code can be found at <http://pyd.io/>.
*/
-namespace Pydio\Meta\Core;
+namespace Pydio\Access\Meta\Core;
use Pydio\Access\Core\AbstractAccessDriver;
use Pydio\Core\Model\ContextInterface;
@@ -18,10 +18,9 @@
*
* The latest code can be found at <http://pyd.io/>.
*/
-namespace Pydio\Metastore\Core;
+namespace Pydio\Access\Metastore\Core;
use Pydio\Access\Core\AbstractAccessDriver;
-
use Pydio\Access\Core\IAjxpWrapperProvider;
use Pydio\Access\Core\Model\AJXP_Node;
use Pydio\Core\Model\ContextInterface;
@@ -35,8 +34,7 @@
/**
* Metadata interface, must be implemented by Metastore plugins.
*
- * @package AjaXplorer_Plugins
- * @subpackage Core
+ * @package Pydio\Access\Metastore\Core;
*/
interface IMetaStoreProvider
{
@@ -18,7 +18,7 @@
*
* The latest code can be found at <http://pyd.io/>.
*/
-namespace Pydio\Meta\UserGenerated;
+namespace Pydio\Access\Meta\UserGenerated;
use Pydio\Access\Core\AbstractAccessDriver;
use Pydio\Access\Core\Model\UserSelection;
@@ -28,8 +28,8 @@
use Pydio\Core\Utils\Utils;
use Pydio\Core\Controller\HTMLWriter;
use Pydio\Core\PluginFramework\PluginsService;
-use Pydio\Meta\Core\AbstractMetaSource;
-use Pydio\Metastore\Core\IMetaStoreProvider;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
use Pydio\Notification\Core\IFeedStore;
define("AJXP_META_SPACE_COMMENTS", "AJXP_META_SPACE_COMMENTS");
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<meta id="meta.comments" label="CONF_MESSAGE[Comments Feed]" description="CONF_MESSAGE[Display a chat-like feed on all nodes]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
- <class_definition filename="plugins/meta.comments/CommentsMetaManager.php" classname="Pydio\Meta\UserGenerated\CommentsMetaManager"/>
+ <class_definition filename="plugins/meta.comments/CommentsMetaManager.php" classname="Pydio\Access\Meta\UserGenerated\CommentsMetaManager"/>
<client_settings>
<resources>
<i18n namespace="meta.comments" path="plugins/meta.comments/i18n" />
@@ -19,7 +19,7 @@
* The latest code can be found at <http://pyd.io/>.
*/
-namespace Pydio\Meta\Exif;
+namespace Pydio\Access\Meta\Exif;
use Pydio\Access\Core\AbstractAccessDriver;
use Pydio\Access\Core\AJXP_MetaStreamWrapper;
@@ -30,7 +30,7 @@
use Pydio\Core\Utils\TextEncoder;
-use Pydio\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -18,7 +18,7 @@
*
* The latest code can be found at <https://pydio.com/>.
*/
-namespace Pydio\Meta\Exif;
+namespace Pydio\Access\Meta\Exif;
use Pydio\Core\Utils\Utils;
@@ -27,7 +27,7 @@
/**
* Class ExifXmlMessage
- * @package Pydio\Meta\Exif
+ * @package Pydio\Access\Meta\Exif
*/
class ExifXmlMessage implements \Pydio\Core\Http\Response\XMLSerializableResponseChunk, \Pydio\Core\Http\Response\JSONSerializableResponseChunk
{
@@ -44,11 +44,11 @@
// D.d (Dd) = Degrees, Decimal Degrees (ex. 45.3772o) //
// DMS (DMS) = Degrees, Minutes, Seconds (ex. 45o22'38") //
//*********************************************************************//
-namespace Pydio\Meta\Exif;
+namespace Pydio\Access\Meta\Exif;
/**
* Class GeoConversion
- * @package Pydio\Meta\Exif
+ * @package Pydio\Access\Meta\Exif
*/
Class GeoConversion{
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<meta id="meta.exif" label="CONF_MESSAGE[Exif Metadata]" description="CONF_MESSAGE[Extracts the EXIF metadata of a JPG image. Used in conjunction with editor.exif]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
- <class_definition filename="plugins/meta.exif/ExifMetaManager.php" classname="Pydio\Meta\Exif\ExifMetaManager"/>
+ <class_definition filename="plugins/meta.exif/ExifMetaManager.php" classname="Pydio\Access\Meta\Exif\ExifMetaManager"/>
<client_settings icon="plugins/access.mysql/resources/images/mysql_icon.png">
<resources>
<i18n namespace="meta.exif" path="plugins/meta.exif/i18n" />
@@ -18,7 +18,7 @@
*
* The latest code can be found at <http://pyd.io/>.
*/
-namespace Pydio\Meta\Hash;
+namespace Pydio\Access\Meta\Hash;
use Pydio\Access\Core\AbstractAccessDriver;
use Pydio\Access\Core\AJXP_MetaStreamWrapper;
@@ -31,14 +31,14 @@
use Pydio\Core\Utils\Utils;
use Pydio\Core\PluginFramework\PluginsService;
use Pydio\Core\Utils\TextEncoder;
-use Pydio\Meta\Core\AbstractMetaSource;
-use Pydio\Metastore\Core\IMetaStoreProvider;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
defined('AJXP_EXEC') or die('Access not allowed');
/**
* Generates and caches and md5 hash of each file
- * @package Pydio\Meta\Hash
+ * @package Pydio\Access\Meta\Hash
*/
class FileHasher extends AbstractMetaSource
{
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<meta id="meta.filehasher" label="CONF_MESSAGE[File Hasher]" description="CONF_MESSAGE[Compute on-demand a hash of the file content and stores it in the metadata if a metastore is provided]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
- <class_definition filename="plugins/meta.filehasher/FileHasher.php" classname="Pydio\Meta\Hash\FileHasher"/>
+ <class_definition filename="plugins/meta.filehasher/FileHasher.php" classname="Pydio\Access\Meta\Hash\FileHasher"/>
<server_settings>
<global_param name="RSYNC_SUPPORTED" type="boolean" label="CONF_MESSAGE[Rsync Support]" description="CONF_MESSAGE[Dont edit, it will be detected by the server]" expose="true"/>
</server_settings>
@@ -18,7 +18,7 @@
*
* The latest code can be found at <http://pyd.io/>.
*/
-namespace Pydio\Meta\Version;
+namespace Pydio\Access\Meta\Version;
use Pydio\Access\Core\AbstractAccessDriver;
use Pydio\Access\Core\Model\AJXP_Node;
@@ -27,13 +27,13 @@
use Pydio\Core\Utils\StatHelper;
use Pydio\Core\Utils\Utils;
use Pydio\Core\Controller\HTMLWriter;
-use Pydio\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
defined('AJXP_EXEC') or die('Access not allowed');
/**
* Manage versioning using Git
- * @package Pydio\Meta\Version
+ * @package Pydio\Access\Meta\Version
*/
class GitManager extends AbstractMetaSource
{
Oops, something went wrong.

0 comments on commit cdeb948

Please sign in to comment.