db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krist...@apache.org
Subject svn commit: r1156997 - in /db/derby/code/branches/10.8: ./ java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ java/testing/org/apache/derbyTesting/functionTests/util/
Date Fri, 12 Aug 2011 08:11:03 GMT
Author: kristwaa
Date: Fri Aug 12 08:11:02 2011
New Revision: 1156997

URL: http://svn.apache.org/viewvc?rev=1156997&view=rev
Log:
DERBY-5318: Use assertDirectoryDeleted in ReplicationRun and remove dead code

Merged fix from trunk (r1146644).

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Utils.java
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/PrivilegedFileOpsForTests.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 12 08:11:02 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1136363,1136371,1136397,1136844,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1146915,1146962,1148344,1148354,1148658,1151101,1151612
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133304,1133317,1133741,1133752,1136363,1136371,1136397,1136844,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1141924,1142583,1142635,1146644,1146915,1146962,1148344,1148354,1148658,1151101,1151612

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java?rev=1156997&r1=1156996&r2=1156997&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
Fri Aug 12 08:11:02 2011
@@ -22,7 +22,6 @@ package org.apache.derbyTesting.function
 
 
 import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
-import org.apache.derbyTesting.junit.TestConfiguration;
 import org.apache.derby.drda.NetworkServerControl;
 import java.net.InetAddress;
 import java.util.Properties;
@@ -761,8 +760,7 @@ public class ReplicationRun extends Base
         else
         {
             runUserCommandInThreadRemotely(command,
-                    testClientHost, testUser, dbSubPath,
-                    "runLoad["+dbSubPath+"] ");
+                    testClientHost, testUser, "runLoad["+dbSubPath+"] ");
         }
         
     }
@@ -851,17 +849,6 @@ public class ReplicationRun extends Base
                 +";create=true"
                 +useEncryption(true);
 
-        String ijClassPath = derbyVersion +FS+ "derbyclient.jar"
-                + PS + derbyVersion +FS+ "derbytools.jar";
-        
-        if ( masterHost.equals("localhost") )
-        { // Use full classpath when running locally. Can not vary server versions!
-            ijClassPath = classPath;
-        }
-        String hostJvm = ReplicationRun.getMasterJavaExecutableName();
-        
-        String results = null;
-
         {
             util.DEBUG("bootMasterDatabase getConnection("+URL+")");
             Class.forName(DRIVER_CLASS_NAME); // Needed when running from classes!
@@ -915,66 +902,15 @@ public class ReplicationRun extends Base
         else
         {
             startMaster_ij(dbName,
-                    masterHost, masterServerPort, 
-                    slaveReplInterface, slaveReplPort, 
-                    testClientHost);
-        }
-    }
-    /* CLI not available for 10.4 */
-    private void startMaster_CLI(String clientVM,
-            String dbName,
-            String masterHost,  // Where the command is to be executed.
-            int masterServerPort, // master server interface accepting client requests
-            String slaveClientInterface, // Will be = slaveReplInterface = slaveHost if only
one interface card used.
-            int slaveServerPort, // masterPort, // Not used since slave don't accept client
requests
-            String slaveReplInterface, // slaveHost,
-            int slaveReplPort) // slavePort)
-            throws Exception
-    {
-        
-        String masterClassPath = derbyMasterVersion +FS+ "derbynet.jar";
-        
-        String clientJvm = ReplicationRun.getMasterJavaExecutableName();
-        
-        if ( masterHost.equals("localhost") )
-        { // Use full classpath when running locally. Can not vary server versions!
-            masterClassPath = classPath;
+                    masterHost, 
+                    slaveReplInterface, slaveReplPort);
         }
