Browse Source

fixing test for rest services, correctly close jcr repo

Signed-off-by: olivier lamy <olamy@apache.org>
MRM-1958
olivier lamy 6 years ago
parent
commit
789f879c3b

+ 6
- 0
archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java View File

} }
}; };
} }

@Override
public void close()
{
// no op
}
} }

+ 2
- 1
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml View File

<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<reuseForks>false</reuseForks>
<includes> <includes>
<include>**/*Tests.java</include> <include>**/*Tests.java</include>
<include>**/*Test.java</include> <include>**/*Test.java</include>
</includes> </includes>
<argLine>-Xms1024m -Xmx2048m -server -XX:MaxPermSize=256m @{jacocoproperty}</argLine>
<argLine>-Xms1024m -Xmx3072m -server -XX:MaxPermSize=256m @{jacocoproperty}</argLine>
<systemPropertyVariables> <systemPropertyVariables>
<appserver.base>${project.build.directory}/appserver-base</appserver.base> <appserver.base>${project.build.directory}/appserver-base</appserver.base>
<plexus.home>${project.build.directory}/appserver-base</plexus.home> <plexus.home>${project.build.directory}/appserver-base</plexus.home>

+ 3
- 0
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java View File

import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.client.WebClient;
import org.junit.After;
import org.junit.Assume; import org.junit.Assume;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;


// END SNIPPET: authz-header // END SNIPPET: authz-header



@BeforeClass @BeforeClass
public static void chekRepo() public static void chekRepo()
{ {
super.startServer(); super.startServer();
} }



private void removeAppsubFolder( File appServerBase, String folder ) private void removeAppsubFolder( File appServerBase, String folder )
throws Exception throws Exception
{ {

+ 6
- 0
archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/webtest/memory/TestRepositorySessionFactory.java View File

{ {
return this; return this;
} }

@Override
public void close()
{
// no op
}
} }

+ 2
- 0
archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactory.java View File

public interface RepositorySessionFactory public interface RepositorySessionFactory
{ {
RepositorySession createSession(); RepositorySession createSession();

void close();
} }

+ 6
- 0
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java View File

return new RepositorySession( metadataRepository, metadataResolver ); return new RepositorySession( metadataRepository, metadataResolver );
} }



@Override
public void close()
{
cassandraArchivaManager.shutdown();
}
} }

+ 6
- 9
archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java View File

public class FileRepositorySessionFactory public class FileRepositorySessionFactory
implements RepositorySessionFactory implements RepositorySessionFactory
{ {
/**
*
*/
private Map<String, MetadataFacetFactory> metadataFacetFactories; private Map<String, MetadataFacetFactory> metadataFacetFactories;


/**
*
*/
@Inject @Inject
@Named( value = "archivaConfiguration#default" ) @Named( value = "archivaConfiguration#default" )
private ArchivaConfiguration configuration; private ArchivaConfiguration configuration;


/**
*
*/
@Inject @Inject
private MetadataResolver metadataResolver; private MetadataResolver metadataResolver;




return new RepositorySession( metadataRepository, metadataResolver ); return new RepositorySession( metadataRepository, metadataResolver );
} }

@Override
public void close()
{
// no op
}
} }

+ 5
- 1
archiva-modules/plugins/metadata-store-jcr/pom.xml View File

<artifactId>lucene-analyzers-common</artifactId> <artifactId>lucene-analyzers-common</artifactId>
<version>${lucene.version}</version> <version>${lucene.version}</version>
</dependency> </dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.1.0</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<testResources> <testResources>

+ 6
- 2
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java View File



private FileStore fileStore; private FileStore fileStore;


private NodeStore nodeStore;

private ExecutorService executorService; private ExecutorService executorService;


public enum StoreType public enum StoreType
throws IOException, InvalidFileStoreVersionException throws IOException, InvalidFileStoreVersionException
{ {
createExecutor(); createExecutor();
NodeStore nodeStore;
if ( SEGMENT_FILE_TYPE == storeType ) if ( SEGMENT_FILE_TYPE == storeType )
{ {
fileStore = FileStoreBuilder.fileStoreBuilder( repositoryPath.toFile() ).build(); 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 ) else if ( IN_MEMORY_TYPE == storeType )
{ {

+ 1
- 3
archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml View File

--> -->




<configuration>


<configuration status="debug">


<appenders> <appenders>
<Console name="console" target="SYSTEM_OUT"> <Console name="console" target="SYSTEM_OUT">

+ 1
- 1
pom.xml View File

<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<lucene.version>4.10.4</lucene.version> <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> <jackrabbit.version>2.15.4</jackrabbit.version>


<cxf.version>3.0.3</cxf.version> <cxf.version>3.0.3</cxf.version>

Loading…
Cancel
Save