From: Bruno Sinou <bsinou@argeo.org>
Date: Tue, 6 Jan 2015 18:04:17 +0000 (+0000)
Subject: Re-integrate server.core in the build. Rename vfs package to vfs2
X-Git-Tag: argeo-commons-2.1.30~464^2~7
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=0743391503ba50a5a86ba3932440196bfa6e1ac1;p=lgpl%2Fargeo-commons.git

Re-integrate server.core in the build. Rename vfs package to vfs2

git-svn-id: https://svn.argeo.org/commons/branches/mbaudier.2.tp@7631 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.server.core/pom.xml b/org.argeo.server.core/pom.xml
index 386f179b6..e7f0006df 100644
--- a/org.argeo.server.core/pom.xml
+++ b/org.argeo.server.core/pom.xml
@@ -17,13 +17,13 @@
 		</dependency>
 
 		<!-- Apache Commons -->
-		<dependency>
+<!--  	<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.apache.commons.io</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.apache.commons.vfs</artifactId>
+			<artifactId>org.apache.commons.vfs2</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -38,9 +38,9 @@
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.joda.time</artifactId>
 		</dependency>
-
+ -->	
 		<!-- Spring -->
-		<dependency>
+<!-- <dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.web</artifactId>
 		</dependency>
@@ -60,22 +60,22 @@
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.web.servlet</artifactId>
 		</dependency>
-
+ -->
 		<!-- J2EE -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>javax.servlet</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp</groupId> -->
+<!-- 			<artifactId>javax.servlet</artifactId> -->
+<!-- 		</dependency> -->
 
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>slf4j.org.apache.commons.logging</artifactId>
-		</dependency>
+	<!-- Logging -->
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp</groupId> -->
+<!-- 			<artifactId>slf4j.org.apache.commons.logging</artifactId> -->
+<!-- 		</dependency> -->
 
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.apache.commons.fileupload</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp</groupId> -->
+<!-- 			<artifactId>org.apache.commons.fileupload</artifactId> -->
+<!-- 		</dependency> -->
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/AbstractAtomicBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/AbstractAtomicBackup.java
index 53972e503..89c53e680 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/AbstractAtomicBackup.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/AbstractAtomicBackup.java
@@ -15,10 +15,10 @@
  */
 package org.argeo.server.backup;
 
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.FileSystemOptions;
-import org.apache.commons.vfs.provider.sftp.SftpFileSystemConfigBuilder;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.commons.vfs2.FileSystemOptions;
+import org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder;
 import org.argeo.ArgeoException;
 
 /**
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/AtomicBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/AtomicBackup.java
index 3ebe4b5d2..1f3eb942d 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/AtomicBackup.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/AtomicBackup.java
@@ -15,8 +15,8 @@
  */
 package org.argeo.server.backup;
 
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.FileSystemOptions;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.commons.vfs2.FileSystemOptions;
 
 /** Performs the backup of a single component, typically a database dump */
 public interface AtomicBackup {
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/BackupFileSystemManager.java b/org.argeo.server.core/src/org/argeo/server/backup/BackupFileSystemManager.java
index 9a0549c5a..c963c303d 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/BackupFileSystemManager.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/BackupFileSystemManager.java
@@ -15,15 +15,15 @@
  */
 package org.argeo.server.backup;
 
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.impl.DefaultFileSystemManager;
-import org.apache.commons.vfs.provider.bzip2.Bzip2FileProvider;
-import org.apache.commons.vfs.provider.ftp.FtpFileProvider;
-import org.apache.commons.vfs.provider.gzip.GzipFileProvider;
-import org.apache.commons.vfs.provider.local.DefaultLocalFileProvider;
-import org.apache.commons.vfs.provider.ram.RamFileProvider;
-import org.apache.commons.vfs.provider.sftp.SftpFileProvider;
-import org.apache.commons.vfs.provider.url.UrlFileProvider;
+import org.apache.commons.vfs2.FileSystemException;
+import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
+import org.apache.commons.vfs2.provider.bzip2.Bzip2FileProvider;
+import org.apache.commons.vfs2.provider.ftp.FtpFileProvider;
+import org.apache.commons.vfs2.provider.gzip.GzipFileProvider;
+import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider;
+import org.apache.commons.vfs2.provider.ram.RamFileProvider;
+import org.apache.commons.vfs2.provider.sftp.SftpFileProvider;
+import org.apache.commons.vfs2.provider.url.UrlFileProvider;
 import org.argeo.ArgeoException;
 
 /**
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/BackupPurge.java b/org.argeo.server.core/src/org/argeo/server/backup/BackupPurge.java
index 37eecd674..4937b8eb9 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/BackupPurge.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/BackupPurge.java
@@ -17,8 +17,8 @@ package org.argeo.server.backup;
 
 import java.text.DateFormat;
 
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.FileSystemOptions;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.commons.vfs2.FileSystemOptions;
 
 /** Purges previous backups */
 public interface BackupPurge {
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/BackupUtils.java b/org.argeo.server.core/src/org/argeo/server/backup/BackupUtils.java
index e949b0ccf..4eb3830d8 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/BackupUtils.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/BackupUtils.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.server.backup;
 
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
 
 /** Backup utilities */
 public class BackupUtils {
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/MySqlBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/MySqlBackup.java
index 8d3377143..4eb662cbc 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/MySqlBackup.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/MySqlBackup.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.server.backup;
 
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
 
 /** Backups a MySQL database using mysqldump. */
 public class MySqlBackup extends OsCallBackup {
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/OpenLdapBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/OpenLdapBackup.java
index eb5ce2d96..bfebe263e 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/OpenLdapBackup.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/OpenLdapBackup.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.server.backup;
 
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
 import org.argeo.ArgeoException;
 
 /** Backups an OpenLDAP server using slapcat */
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/OsCallBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/OsCallBackup.java
index 816157cfd..788ba52db 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/OsCallBackup.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/OsCallBackup.java
@@ -28,8 +28,8 @@ import org.apache.commons.exec.PumpStreamHandler;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.vfs.FileContent;
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileContent;
+import org.apache.commons.vfs2.FileObject;
 import org.argeo.ArgeoException;
 
 /**
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/PostgreSqlBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/PostgreSqlBackup.java
index 37716bb79..805954b09 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/PostgreSqlBackup.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/PostgreSqlBackup.java
@@ -15,7 +15,7 @@
  */
 package org.argeo.server.backup;
 
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
 
 /** Backups a PostgreSQL database using pg_dump. */
 public class PostgreSqlBackup extends OsCallBackup {
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupContext.java b/org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupContext.java
index 872f31cf3..33e45e654 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupContext.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupContext.java
@@ -19,7 +19,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.apache.commons.vfs.FileSystemManager;
+import org.apache.commons.vfs2.FileSystemManager;
 
 /** Simple implementation of a backup context */
 public class SimpleBackupContext implements BackupContext {
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupPurge.java b/org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupPurge.java
index 035c49c75..ad269f77b 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupPurge.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupPurge.java
@@ -22,10 +22,10 @@ import java.util.TreeMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.FileSystemOptions;
-import org.apache.commons.vfs.Selectors;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.commons.vfs2.FileSystemOptions;
+import org.apache.commons.vfs2.Selectors;
 import org.argeo.ArgeoException;
 import org.joda.time.DateTime;
 import org.joda.time.Period;
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/SvnBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/SvnBackup.java
index 636bbcaaa..d157ecf45 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/SvnBackup.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/SvnBackup.java
@@ -17,7 +17,7 @@ package org.argeo.server.backup;
 
 import java.io.File;
 
-import org.apache.commons.vfs.FileObject;
+import org.apache.commons.vfs2.FileObject;
 
 /** Backups a Subversion repository using svnadmin. */
 public class SvnBackup extends OsCallBackup {
diff --git a/org.argeo.server.core/src/org/argeo/server/backup/SystemBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/SystemBackup.java
index 92f73c7a6..b7ce02996 100644
--- a/org.argeo.server.core/src/org/argeo/server/backup/SystemBackup.java
+++ b/org.argeo.server.core/src/org/argeo/server/backup/SystemBackup.java
@@ -22,15 +22,15 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.vfs.FileObject;
-import org.apache.commons.vfs.FileSystemException;
-import org.apache.commons.vfs.FileSystemManager;
-import org.apache.commons.vfs.FileSystemOptions;
-import org.apache.commons.vfs.Selectors;
-import org.apache.commons.vfs.UserAuthenticator;
-import org.apache.commons.vfs.auth.StaticUserAuthenticator;
-import org.apache.commons.vfs.impl.DefaultFileSystemConfigBuilder;
-import org.apache.commons.vfs.impl.StandardFileSystemManager;
+import org.apache.commons.vfs2.FileObject;
+import org.apache.commons.vfs2.FileSystemException;
+import org.apache.commons.vfs2.FileSystemManager;
+import org.apache.commons.vfs2.FileSystemOptions;
+import org.apache.commons.vfs2.Selectors;
+import org.apache.commons.vfs2.UserAuthenticator;
+import org.apache.commons.vfs2.auth.StaticUserAuthenticator;
+import org.apache.commons.vfs2.impl.DefaultFileSystemConfigBuilder;
+import org.apache.commons.vfs2.impl.StandardFileSystemManager;
 import org.argeo.ArgeoException;
 
 /**
diff --git a/pom.xml b/pom.xml
index 6f17d12de..b68b8d1bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 		<module>org.argeo.security.ui.rap</module>
 		<module>org.argeo.security.ui.rcp</module>
 		<!-- Legacy -->
-		<!-- <module>org.argeo.server.core</module> -->
+		<module>org.argeo.server.core</module>
 		<!-- <module>org.argeo.ext.jdbm</module> -->
 		<!-- Dependencies and Distributions -->
 		<module>dep</module>