Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Corrected Spring XML for HTTP API in fcrepo-webapp
  • Loading branch information
ajs6f committed Mar 11, 2013
1 parent 697f3f0 commit 0df841b
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 14 deletions.
Expand Up @@ -15,11 +15,7 @@
<context:property-placeholder/>

<context:annotation-config/>

<util:list id="objectGenerators" value-type="org.fcrepo.generator.rdf.TripleSource">
<bean class="org.fcrepo.generator.rdf.DefaultFedoraObjectGenerator"/>
</util:list>


<jaxrs:server address="http://localhost:${test.port:8080}/rest">
<jaxrs:serviceBeans>
<bean class="org.fcrepo.generator.ObjectRdfGenerator">
Expand Down
7 changes: 0 additions & 7 deletions fcrepo-webapp/src/main/resources/spring/generator.xml
Expand Up @@ -34,11 +34,4 @@
<bean class="org.fcrepo.generator.dublincore.JcrPropertiesGenerator"/>
</util:list>


<util:list id="rdfgenerators" value-type="org.fcrepo.generator.rdf.TripleGenerator">
<bean class="org.fcrepo.generator.rdf.JcrPropertiesGenerator" />
</util:list>



</beans>
15 changes: 14 additions & 1 deletion fcrepo-webapp/src/main/resources/spring/rest.xml
Expand Up @@ -50,7 +50,20 @@
<bean class="org.fcrepo.api.FedoraNamespaces"/>
<bean class="org.fcrepo.api.FedoraObjects"/>
<bean class="org.fcrepo.generator.DublinCoreGenerator"/>
<bean class="org.fcrepo.generator.RdfGenerator"/>
<bean class="org.fcrepo.generator.ObjectRdfGenerator">
<property name="objectGenerators">
<list>
<bean class="org.fcrepo.generator.rdf.DefaultFedoraObjectGenerator"/>
</list>
</property>
</bean>
<bean class="org.fcrepo.generator.DatastreamRdfGenerator">
<property name="dsGenerators">
<list>
<bean class="org.fcrepo.generator.rdf.DefaultDatastreamGenerator"/>
</list>
</property>
</bean>
</jaxrs:serviceBeans>
<jaxrs:extensionMappings>
<entry key="json" value="application/json"/>
Expand Down
15 changes: 14 additions & 1 deletion fcrepo-webapp/src/test/resources/spring-test/rest.xml
Expand Up @@ -30,7 +30,20 @@
<bean class="org.fcrepo.api.legacy.FedoraNamespaces"/>
<bean class="org.fcrepo.api.legacy.FedoraObjects"/>
<bean class="org.fcrepo.generator.DublinCoreGenerator" />
<bean class="org.fcrepo.generator.RdfGenerator" />
<bean class="org.fcrepo.generator.ObjectRdfGenerator">
<property name="objectGenerators">
<list>
<bean class="org.fcrepo.generator.rdf.DefaultFedoraObjectGenerator"/>
</list>
</property>
</bean>
<bean class="org.fcrepo.generator.DatastreamRdfGenerator">
<property name="dsGenerators">
<list>
<bean class="org.fcrepo.generator.rdf.DefaultDatastreamGenerator"/>
</list>
</property>
</bean>
</jaxrs:serviceBeans>
<jaxrs:extensionMappings>
<entry key="json" value="application/json"/>
Expand Down

0 comments on commit 0df841b

Please sign in to comment.