Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
changed webapp, generators-rdf and webhooks to jersey impl and switch…
…ed integration tests to use grizzly
- Loading branch information
Showing
31 changed files
with
189 additions
and
386 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 34 additions & 46 deletions
80
fcrepo-generator-rdf/src/test/resources/spring-test/generator.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,52 +1,40 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<beans xmlns="http://www.springframework.org/schema/beans" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xmlns:context="http://www.springframework.org/schema/context" | ||
xmlns:jaxrs="http://cxf.apache.org/jaxrs" | ||
xmlns:util="http://www.springframework.org/schema/util" | ||
xsi:schemaLocation=" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" | ||
xmlns:util="http://www.springframework.org/schema/util" | ||
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://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd | ||
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> | ||
|
||
<import resource="classpath:META-INF/cxf/cxf.xml"/> | ||
|
||
<context:property-placeholder/> | ||
|
||
<context:annotation-config/> | ||
|
||
<bean class="org.fcrepo.session.SessionFactory" /> | ||
|
||
<jaxrs:server address="http://localhost:${test.port:8080}/rest"> | ||
<jaxrs:serviceBeans> | ||
<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> | ||
<bean class="org.fcrepo.api.FedoraObjects"/> | ||
<bean class="org.fcrepo.api.FedoraDatastreams"/> | ||
</jaxrs:serviceBeans> | ||
<jaxrs:providers> | ||
<bean class="org.fcrepo.exceptionhandlers.PathNotFoundExceptionMapper"/> | ||
<bean class="org.fcrepo.exceptionhandlers.AccessControlExceptionMapper"/> | ||
<bean class="org.fcrepo.exceptionhandlers.WildcardExceptionMapper"> | ||
<property name="showStackTrace" value="true"/> | ||
</bean> | ||
</jaxrs:providers> | ||
</jaxrs:server> | ||
|
||
<!-- Mints PIDs--> | ||
<bean class="org.fcrepo.identifiers.UUIDPidMinter"/> | ||
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"> | ||
|
||
<context:property-placeholder /> | ||
|
||
<context:annotation-config /> | ||
|
||
<bean class="org.fcrepo.generator.ObjectRdfGenerator"> | ||
<property name="objectGenerators"> | ||
<list value-type="org.fcrepo.generator.rdf.TripleSource"> | ||
<bean id="objectRdf" class="org.fcrepo.generator.rdf.DefaultFedoraObjectGenerator" /> | ||
</list> | ||
</property> | ||
</bean> | ||
|
||
<bean class="org.fcrepo.generator.DatastreamRdfGenerator"> | ||
<property name="dsGenerators"> | ||
<list> | ||
<bean id="datastreamRdf" class="org.fcrepo.generator.rdf.DefaultDatastreamGenerator" /> | ||
</list> | ||
</property> | ||
</bean> | ||
|
||
|
||
|
||
<bean class="org.fcrepo.session.SessionFactory" /> | ||
|
||
<!-- Mints PIDs --> | ||
<bean class="org.fcrepo.identifiers.UUIDPidMinter" /> | ||
|
||
|
||
<context:component-scan base-package="org.fcrepo.api, org.fcrepo.exceptionhandlers" /> | ||
|
||
</beans> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.