Commit 832a143c authored by acoburn's avatar acoburn
Browse files

rename classes

parent e22745bc
...@@ -18,11 +18,11 @@ package edu.amherst.acdc.connector.broadcast; ...@@ -18,11 +18,11 @@ package edu.amherst.acdc.connector.broadcast;
import org.apache.camel.builder.RouteBuilder; import org.apache.camel.builder.RouteBuilder;
/** /**
* A content router for handling JMS events. * A broadcasting router for repository messages.
* *
* @author Aaron Coburn * @author Aaron Coburn
*/ */
public class EventRouter extends RouteBuilder { public class BroadcastRouter extends RouteBuilder {
/** /**
* Configure the message route workflow. * Configure the message route workflow.
......
...@@ -29,11 +29,11 @@ import org.apache.camel.builder.RouteBuilder; ...@@ -29,11 +29,11 @@ import org.apache.camel.builder.RouteBuilder;
import org.fcrepo.camel.processor.EventProcessor; import org.fcrepo.camel.processor.EventProcessor;
/** /**
* A content router for handling JMS events. * A message router for handling ID mappings.
* *
* @author Aaron Coburn * @author Aaron Coburn
*/ */
public class EventRouter extends RouteBuilder { public class IdRouter extends RouteBuilder {
/** /**
* Configure the message route workflow. * Configure the message route workflow.
......
...@@ -39,7 +39,7 @@ import org.slf4j.Logger; ...@@ -39,7 +39,7 @@ import org.slf4j.Logger;
* *
* @author Aaron Coburn * @author Aaron Coburn
*/ */
public class EventRouter extends RouteBuilder { public class ImageRouter extends RouteBuilder {
private static final String FEDORA_BASE_URL = "CamelFedoraBaseUrl"; private static final String FEDORA_BASE_URL = "CamelFedoraBaseUrl";
private static final String FEDORA_URI = "CamelFedoraUri"; private static final String FEDORA_URI = "CamelFedoraUri";
...@@ -49,7 +49,7 @@ public class EventRouter extends RouteBuilder { ...@@ -49,7 +49,7 @@ public class EventRouter extends RouteBuilder {
private static final String HTTP_QUERY_OPTIONS = "options"; private static final String HTTP_QUERY_OPTIONS = "options";
private static final String HTTP_QUERY_CONTEXT = "context"; private static final String HTTP_QUERY_CONTEXT = "context";
private static final Logger LOGGER = getLogger(EventRouter.class); private static final Logger LOGGER = getLogger(ImageRouter.class);
/** /**
* Configure the message route workflow. * Configure the message route workflow.
......
...@@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder; ...@@ -28,7 +28,7 @@ import org.apache.camel.builder.RouteBuilder;
/** /**
* @author Aaron Coburn * @author Aaron Coburn
*/ */
public class EventRouter extends RouteBuilder { public class XmlSerializationRouter extends RouteBuilder {
private static final String HTTP_QUERY_CONTEXT = "context"; private static final String HTTP_QUERY_CONTEXT = "context";
private static final String FORMAT = "format"; private static final String FORMAT = "format";
......
...@@ -34,13 +34,13 @@ import org.slf4j.Logger; ...@@ -34,13 +34,13 @@ import org.slf4j.Logger;
/** /**
* @author Aaron Coburn * @author Aaron Coburn
*/ */
public class EventRouter extends RouteBuilder { public class TemplateRouter extends RouteBuilder {
private static final String FEDORA_URI = "CamelFedoraUri"; private static final String FEDORA_URI = "CamelFedoraUri";
private static final String FEDORA_BASE_URL = "CamelFedoraBaseUrl"; private static final String FEDORA_BASE_URL = "CamelFedoraBaseUrl";
private static final String HTTP_QUERY_CONTEXT = "context"; private static final String HTTP_QUERY_CONTEXT = "context";
private static final Logger LOGGER = getLogger(EventRouter.class); private static final Logger LOGGER = getLogger(TemplateRouter.class);
/** /**
* Configure the message route workflow. * Configure the message route workflow.
......
...@@ -55,7 +55,7 @@ public abstract class AbstractOSGiIT { ...@@ -55,7 +55,7 @@ public abstract class AbstractOSGiIT {
private static final Logger LOGGER = getLogger(AbstractOSGiIT.class); private static final Logger LOGGER = getLogger(AbstractOSGiIT.class);
private final CloseableHttpClient httpclient = createDefault(); protected final CloseableHttpClient httpclient = createDefault();
@Inject @Inject
protected FeaturesService featuresService; protected FeaturesService featuresService;
......
...@@ -16,8 +16,10 @@ ...@@ -16,8 +16,10 @@
package edu.amherst.acdc.itests; package edu.amherst.acdc.itests;
import static java.util.stream.IntStream.range; import static java.util.stream.IntStream.range;
import static org.apache.http.HttpStatus.SC_OK;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
import static org.ops4j.pax.exam.CoreOptions.maven; import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.systemProperty; import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole; import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
...@@ -31,6 +33,8 @@ import static org.slf4j.LoggerFactory.getLogger; ...@@ -31,6 +33,8 @@ import static org.slf4j.LoggerFactory.getLogger;
import java.io.File; import java.io.File;
import org.apache.camel.CamelContext; import org.apache.camel.CamelContext;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.marmotta.ldcache.api.LDCachingBackend; import org.apache.marmotta.ldcache.api.LDCachingBackend;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -116,7 +120,10 @@ public class AcrepoTemplateIT extends AbstractOSGiIT { ...@@ -116,7 +120,10 @@ public class AcrepoTemplateIT extends AbstractOSGiIT {
final String baseUrl = "http://localhost:" + System.getProperty("fcrepo.port") + "/fcrepo/rest"; final String baseUrl = "http://localhost:" + System.getProperty("fcrepo.port") + "/fcrepo/rest";
final String baseSvcUrl = "http://localhost:" + System.getProperty("karaf.template.port") + "/template"; final String baseSvcUrl = "http://localhost:" + System.getProperty("karaf.template.port") + "/template";
assertTrue(options(baseSvcUrl).contains("apix:bindsTo fedora:Resource")); assertTrue(options(baseSvcUrl).contains("apix:bindsTo ldp:Resource"));
final HttpResponse res = httpclient.execute(new HttpGet(baseSvcUrl + "?context=" + baseUrl));
assumeTrue(SC_OK == res.getStatusLine().getStatusCode());
range(1, 2).mapToObj(x -> post(baseUrl)).forEach(url -> { range(1, 2).mapToObj(x -> post(baseUrl)).forEach(url -> {
patch(url, "PREFIX dcterms: <http://purl.org/dc/terms/>\n" + patch(url, "PREFIX dcterms: <http://purl.org/dc/terms/>\n" +
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment