Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Switched fcrepo-dc to CDI
  • Loading branch information
ajs6f committed Feb 16, 2013
1 parent 1ace994 commit 5a05432
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 67 deletions.
12 changes: 10 additions & 2 deletions fcrepo-dc/pom.xml
Expand Up @@ -49,13 +49,21 @@
<artifactId>cxf-rt-rs-extension-providers</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-openwebbeans</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>

<!-- This dependency is for compile-time: it keeps this module independent
of any given choice of JAX-RS implementation. It must be _after_ the test
Expand Down
@@ -1,6 +1,8 @@

package org.fcrepo.generator;

import static org.ops4j.pax.exam.CoreOptions.junitBundles;

import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.concurrent.TimeUnit;
Expand All @@ -15,11 +17,13 @@
import org.apache.http.impl.conn.PoolingClientConnectionManager;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

@RunWith(SpringJUnit4ClassRunner.class)
@RunWith(PaxExam.class)
public abstract class AbstractResourceTest {

protected Logger logger;
Expand Down Expand Up @@ -74,4 +78,10 @@ protected int getStatus(HttpUriRequest method)
return client.execute(method).getStatusLine().getStatusCode();
}

@Configuration
public Option[] config() {
Option[] config = {junitBundles()};
return config;
}

}
Expand Up @@ -11,9 +11,7 @@
import org.apache.http.client.methods.HttpGet;
import org.apache.http.util.EntityUtils;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;

@ContextConfiguration({"/spring-test/generator.xml", "/spring-test/repo.xml"})
public class DublinCoreTest extends AbstractResourceTest {

@Test
Expand Down
37 changes: 0 additions & 37 deletions fcrepo-dc/src/test/resources/spring-test/generator.xml

This file was deleted.

24 changes: 0 additions & 24 deletions fcrepo-dc/src/test/resources/spring-test/repo.xml

This file was deleted.

0 comments on commit 5a05432

Please sign in to comment.