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 386f179b61feada289ed0dcefcb0f80f7e96d20a..e7f0006dfa30a6ac7e0df165f8af8bf656dd066c 100644 (file)
--- 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 53972e503a29531d9030bfe0e1fe149b89f386f0..89c53e680f2cb6eb8160ecfb7efb1d4e2c419f7b 100644 (file)
--- 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 3ebe4b5d2b071b51eceba2c58b0c255b7b0c22e0..1f3eb942d1abaf42fd7b0d25b715c36e1bf0a3c2 100644 (file)
--- 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 9a0549c5aa42aae9c62987a6bf6cbadebb03e8b3..c963c303d2cd068df5eb90b6bd63922d57044760 100644 (file)
--- 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 37eecd674f53819a6208c53e0db28c01bbe185d0..4937b8eb90d147607d9836758e1a81158ea7d044 100644 (file)
--- 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 e949b0ccf89d7ab5dc9c2e95d4fc9e027bcf9d46..4eb3830d831215fa80d0c156e72990a7e75d8cca 100644 (file)
--- 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 8d33771439e668e853dbb40e27f994c577c74ab0..4eb662cbca064494ba0170f1b1f807bebac7c77a 100644 (file)
--- 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 eb5ce2d9672d52e81e4b049079bf1e4feaa22bd2..bfebe263e922490a818e378dc1225c998b24d029 100644 (file)
--- 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 816157cfd4a2be750eb7dc0db7f2292afd60cf08..788ba52db47b0f7184ad6bd3bf037cfa365a4ab4 100644 (file)
--- 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 37716bb79618ca25f7c8544ded881fcebf51780d..805954b0982fe4933df657354485777bb3a64e8e 100644 (file)
--- 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 872f31cf32bd3978880bb184bf5de902f2944dac..33e45e654d3310ca2249cb4145c81fee8b99941f 100644 (file)
--- 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 035c49c759258d6f2289b8348d039b1d981f1375..ad269f77b5cfbb6aeb95079e2de06201e4550985 100644 (file)
--- 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 636bbcaaa78b19cb415015e377dc6798c8e076ae..d157ecf45ba15f8d2c981771a5bba82185d169c5 100644 (file)
--- 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 92f73c7a6847837b70226b17cbcd740aa6b04fa6..b7ce02996335554d8788cdba586d1fa7c4aca945 100644 (file)
--- 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 6f17d12de125fc5069e03ec174c4f1d900598e15..b68b8d1bb45cff8dace4f6c52402a6bc9cd92c02 100644 (file)
--- 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>