Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
use component scanning for discovering required services
  • Loading branch information
cbeer committed Jun 12, 2013
1 parent b01b335 commit 2514d1b
Show file tree
Hide file tree
Showing 22 changed files with 37 additions and 63 deletions.
Expand Up @@ -10,7 +10,7 @@

<context:annotation-config />

<context:component-scan base-package="org.fcrepo.generator, org.fcrepo.api, org.fcrepo.exceptionhandlers"/>
<context:component-scan base-package="org.fcrepo.services, org.fcrepo.generator, org.fcrepo.api, org.fcrepo.exceptionhandlers"/>

<bean class="org.fcrepo.session.SessionFactory" />

Expand Down
5 changes: 0 additions & 5 deletions fcrepo-generator-dc/src/test/resources/spring-test/repo.xml
Expand Up @@ -19,11 +19,6 @@


<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>

<bean class="org.fcrepo.services.ObjectService"/>
<bean class="org.fcrepo.services.LowLevelStorageService"/>
<bean class="org.fcrepo.services.NodeService"/>
<bean class="org.fcrepo.services.DatastreamService"/>
<bean class="org.fcrepo.binary.PolicyDecisionPoint" />

</beans>
5 changes: 0 additions & 5 deletions fcrepo-http-api/src/test/resources/spring-test/repo.xml
Expand Up @@ -16,11 +16,6 @@
</bean>

<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>

<bean class="org.fcrepo.services.ObjectService"/>
<bean class="org.fcrepo.services.LowLevelStorageService"/>
<bean class="org.fcrepo.services.DatastreamService"/>
<bean class="org.fcrepo.services.NodeService"/>
<bean class="org.fcrepo.binary.PolicyDecisionPoint" />

</beans>
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/test/resources/spring-test/rest.xml
Expand Up @@ -14,7 +14,7 @@
<context:annotation-config/>

<context:component-scan
base-package="org.fcrepo.api, org.fcrepo.serialization, org.fcrepo.responses, org.fcrepo.exceptionhandlers, org.fcrepo.url"/>
base-package="org.fcrepo.services, org.fcrepo.api, org.fcrepo.serialization, org.fcrepo.responses, org.fcrepo.exceptionhandlers, org.fcrepo.url"/>

<util:map id="serializers" key-type="java.lang.String" map-class="java.util.HashMap"
value-type="org.fcrepo.serialization.FedoraObjectSerializer">
Expand Down
Expand Up @@ -45,13 +45,15 @@
import org.modeshape.jcr.api.JcrConstants;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

