Commit 119869c0 authored by acoburn's avatar acoburn
Browse files

remove older pax-jdbc defn

parent 93e03c65
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</cm:default-properties> </cm:default-properties>
</cm:property-placeholder> </cm:property-placeholder>
<reference id="dataService" interface="javax.sql.DataSource" filter="(osgi.jndi.service.name=jdbc/idiomaticds)"/> <reference id="dataSource" interface="javax.sql.DataSource" filter="(osgi.jndi.service.name=jdbc/idiomaticds)"/>
<reference id="minterService" interface="java.util.function.Supplier" filter="(osgi.jndi.service.name=acrepo/Minter)"/> <reference id="minterService" interface="java.util.function.Supplier" filter="(osgi.jndi.service.name=acrepo/Minter)"/>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<!-- component-wide configuration of jdbc --> <!-- component-wide configuration of jdbc -->
<bean id="sql" class="org.apache.camel.component.sql.SqlComponent"> <bean id="sql" class="org.apache.camel.component.sql.SqlComponent">
<property name="dataSource" ref="dataService"/> <property name="dataSource" ref="dataSource"/>
</bean> </bean>
<camelContext xmlns="http://camel.apache.org/schema/blueprint"> <camelContext xmlns="http://camel.apache.org/schema/blueprint">
......
...@@ -73,16 +73,13 @@ public class AcrepoServicesIT extends AbstractOSGiIT { ...@@ -73,16 +73,13 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
configureConsole().ignoreLocalConsole(), configureConsole().ignoreLocalConsole(),
features(maven().groupId("org.apache.karaf.features").artifactId("standard") features(maven().groupId("org.apache.karaf.features").artifactId("standard")
.versionAsInProject().classifier("features").type("xml"), "scr"), .versionAsInProject().classifier("features").type("xml"), "scr"),
features(maven().groupId("org.ops4j.pax.jdbc").artifactId("pax-jdbc-features")
.type("xml").classifier("features"), "pax-jdbc-config",
"pax-jdbc-h2"),
features(maven().groupId("org.apache.camel.karaf").artifactId("apache-camel") features(maven().groupId("org.apache.camel.karaf").artifactId("apache-camel")
.type("xml").classifier("features").versionAsInProject(), "camel-blueprint"), .type("xml").classifier("features").versionAsInProject(), "camel-blueprint"),
features(maven().groupId("org.apache.activemq").artifactId("activemq-karaf") features(maven().groupId("org.apache.activemq").artifactId("activemq-karaf")
.type("xml").classifier("features").versionAsInProject(), "activemq-camel"), .type("xml").classifier("features").versionAsInProject(), "activemq-camel"),
features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf") features(maven().groupId("edu.amherst.acdc").artifactId("acrepo-karaf")
.type("xml").classifier("features").versionAsInProject(), .type("xml").classifier("features").versionAsInProject(),
"acrepo-connector-broadcast", "acrepo-connector-idiomatic", "acrepo-connector-broadcast",
"acrepo-exts-fits", "acrepo-exts-image", "acrepo-exts-jsonld", "acrepo-exts-pcdm", "acrepo-exts-fits", "acrepo-exts-image", "acrepo-exts-jsonld", "acrepo-exts-pcdm",
"acrepo-exts-serialize-xml", "acrepo-exts-template", "acrepo-exts-serialize-xml", "acrepo-exts-template",
...@@ -100,10 +97,6 @@ public class AcrepoServicesIT extends AbstractOSGiIT { ...@@ -100,10 +97,6 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
editConfigurationFilePut("etc/edu.amherst.acdc.exts.pcdm.cfg", "rest.port", pcdmPort), editConfigurationFilePut("etc/edu.amherst.acdc.exts.pcdm.cfg", "rest.port", pcdmPort),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.serialize.xml.cfg", "rest.port", metadataPort), editConfigurationFilePut("etc/edu.amherst.acdc.exts.serialize.xml.cfg", "rest.port", metadataPort),
editConfigurationFilePut("etc/edu.amherst.acdc.exts.template.cfg", "rest.port", templatePort), editConfigurationFilePut("etc/edu.amherst.acdc.exts.template.cfg", "rest.port", templatePort),
editConfigurationFilePut("etc/edu.amherst.acdc.connector.idiomatic.cfg", "rest.port", idiomaticPort),
editConfigurationFilePut("etc/org.ops4j.datasource-idiomatic.cfg", "osgi.jdbc.driver.name", "H2-pool-xa"),
editConfigurationFilePut("etc/org.ops4j.datasource-idiomatic.cfg", "url", "jdbc:h2:mem:idiomatic"),
editConfigurationFilePut("etc/org.ops4j.datasource-idiomatic.cfg", "dataSourceName", "idiomaticds"),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", rmiRegistryPort), editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort", rmiRegistryPort),
editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", rmiServerPort), editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort", rmiServerPort),
editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "sshPort", sshPort) editConfigurationFilePut("etc/org.apache.karaf.shell.cfg", "sshPort", sshPort)
...@@ -115,7 +108,6 @@ public class AcrepoServicesIT extends AbstractOSGiIT { ...@@ -115,7 +108,6 @@ public class AcrepoServicesIT extends AbstractOSGiIT {
assertTrue(featuresService.isInstalled(featuresService.getFeature("camel-core"))); assertTrue(featuresService.isInstalled(featuresService.getFeature("camel-core")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("fcrepo-camel"))); assertTrue(featuresService.isInstalled(featuresService.getFeature("fcrepo-camel")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-connector-broadcast"))); assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-connector-broadcast")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-connector-idiomatic")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-fits"))); assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-fits")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-image"))); assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-image")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-jsonld"))); assertTrue(featuresService.isInstalled(featuresService.getFeature("acrepo-exts-jsonld")));
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<repository>mvn:org.fcrepo.camel/fcrepo-camel/${fcrepo-camel.version}/xml/features</repository> <repository>mvn:org.fcrepo.camel/fcrepo-camel/${fcrepo-camel.version}/xml/features</repository>
<repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository> <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
<repository>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</repository> <repository>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</repository>
<repository>mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax-jdbc.version}/xml/features</repository>
<feature name="acrepo-connector-idiomatic" version="${project.version}"> <feature name="acrepo-connector-idiomatic" version="${project.version}">
<details>Installs the id mapping service</details> <details>Installs the id mapping service</details>
......
...@@ -34,8 +34,14 @@ import static org.osgi.framework.FrameworkUtil.createFilter; ...@@ -34,8 +34,14 @@ import static org.osgi.framework.FrameworkUtil.createFilter;
import static org.slf4j.LoggerFactory.getLogger; import static org.slf4j.LoggerFactory.getLogger;
import java.io.File; import java.io.File;
import java.util.function.Supplier;
import javax.inject.Inject; import javax.inject.Inject;
import edu.amherst.acdc.services.inference.InferenceService;
import edu.amherst.acdc.services.jsonld.JsonLdService;
import edu.amherst.acdc.services.pcdm.PcdmService;
import org.apache.camel.Component;
import org.apache.camel.CamelContext;
import org.apache.karaf.features.FeaturesService; import org.apache.karaf.features.FeaturesService;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -146,6 +152,13 @@ public class KarafIT { ...@@ -146,6 +152,13 @@ public class KarafIT {
assertTrue(featuresService.isInstalled(featuresService.getFeature("camel-jetty9"))); assertTrue(featuresService.isInstalled(featuresService.getFeature("camel-jetty9")));
assertNotNull(bundleContext); assertNotNull(bundleContext);
assertNotNull(getOsgiService(CamelContext.class, "(camel.context.name=AcrepoJsonLdService)", 10000));
assertNotNull(getOsgiService(Component.class, "(osgi.jndi.service.name=acrepo/Broker)", 10000));
assertNotNull(getOsgiService(InferenceService.class, "(osgi.jndi.service.name=acrepo/Inference)", 10000));
assertNotNull(getOsgiService(Supplier.class, "(osgi.jndi.service.name=acrepo/Minter)", 10000));
assertNotNull(getOsgiService(JsonLdService.class, "(osgi.jndi.service.name=acrepo/JsonLD)", 10000));
assertNotNull(getOsgiService(PcdmService.class, "(osgi.jndi.service.name=acrepo/Pcdm)", 10000));
assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.idiomatic-bundle")).getState()); assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.idiomatic-bundle")).getState());
assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.activemq-svc-bundle")).getState()); assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.activemq-svc-bundle")).getState());
assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.inference-svc-bundle")).getState()); assertEquals(ACTIVE, bundleContext.getBundle(System.getProperty("acdc.inference-svc-bundle")).getState());
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
<saxon.version>9.6.0-7</saxon.version> <saxon.version>9.6.0-7</saxon.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>
<spring.version>4.1.7.RELEASE</spring.version> <spring.version>4.1.7.RELEASE</spring.version>
<pax-jdbc.version>0.7.0</pax-jdbc.version>
<woodstox.version>4.4.1</woodstox.version> <woodstox.version>4.4.1</woodstox.version>
<xerces.version>2.11.0</xerces.version> <xerces.version>2.11.0</xerces.version>
<jena.version>3.1.0</jena.version> <jena.version>3.1.0</jena.version>
...@@ -90,7 +89,7 @@ ...@@ -90,7 +89,7 @@
<!-- test gear --> <!-- test gear -->
<fcrepo.version>4.5.1</fcrepo.version> <fcrepo.version>4.5.1</fcrepo.version>
<karaf.version>4.0.4</karaf.version> <karaf.version>4.0.5</karaf.version>
<pax-exam.version>4.9.1</pax-exam.version> <pax-exam.version>4.9.1</pax-exam.version>
<jena.fuseki.version>2.3.1</jena.fuseki.version> <jena.fuseki.version>2.3.1</jena.fuseki.version>
......
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