Remove dependency to access.remote_fs (removed).

pydio · May 21, 2016 · daea661 · daea661
1 parent de2d3ad
commit daea661
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/core/src/plugins/access.dropbox/manifest.xml b/core/src/plugins/access.dropbox/manifest.xml
@@ -19,7 +19,6 @@
 	</registry_contributions>
 	<dependencies>
 		<pluginClass pluginName="access.fs"/>
-		<pluginClass pluginName="access.remote_fs"/>
 	</dependencies>
     <class_stream_wrapper filename="plugins/access.dropbox/class.dropboxWrapper.php" classname="Pydio\Access\Driver\StreamProvider\Dropbox\dropboxWrapper" protocol="ajxp.dropbox"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.ftp/manifest.xml b/core/src/plugins/access.ftp/manifest.xml
@@ -40,13 +40,16 @@
         <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*" exclude=""/>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*"/>
-		<external_file filename="plugins/access.remote_fs/additionalActions.xml" include="actions/*"/>
         <external_file filename="plugins/access.fs/manifest.xml" include="registry_contributions/hooks/*" exclude=""/>
+        <actions>
+            <action name="next_to_remote">
+                <processing><serverCallback methodName="uploadActions"/></processing>
+            </action>
+        </actions>
 	</registry_contributions>
 	<class_definition filename="plugins/access.ftp/class.ftpAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\FTP\ftpAccessDriver"/>
 	<dependencies>
 		<pluginClass pluginName="access.fs"/>
-		<pluginClass pluginName="access.remote_fs"/>
 	</dependencies>
     <class_stream_wrapper filename="plugins/access.ftp/class.ftpAccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\FTP\ftpAccessWrapper" protocol="ajxp.ftp"/>
 </ajxpdriver>
diff --git a/core/src/plugins/meta.comments/manifest.xml b/core/src/plugins/meta.comments/manifest.xml
@@ -66,6 +66,6 @@
 	</registry_contributions>
 	<dependencies>
 		<!-- Wrapper type plugins only -->
-		<pluginClass pluginName="access.fs|access.ftp|access.demo|access.remote_fs"/>
+		<pluginClass pluginName="access.fs|access.ftp|access.demo"/>
 	</dependencies>
 </meta>
diff --git a/core/src/plugins/meta.exif/manifest.xml b/core/src/plugins/meta.exif/manifest.xml
@@ -36,6 +36,6 @@
 	</registry_contributions>
 	<dependencies>
 		<!-- Wrapper type plugins only -->
-		<pluginClass pluginName="access.fs|access.ftp|access.demo|access.remote_fs"/>
+		<pluginClass pluginName="access.fs|access.ftp|access.demo"/>
 	</dependencies>
 </meta>
diff --git a/core/src/plugins/meta.svn/manifest.xml b/core/src/plugins/meta.svn/manifest.xml
@@ -168,6 +168,6 @@
 	</registry_contributions>
 	<dependencies>
 		<!-- Wrapper type plugins only -->
-		<pluginClass pluginName="access.fs|access.demo|access.remote_fs"/>
+		<pluginClass pluginName="access.fs|access.demo"/>
 	</dependencies>
 </meta>
diff --git a/core/src/plugins/meta.user/manifest.xml b/core/src/plugins/meta.user/manifest.xml
@@ -120,6 +120,6 @@
 	</registry_contributions>
 	<dependencies>
 		<!-- Wrapper type plugins only -->
-		<pluginClass pluginName="access.fs|access.ftp|access.demo|access.remote_fs"/>
+		<pluginClass pluginName="access.fs|access.ftp|access.demo"/>
 	</dependencies>
 </meta>