/**
* Service for creating and retrieving Datastreams without using the JCR API.
*
* @author cbeer
* @date Feb 11, 2013
*/
@Component
public class DatastreamService extends RepositoryService {

@Autowired(required = false)
Expand Down
Expand Up @@ -45,12 +45,14 @@

import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
import org.springframework.stereotype.Component;

/**
* @todo Add Documentation.
* Service for managing access to low-level binary blobs (which may include redundant copies, etc)
* @author Chris Beer
* @date Mar 11, 2013
*/
@Component
public class LowLevelStorageService {

private static final Logger logger =
Expand Down
Expand Up @@ -23,12 +23,14 @@
import org.slf4j.Logger;

import com.google.common.collect.ImmutableSet;
import org.springframework.stereotype.Component;

/**
* @todo Add Documentation.
* Service for managing access to Fedora 'nodes' (either datastreams or objects, we don't care.)
* @author Chris Beer
* @date May 9, 2013
*/
@Component
public class NodeService extends RepositoryService implements FedoraJcrTypes {

private static final Logger logger = getLogger(NodeService.class);
Expand Down
Expand Up @@ -17,13 +17,15 @@
import org.fcrepo.utils.FedoraJcrTypes;
import org.modeshape.jcr.api.JcrConstants;
import org.slf4j.Logger;
import org.springframework.stereotype.Component;

/**
* Service for creating and retrieving FedoraObjects without using the JCR API.
*
* @author cbeer
* @date Feb 11, 2013
*/
@Component
public class ObjectService extends RepositoryService implements FedoraJcrTypes {

private static final Logger logger = getLogger(ObjectService.class);
Expand Down
Expand Up @@ -44,12 +44,14 @@
import com.google.common.collect.Iterators;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
import org.springframework.stereotype.Component;

/**
* @todo Add Documentation.
* Repository-global helper methods
* @author Chris Beer
* @date Mar 11, 2013
*/
@Component
public class RepositoryService extends JcrTools implements FedoraJcrTypes {

private static final Logger logger = getLogger(RepositoryService.class);
Expand Down
Expand Up @@ -29,12 +29,14 @@
import org.modeshape.jcr.value.binary.infinispan.InfinispanBinaryStore;

import com.google.common.base.Function;
import org.springframework.stereotype.Component;

/**
* @todo Add Documentation.
* @author barmintor
* @date Mar 23, 2013
*/
@Component
public abstract class ServiceHelpers {

/**
Expand Down
10 changes: 5 additions & 5 deletions fcrepo-kernel/src/test/resources/spring-test/repo.xml
Expand Up @@ -18,11 +18,11 @@
<property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:/config/testing/repository.json}"/>
</bean>

<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
<bean class="org.fcrepo.services.NodeService"/>
<bean class="org.fcrepo.services.ObjectService"/>
<bean class="org.fcrepo.services.DatastreamService"/>
<bean class="org.fcrepo.services.LowLevelStorageService"/>
<context:component-scan
base-package="org.fcrepo.services"/>


<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
<bean class="org.fcrepo.binary.PolicyDecisionPoint" />

</beans>
Expand Up @@ -20,7 +20,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;

@ContextConfiguration({"/spring-test/repo.xml", "/spring-test/test-container.xml"})
@ContextConfiguration({"/spring-test/repo.xml", "/spring-test/eventing.xml", "/spring-test/test-container.xml"})
public class RSSIT extends AbstractResourceIT {

final private Logger logger = LoggerFactory.getLogger(RSSIT.class);
Expand Down
11 changes: 6 additions & 5 deletions fcrepo-rss/src/test/resources/spring-test/repo.xml
Expand Up @@ -15,12 +15,13 @@
<property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:config/testing/repository.json}"/>
</bean>

<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>

<bean class="org.fcrepo.services.ObjectService"/>
<bean class="org.fcrepo.services.LowLevelStorageService"/>
<bean class="org.fcrepo.services.DatastreamService"/>
<bean class="org.fcrepo.services.NodeService"/>
<context:component-scan base-package="org.fcrepo.services, org.fcrepo.syndication"/>

<bean class="org.fcrepo.session.SessionFactory" />
<bean class="org.fcrepo.identifiers.UUIDPidMinter"/>

<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
<bean class="org.fcrepo.binary.PolicyDecisionPoint" />

</beans>
18 changes: 0 additions & 18 deletions fcrepo-rss/src/test/resources/spring-test/rest.xml

This file was deleted.

2 changes: 1 addition & 1 deletion fcrepo-rss/src/test/resources/web.xml
Expand Up @@ -9,7 +9,7 @@

<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath:spring-test/repo.xml, classpath:spring-test/rest.xml, classpath:spring-test/eventing.xml</param-value>
<param-value>classpath:spring-test/repo.xml, classpath:spring-test/eventing.xml</param-value>
</context-param>


Expand Down
Expand Up @@ -10,11 +10,13 @@
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.springframework.stereotype.Component;

import static org.slf4j.LoggerFactory.getLogger;

/**
* @todo Add Documentation.
* Service that evaluates a set of storage policies for an object and provides storage hints
* for a binary stream
* @author cbeer
* @date Apr 25, 2013
*/
Expand Down
Expand Up @@ -17,8 +17,6 @@

<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>

<bean class="org.fcrepo.services.ObjectService"/>
<bean class="org.fcrepo.services.LowLevelStorageService"/>
<bean class="org.fcrepo.services.DatastreamService"/>
<context:component-scan base-package="org.fcrepo.services"/>

</beans>
6 changes: 0 additions & 6 deletions fcrepo-webapp/src/main/resources/spring/repo.xml
Expand Up @@ -17,12 +17,6 @@

<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>

<bean class="org.fcrepo.services.ObjectService"/>
<bean class="org.fcrepo.services.DatastreamService"/>
<bean class="org.fcrepo.services.LowLevelStorageService"/>
<bean class="org.fcrepo.services.NodeService"/>

<!-- For the time being, load annotation config here too -->
<bean class="org.fcrepo.metrics.MetricsConfig"/>

</beans>
2 changes: 1 addition & 1 deletion fcrepo-webapp/src/main/resources/spring/rest.xml
Expand Up @@ -17,7 +17,7 @@
<bean class="org.fcrepo.identifiers.UUIDPidMinter"/>
<bean class="org.fcrepo.session.SessionFactory"/>

<context:component-scan base-package="org.modeshape.web.jcr.rest, org.fcrepo.api, org.fcrepo.serialization, org.fcrepo.responses, org.fcrepo.exceptionhandlers, org.fcrepo.audit, org.fcrepo.url"/>
<context:component-scan base-package="org.fcrepo.services, org.modeshape.web.jcr.rest, org.fcrepo.api, org.fcrepo.serialization, org.fcrepo.responses, org.fcrepo.exceptionhandlers, org.fcrepo.audit, org.fcrepo.url"/>

<util:map id="serializers" key-type="java.lang.String" map-class="java.util.HashMap"
value-type="org.fcrepo.serialization.FedoraObjectSerializer">
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-webapp/src/test/resources/spring-test/rest.xml
Expand Up @@ -20,6 +20,6 @@

<context:annotation-config />

<context:component-scan base-package="org.fcrepo.api.legacy,org.fcrepo.generators,org.fcrepo.exceptionhandlers, org.fcrepo.responses"/>
<context:component-scan base-package="org.fcrepo.services, org.fcrepo.generators,org.fcrepo.exceptionhandlers, org.fcrepo.responses"/>

</beans>
5 changes: 0 additions & 5 deletions fcrepo-webhooks/src/test/resources/spring-test/repo.xml
Expand Up @@ -17,11 +17,6 @@
</bean>

<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>

<bean class="org.fcrepo.services.ObjectService" />
<bean class="org.fcrepo.services.DatastreamService"/>
<bean class="org.fcrepo.services.LowLevelStorageService"/>
<bean class="org.fcrepo.services.NodeService"/>
<bean class="org.fcrepo.binary.PolicyDecisionPoint" />

</beans>
2 changes: 1 addition & 1 deletion fcrepo-webhooks/src/test/resources/spring-test/rest.xml
Expand Up @@ -15,7 +15,7 @@

<context:annotation-config/>

<context:component-scan base-package="org.fcrepo.api, org.fcrepo.webhooks, org.fcrepo.integration.webhooks, org.fcrepo.exceptionhandlers"/>
<context:component-scan base-package="org.fcrepo.services, org.fcrepo.api, org.fcrepo.webhooks, org.fcrepo.integration.webhooks, org.fcrepo.exceptionhandlers"/>

<bean class="org.fcrepo.session.SessionFactory" />

Expand Down

0 comments on commit 2514d1b

Please sign in to comment.