svn commit: r1197570 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav: AbstractRepositoryServletTestCase.java util/MavenIndexerCleaner.java

[olamy]

Author: olamy
Date: Fri Nov  4 13:52:43 2011
New Revision: 1197570

URL: http://svn.apache.org/viewvc?rev=1197570&view=rev
Log:
cleanup some test code

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java?rev=1197570&r1=1197569&r2=1197570&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletTestCase.java
 Fri Nov  4 13:52:43 2011
@@ -89,39 +89,6 @@ public abstract class AbstractRepository
         saveConfiguration( archivaConfiguration );
     }
 
-    @BeforeClass
-    public static void lockCleanup()
-        throws Exception
-    {
-        /*
-
-        try
-        {
-
-            /*
-            Field locks = 
NativeFSLockFactory.class.getDeclaredClasses()[0].getField( "LOCK_HELD" );
-            locks.setAccessible( true );
-            Method clear = locks.getClass().getMethod( "clear" );
-
-            clear.invoke( field, null );
-            */
-
-        /*
-            NativeFSLockFactory nativeFSLockFactory =
-                new NativeFSLockFactory( new File( 
"target/appserver-base/data/repositories/internal/.indexer" ) );
-
-            Lock lock = nativeFSLockFactory.makeLock( "write.lock" );
-            lock.release();
-            LoggerFactory.getLogger( AbstractRepositoryServletTestCase.class 
).info( "cleanup lock" );
-
-
-        }
-        catch ( LockReleaseFailedException e )
-        {
-            // ignore
-        }
-        */
-    }
 
 
     @Before
@@ -129,7 +96,6 @@ public abstract class AbstractRepository
         throws Exception
     {
 
-        lockCleanup();
         super.setUp();
 
         String appserverBase = new File( "target/appserver-base" 
).getAbsolutePath();

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java?rev=1197570&r1=1197569&r2=1197570&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/MavenIndexerCleaner.java
 Fri Nov  4 13:52:43 2011
@@ -110,20 +110,6 @@ public class MavenIndexerCleaner
             nexusIndexer.removeIndexingContext( context, true );
         }
 
-        /*
-        try
-        {
-            NativeFSLockFactory nativeFSLockFactory =
-                new NativeFSLockFactory( new File( 
"target/appserver-base/data/repositories/internal/.indexer" ) );
-            Lock lock = nativeFSLockFactory.makeLock( "write.lock" );
-            lock.release();
-            log.info( "cleanup lock" );
-        }
-        catch ( LockReleaseFailedException e )
-        {
-            // ignore
-        }*/
-
     }