-        /* java -classpath ${MASTER_LIB}/derbynet.jar \
-         *       org.apache.derby.drda.NetworkServerControl startreplication test \
-         *       -slavehost ${SLAVEREPLINTERFACE} -slaveport ${SLAVEREPLPORT} \
-         *       -h ${SLAVECLIENTINTERFACE} -p ${SLAVESERVERPORT}?? \
-         *       -noSecurityManager
-         */
-        String command = clientJvm
-                + " -classpath " + masterClassPath
-                + " " + networkServerControl
-                + " startreplication" // startmaster!
-                + " " + dbName
-                + " -slavehost " + /*slaveHost*/ slaveReplInterface + " -slaveport " + /*slavePort*/
slaveReplPort
-                + " -h " + /*masterHost*/ slaveClientInterface + " -p " + masterServerPort
/*masterPort*/ /* see comment above slaveServerPort */
-                + " -noSecurityManager"
-                ;
-        
-        util.DEBUG("Executing '" + command + "' on " + masterHost);
-        
-        // Do rsh/ssh to masterHost and execute the command there.
-        
-        // runUserCommandRemotely(command, // FIXME?! Should NOT be in sep. thread? Wait
for it to complete!?
-        runUserCommandInThreadRemotely(command, //
-                masterHost,
-                testUser,
-                masterDbSubPath+FS+dbName,
-                "startMaster_CLI ");
-        
     }
+
     private void startMaster_ij(String dbName,
-            String masterHost,
-            int masterServerPort,  // Where the master db is run.
+            String masterHost, // Where the master db is run.
             String slaveReplInterface, // master server interface accepting client requests
-            
-            int slaveReplPort, // slaveHost,
-            String testClientHost)
+            int slaveReplPort)
             throws Exception
     {
         
@@ -1151,67 +1087,18 @@ public class ReplicationRun extends Base
         }
         else
         {
-            startSlave_ij(jvmVersion,
+            startSlave_ij(
                     dbName,
-                    slaveClientInterface, slaveServerPort,
-                    slaveReplInterface, slaveReplPort,
-                    testClientHost);
-        }
-        /* else if ... 
-        {
-            startSlave_CLI(clientVM,
-                    dbName,
-                    slaveClientInterface,slaveServerPort,
-                    slaveReplInterface,slaveReplPort);
-        } */
-        
-    }
-    /* CLI Not available in 10.4 */
-    private void startSlave_CLI(String clientVM,
-            String dbName,
-            String slaveClientInterface, // slaveHost, // Where the command is to be executed.
-            int slaveServerPort,
-            String slaveReplInterface,
-            int slaveReplPort)
-            throws InterruptedException
-    {
-        
-        String slaveClassPath = derbySlaveVersion +FS+ "derbynet.jar";
-        if ( slaveClientInterface.equals("localhost") )
-        { // Use full classpath when running locally. Can not vary server versions!
-            slaveClassPath = classPath;
+                    slaveClientInterface,
+                    slaveReplInterface, slaveReplPort);
         }
-        
-        String clientJvm = ReplicationRun.getSlaveJavaExecutableName();
-        
-        String command = clientJvm
-                + " -classpath " + slaveClassPath
-                + " " + networkServerControl
-                + " startslave"
-                + " " + dbName
-                + " -slavehost " + slaveReplInterface + " -slaveport " + slaveReplPort
-                + " -h " + slaveClientInterface + " -p " + slaveServerPort
-                + " -noSecurityManager"
-                ;
-        
-        util.DEBUG("Executing  '" + command + "' on " + slaveClientInterface); // slaveHost
-        
-        runUserCommandInThreadRemotely(command,
-                slaveClientInterface, // slaveHost,
-                testUser,
-                slaveDbSubPath+FS+dbName,
-                "startSlave_CLI ");
-        
     }
-    private void startSlave_ij(String jvmVersion,
+
+    private void startSlave_ij(
             String dbName,
             String slaveHost,  // Where the slave db is run.
-            int slaveServerPort, // slave server interface accepting client requests
-            
             String slaveReplInterface, // slaveHost,
-            int slaveReplPort, // slavePort)
-            
-            String testClientHost)
+            int slaveReplPort)
             throws Exception
     {
         
@@ -1237,7 +1124,6 @@ public class ReplicationRun extends Base
         runUserCommandInThreadRemotely(command,
                 slaveHost, // Run on the slave.
                 testUser,
-                /* slaveDbSubPath+FS+ */ dbName,
                 "startSlave_ij ");
         
     }
