Signed-off-by: olivier lamy <olamy@apache.org>MRM-1958
@@ -73,4 +73,10 @@ public class MockRepositorySessionFactory | |||
} | |||
}; | |||
} | |||
@Override | |||
public void close() | |||
{ | |||
// no op | |||
} | |||
} |
@@ -435,11 +435,12 @@ | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> | |||
<reuseForks>false</reuseForks> | |||
<includes> | |||
<include>**/*Tests.java</include> | |||
<include>**/*Test.java</include> | |||
</includes> | |||
<argLine>-Xms1024m -Xmx2048m -server -XX:MaxPermSize=256m @{jacocoproperty}</argLine> | |||
<argLine>-Xms1024m -Xmx3072m -server -XX:MaxPermSize=256m @{jacocoproperty}</argLine> | |||
<systemPropertyVariables> | |||
<appserver.base>${project.build.directory}/appserver-base</appserver.base> | |||
<plexus.home>${project.build.directory}/appserver-base</plexus.home> |
@@ -45,6 +45,7 @@ import org.apache.commons.io.FileUtils; | |||
import org.apache.commons.lang.StringUtils; | |||
import org.apache.cxf.jaxrs.client.JAXRSClientFactory; | |||
import org.apache.cxf.jaxrs.client.WebClient; | |||
import org.junit.After; | |||
import org.junit.Assume; | |||
import org.junit.Before; | |||
import org.junit.BeforeClass; | |||
@@ -77,6 +78,7 @@ public abstract class AbstractArchivaRestTest | |||
// END SNIPPET: authz-header | |||
@BeforeClass | |||
public static void chekRepo() | |||
{ | |||
@@ -102,6 +104,7 @@ public abstract class AbstractArchivaRestTest | |||
super.startServer(); | |||
} | |||
private void removeAppsubFolder( File appServerBase, String folder ) | |||
throws Exception | |||
{ |
@@ -55,4 +55,10 @@ public class TestRepositorySessionFactory | |||
{ | |||
return this; | |||
} | |||
@Override | |||
public void close() | |||
{ | |||
// no op | |||
} | |||
} |
@@ -22,4 +22,6 @@ package org.apache.archiva.metadata.repository; | |||
public interface RepositorySessionFactory | |||
{ | |||
RepositorySession createSession(); | |||
void close(); | |||
} |
@@ -82,4 +82,10 @@ public class CassandraRepositorySessionFactory | |||
return new RepositorySession( metadataRepository, metadataResolver ); | |||
} | |||
@Override | |||
public void close() | |||
{ | |||
cassandraArchivaManager.shutdown(); | |||
} | |||
} |
@@ -42,21 +42,12 @@ import java.util.Map; | |||
public class FileRepositorySessionFactory | |||
implements RepositorySessionFactory | |||
{ | |||
/** | |||
* | |||
*/ | |||
private Map<String, MetadataFacetFactory> metadataFacetFactories; | |||
/** | |||
* | |||
*/ | |||
@Inject | |||
@Named( value = "archivaConfiguration#default" ) | |||
private ArchivaConfiguration configuration; | |||
/** | |||
* | |||
*/ | |||
@Inject | |||
private MetadataResolver metadataResolver; | |||
@@ -87,4 +78,10 @@ public class FileRepositorySessionFactory | |||
return new RepositorySession( metadataRepository, metadataResolver ); | |||
} | |||
@Override | |||
public void close() | |||
{ | |||
// no op | |||
} | |||
} |
@@ -165,7 +165,11 @@ | |||
<artifactId>lucene-analyzers-common</artifactId> | |||
<version>${lucene.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>io.dropwizard.metrics</groupId> | |||
<artifactId>metrics-core</artifactId> | |||
<version>3.1.0</version> | |||
</dependency> | |||
</dependencies> | |||
<build> | |||
<testResources> |
@@ -77,6 +77,8 @@ public class RepositoryFactory | |||
private FileStore fileStore; | |||
private NodeStore nodeStore; | |||
private ExecutorService executorService; | |||
public enum StoreType | |||
@@ -93,11 +95,13 @@ public class RepositoryFactory | |||
throws IOException, InvalidFileStoreVersionException | |||
{ | |||
createExecutor(); | |||
NodeStore nodeStore; | |||
if ( SEGMENT_FILE_TYPE == storeType ) | |||
{ | |||
fileStore = FileStoreBuilder.fileStoreBuilder( repositoryPath.toFile() ).build(); | |||
nodeStore = SegmentNodeStoreBuilders.builder( fileStore ).build(); | |||
nodeStore = SegmentNodeStoreBuilders.builder( fileStore ) // | |||
.withStatisticsProvider( StatisticsProvider.NOOP ) // | |||
.build(); | |||
} | |||
else if ( IN_MEMORY_TYPE == storeType ) | |||
{ |
@@ -19,9 +19,7 @@ | |||
--> | |||
<configuration> | |||
<configuration status="debug"> | |||
<appenders> | |||
<Console name="console" target="SYSTEM_OUT"> |
@@ -78,7 +78,7 @@ | |||
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> | |||
<lucene.version>4.10.4</lucene.version> | |||
<jcr-oak.version>1.7.3</jcr-oak.version> | |||
<jcr-oak.version>1.7.5</jcr-oak.version> | |||
<jackrabbit.version>2.15.4</jackrabbit.version> | |||
<cxf.version>3.0.3</cxf.version> |