Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updating to use package-scanned *Service beans
  • Loading branch information
ajs6f committed Jun 24, 2013
1 parent 84204ae commit bd1a9d4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 21 deletions.
8 changes: 1 addition & 7 deletions src/test/resources/spring-test/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.LowLevelStorageService"/>
<bean class="org.fcrepo.services.DatastreamService"/>
<bean class="org.fcrepo.services.NodeService"/>
<bean class="org.fcrepo.binary.PolicyDecisionPoint" />
<!-- mints JCR Sessions -->
<bean class="org.fcrepo.session.SessionFactory" id="org.fcrepo.session.SessionFactory" />


</beans>
20 changes: 6 additions & 14 deletions src/test/resources/spring-test/rest.xml
Expand Up @@ -6,22 +6,14 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">

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

<context:annotation-config/>

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

<!-- Mints PIDs-->
<bean class="org.fcrepo.identifiers.UUIDPidMinter"/>

<!-- used by (de)serialization endpoints -->
<util:map id="serializers" key-type="java.lang.String" map-class="java.util.HashMap"
value-type="org.fcrepo.serialization.FedoraObjectSerializer">
<description>Map from formats to serializers for Fedora objects</description>
<entry key="jcr/xml">
<bean class="org.fcrepo.serialization.jcrxml.JcrXmlSerializer"/>
</entry>
</util:map>

<context:annotation-config/>

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

0 comments on commit bd1a9d4

Please sign in to comment.