@@ -1268,7 +1154,6 @@ public class ReplicationRun extends Base
                 {
                     startSlaveException = null;
                     Connection conn = null;
-                    String expectedState = "XRE08";
                     try {
                         // NB! WIll hang here until startMaster is executed!
                         /*On 1.5 locking of Drivermanager.class prevents
@@ -1311,20 +1196,17 @@ public class ReplicationRun extends Base
     {
         if ( host.equalsIgnoreCase("localhost") )
         {
-            failOver_direct(dbPath, dbSubPath, dbName, host, serverPort);
+            failOver_direct(dbName);
         }
         else
         {
-            failOver_ij(jvmVersion, dbPath, dbSubPath, dbName, host, serverPort,
-                    testClientHost);
+            failOver_ij(dbName, host, testClientHost);
         }
 
     }
-    private void failOver_ij(String jvmVersion,
-            String dbPath, String dbSubPath, String dbName,
+    private void failOver_ij(
+            String dbName,
             String host,  // Where the db is run.
-            int serverPort,
-            
             String testClientHost)
             throws Exception
     {
@@ -1355,9 +1237,7 @@ public class ReplicationRun extends Base
                 "failOver_ij ");
         util.DEBUG(results);
     }
-    private void failOver_direct(String dbPath, String dbSubPath, String dbName,
-            String host,  // Where the db is run.
-            int serverPort)
+    private void failOver_direct(String dbName)
             throws Exception
     {
         String URL = masterURL(dbName)
@@ -1365,12 +1245,10 @@ public class ReplicationRun extends Base
                
             util.DEBUG("failOver_direct getConnection("+URL+")");
 
-            Connection conn = null;
             try
             {
                 Class.forName(DRIVER_CLASS_NAME); // Needed when running from classes!
-                conn = DriverManager.getConnection(URL);
-                // conn.close();
+                DriverManager.getConnection(URL);
             }
             catch (SQLException se)
             {
@@ -1386,53 +1264,6 @@ public class ReplicationRun extends Base
             }
    }
     
-    private void stopMaster(String dbName)
-    {
-        util.DEBUG("Simulating '... stopreplication/stopmaster -db "+dbName
-                + " NB! Doing nothing now!");
-    }
-    private void stopMaster_ij(String jvmVersion,
-            String dbName,
-            String masterHost,  // Where the master db is run.
-            int masterServerPort,
-            
-            String testClientHost)
-            throws Exception
-    {
-        
-        String masterClassPath = derbyMasterVersion +FS+ "derbynet.jar";
-        if ( masterHost.equals("localhost") )
-        { // Use full classpath when running locally. Can not vary server versions!
-            masterClassPath = classPath;
-        }
-                
-        String URL = masterURL(dbName)
-                +";stopMaster=true"; 
-        String ijClassPath = derbyVersion +FS+ "derbyclient.jar"
-                + PS + derbyVersion +FS+ "derbytools.jar";
-        if ( masterHost.equals("localhost") )
-        { // Use full classpath when running locally. Can not vary server versions!
-            ijClassPath = classPath;
-        }
-        
-        String clientJvm = ReplicationRun.getMasterJavaExecutableName();
-        
-        String command = clientJvm
-                + " -Dij.driver=" + DRIVER_CLASS_NAME
-                + " -Dij.connection.stopMaster=\"" + URL + "\""
-                + " -classpath " + ijClassPath + " org.apache.derby.tools.ij"
-                + " " + userHome + FS + "ij_dummy_script.sql"
-                ;
-        
-        // Execute the ij command on the testClientHost as testUser
-        String results =
-                runUserCommandRemotely(command,
-                testClientHost,
-                testUser,
-                "stopMaster_ij ");
-        util.DEBUG(results);
-    }
-    
     int xFindServerPID(String serverHost, int serverPort)
     throws InterruptedException
     {
@@ -1597,8 +1428,7 @@ public class ReplicationRun extends Base
     
     
     
-    String runUserCommand(String command,
-            String testUser)
+    String runUserCommand(String command)
     {
         util.DEBUG("Execute '"+ command +"'");
         String output = "";
@@ -1620,10 +1450,7 @@ public class ReplicationRun extends Base
         
         return output;
     }
-    private String runUserCommand(String command,
-            String testUser,
-            // String dbDir,
-            String id)
+    private String runUserCommand(String command, String id)
     {
         final String ID= "runUserCommand "+id+" ";
         util.DEBUG("Execute '"+ command +"'");
@@ -1652,14 +1479,13 @@ public class ReplicationRun extends Base
         final String debugId = "runUserCommandLocally " + ID + " ";
         util.DEBUG("+++ runUserCommandLocally " + command + " / " + user_dir);
                         
-        String tmp ="";
         util.DEBUG(debugId+command);
         
         final String fullCmd = command;
         
         String[] envElements = null; // rt.exec() will inherit..
         /*
-        tmp ="";
+        String tmp ="";
         for ( int i=0;i<envElements.length;i++)
         {tmp = tmp + envElements[i] + " ";}
         util.DEBUG(debugId+"envElements: " + tmp);
@@ -1699,14 +1525,12 @@ public class ReplicationRun extends Base
                 + command
                 // + "\"" + command + "\"" // make sure it's all run remotely
                 ;
-        return runUserCommand(localCommand,
-                testUser);
+        return runUserCommand(localCommand);
         
     }
     private String runUserCommandRemotely(String command,
             String host,
             String testUser,
-            // String dbDir,
             String id)
             throws InterruptedException
     {
@@ -1718,10 +1542,7 @@ public class ReplicationRun extends Base
                 + "-l " + testUser + " " + host + " "
                 + command
                 ;
-        return runUserCommand(localCommand,
-                testUser,
-                // dbDir,
-                ID);
+        return runUserCommand(localCommand, ID);
     }
     
     private void runUserCommandInThread(String command,
@@ -1735,7 +1556,6 @@ public class ReplicationRun extends Base
         util.DEBUG(ID + "Execute '"+ command +"'");
         util.DEBUG("+++ "+ID);
      
-        String localCommand =command ;
         util.DEBUG("runUserCommand: " + command );
      
         final String[] commandElements = {command};
@@ -1767,11 +1587,10 @@ public class ReplicationRun extends Base
             {
                 public void run()
                 {
-                    Process proc = null;
                     try
                     {
                         util.DEBUG(ID+"************** In run().");
-                        proc = Runtime.getRuntime().exec(fullCmd,envElements,workingDir);
+                        Runtime.getRuntime().exec(fullCmd,envElements,workingDir);
                         util.DEBUG(ID+"************** Done exec().");
                     }
                     catch (Exception ex)
@@ -1796,7 +1615,6 @@ public class ReplicationRun extends Base
     private void runUserCommandInThreadRemotely(String command,
             String host,
             String testUser,
-            String dbDir,
             String id)
             throws InterruptedException
     {
@@ -2040,6 +1858,8 @@ public class ReplicationRun extends Base
     throws Exception
     {
         
+        File masterHome = new File(masterDatabasePath, masterDbSubPath);
+        File slaveHome = new File(slaveDatabasePath, slaveDbSubPath);
         util.DEBUG("initMaster");
         
         /* bootMasterDataBase now does "connect ...;create=true" */
@@ -2047,14 +1867,16 @@ public class ReplicationRun extends Base
         String results = null;
         if ( host.equalsIgnoreCase("localhost") || localEnv )
         {
-            String dir = masterDatabasePath+FS+masterDbSubPath;
-            util.mkDirs(dir); // Create the dir if non-existing.
-            util.cleanDir(dir, false); // false: do not delete the directory itself.
+            if (PrivilegedFileOpsForTests.exists(masterHome)) {
+                BaseJDBCTestCase.assertDirectoryDeleted(masterHome);
+            }
+            util.mkDirs(masterHome.getPath()); // Create the directory
             
             // Ditto for slave:
-            dir = slaveDatabasePath+FS+slaveDbSubPath;
-            util.mkDirs(dir); // Create the dir if non-existing.
-            util.cleanDir(dir, false); // false: do not delete the directory itself.
+            if (PrivilegedFileOpsForTests.exists(slaveHome)) {
+                BaseJDBCTestCase.assertDirectoryDeleted(slaveHome);
+            }
+            util.mkDirs(slaveHome.getPath()); // Create the directory
             
             // util.writeToFile(derbyProperties, dir+FS+"derby.properties");
         }
@@ -2104,29 +1926,29 @@ public class ReplicationRun extends Base
     {
         
         util.DEBUG("initSlave");
+        File slaveHome = new File(slaveDatabasePath, slaveDbSubPath);
+        File masterHome = new File(masterDatabasePath, masterDbSubPath);
+        File masterDb = new File(masterHome, dbName);
         
         String results = null;
         if ( host.equalsIgnoreCase("localhost") || localEnv )
         {
-            String slaveDb = slaveDatabasePath+FS+slaveDbSubPath+FS+dbName;
             // The slaveDb dir is cleaned by initMaster! NB NB SHOULD THIS BE SO?
             // util.cleanDir(slaveDb, true); // true: do delete the db directory itself.
                                           // derby.log etc will be kept.
-            String masterDb = masterDatabasePath+FS
-                    +masterDbSubPath+FS+dbName;
-            util.copyDir(masterDb, slaveDb); // Copy the master database 
-                                         // directory (.../master/test) into the
-                                         // slave directory (.../slave/).
+            // Copy (.../master/test) into (.../slave/).
+            File slaveDb = new File(slaveHome, dbName);
+            PrivilegedFileOpsForTests.copy(masterDb, slaveDb);
 
             // util.writeToFile(derbyProperties, slaveDir+FS+"derby.properties");
         }
         else
         {
-            String command = "mkdir -p "+slaveDatabasePath+FS+slaveDbSubPath+";"
-                + " cd " + slaveDatabasePath+FS+slaveDbSubPath+";"
+            String command = "mkdir -p " + slaveHome.getPath() + ";"
+                + " cd " + slaveHome.getPath() +";"
                 + " rm -rf " + dbName + " derby.log;"
                 + " rm -f Server*.trace;"
-                + " scp -r " + masterServerHost + ":" +masterDatabasePath+FS+masterDbSubPath+FS+dbName
+"/ .;" // Copying the master DB.
+                + " scp -r " + masterServerHost + ":" + masterDb.getPath() +"/ .;" // Copying
the master DB.
                 + " ls -al" // DEBUG
                 ;
         
@@ -2467,32 +2289,7 @@ public class ReplicationRun extends Base
         util.DEBUG("");
         
     }
-    /*
-    private void processOutput(String id, Process proc, PrintWriter out)
-    throws Exception
-    {
-        InputStream serveInputStream = proc.getInputStream();
-        InputStream serveErrorStream = proc.getErrorStream();
-        
-        InputStreamReader isr = new InputStreamReader(serveInputStream);
-        InputStreamReader esr = new InputStreamReader(serveErrorStream);
-        BufferedReader bir = new BufferedReader(isr);
-        BufferedReader ber = new BufferedReader(esr);
-        String line=null;
-        util.DEBUG(id+"---- out:", out);
-        while ( (line = bir.readLine()) != null)
-        {
-            out.println(id+line);
-        }
-        util.DEBUG(id+"---- err:",out);
-        while ( (line = ber.readLine()) != null)
-        {
-            out.println(id+line);
-        }
-        util.DEBUG(id+"----     ",out);
-        
-    }
-    */
+
     private String processOutput(Process proc)
     throws Exception
     {
@@ -2586,32 +2383,7 @@ public class ReplicationRun extends Base
         util.DEBUG(id+"----     ");
         
     }
-    /*
-    private void processDEBUGOutput(String id, Process proc, PrintWriter out)
-    throws Exception
-    {
-        InputStream serveInputStream = proc.getInputStream();
-        InputStream serveErrorStream = proc.getErrorStream();
-        
-        InputStreamReader isr = new InputStreamReader(serveInputStream);
-        InputStreamReader esr = new InputStreamReader(serveErrorStream);
-        BufferedReader bir = new BufferedReader(isr);
-        BufferedReader ber = new BufferedReader(esr);
-        String line=null;
-        util.DEBUG(id+"---- out:", out);
-        while ( (line = bir.readLine()) != null)
-        {
-            out.println(id+line);
-        }
-        util.DEBUG(id+"---- err:",out);
-        while ( (line = ber.readLine()) != null)
-        {
-            out.println(id+line);
-        }
-        util.DEBUG(id+"----     ",out);
-        
-    }
-    */
+
     private void pingServer( String hostName, int port, int iterations)
     throws Exception
     {

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Utils.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Utils.java?rev=1156997&r1=1156996&r2=1156997&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Utils.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Utils.java
Fri Aug 12 08:11:02 2011
@@ -41,81 +41,6 @@ class Utils
     // File utilities:
     
     /**
-     * Deletes files in the given directory.
-     * NB! May also delete subdirectories!
-     * @param dir where to delete files.
-     * @param deleteRootDirectory if true deletes also the given root directory.
-     * @throws IOException if operation fails.
-     */
-    void cleanDir(String dir, boolean deleteRootDirectory)
-    throws Exception
-    {
-        try
-        {
-            File rootDir = new File(dir);
-            if (rootDir.isDirectory())
-            {
-                DEBUG("cleanDir: " + dir);
-                rmFiles(rootDir,deleteRootDirectory);
-            }
-            else
-            {
-                throw new IOException("Given path is not a directory: " + dir);
-            }
-        }
-        catch (Exception ex)
-        {
-            DEBUG("Got exception " + ex.getMessage());
-            throw new Exception("Exception deleting files " + ex);
-        }
-    }
-    /**
-     * Recursively delete files and directories in param dir.
-     * @param dir Where to delete files.
-     * @param rmdir If true delete also the given root directory (param dir).
-     * @throws IOException If operation fails.
-     */
-    void rmFiles(File dir,boolean rmdir) throws Exception
-    {
-        // DEBUG("Getting dir " + dir.getAbsolutePath());
-        String currDir = dir.getAbsolutePath();
-        if (dir.isDirectory())
-        {
-            String[] filelist = dir.list();
-            // DEBUG("Dir has " + filelist.length + " files");
-            for (int i = 0; i<filelist.length;i++)
-            {
-                // DEBUG("adding files, i " + i);
-                File f = new File(currDir + FS + filelist[i]);
-                if (f.isDirectory())
-                {
-                    // DEBUG("file is dir, get recursive");
-                    rmFiles(f,true);
-                }
-                else
-                {
-                    // DEBUG("delete file " + f.getAbsolutePath());
-                    boolean deleted = f.delete();
-                    if (!deleted) DEBUG("file NOT deleted " + f.getAbsolutePath());
-                }
-            }
-            
-            if (rmdir)
-            {
-                DEBUG("deleting directory " + dir.getAbsolutePath());
-                boolean deleted = dir.delete();
-                if (!deleted) DEBUG("dir NOT deleted " + dir.getAbsolutePath());
-            }
-        }
-        else
-        {
-            DEBUG("deleting file " +dir.getAbsolutePath());
-            boolean deleted = dir.delete();
-            if (!deleted) DEBUG("file NOT deleted " + dir.getAbsolutePath());
-        }
-    }
-
-    /**
      * Copy directory sourcePath into directory destPath
      * @param sourcePath Directory to copy
      * @param destPath Directory to copy into

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/PrivilegedFileOpsForTests.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/PrivilegedFileOpsForTests.java?rev=1156997&r1=1156996&r2=1156997&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/PrivilegedFileOpsForTests.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/util/PrivilegedFileOpsForTests.java
Fri Aug 12 08:11:02 2011
@@ -174,7 +174,7 @@ public class PrivilegedFileOpsForTests {
      * If source does not exist this will be a noop.
      * 
      * @param source  Source file or directory to copy
-     * @param target  Target file or directory to copy
+     * @param target  Target file or directory to copy to
      * @throws IOException
      * @throws SecurityException
      */    



Mime
View raw message