Permalink
Browse files

Intermediate commit

  • Loading branch information...
ajs6f committed Nov 21, 2013
1 parent 3937171 commit a8f930f6e815ecc799afc297facc6b364cfb41d4
Showing with 116 additions and 1,331 deletions.
  1. +8 −11 fcrepo-auth-common/src/test/resources/spring-test/mocked-pep-repo.xml
  2. +6 −7 fcrepo-auth-common/src/test/resources/spring-test/repo.xml
  3. +1 −1 fcrepo-auth-common/src/test/resources/spring-test/rest.xml
  4. +8 −7 fcrepo-auth-common/src/test/resources/spring-test/test-container.xml
  5. +3 −4 fcrepo-auth-oauth/src/test/resources/spring-test/repo.xml
  6. +15 −16 fcrepo-auth-oauth/src/test/resources/spring-test/security.xml
  7. +4 −4 fcrepo-auth-oauth/src/test/resources/spring-test/test-container.xml
  8. +1 −0 fcrepo-auth-oauth/src/test/resources/spring-test/transactions.xml
  9. +0 −20 fcrepo-generator-dc/src/main/resources/META-INF/spring/generator.xml
  10. +3 −3 fcrepo-generator-dc/src/test/resources/spring-test/generator.xml
  11. +11 −12 fcrepo-generator-dc/src/test/resources/spring-test/repo.xml
  12. +6 −7 fcrepo-generator-dc/src/test/resources/spring-test/test-container.xml
  13. +0 −19 fcrepo-http-api/src/main/resources/META-INF/spring/rest.xml
  14. +0 −20 fcrepo-http-api/src/main/resources/logback.xml
  15. +0 −4 fcrepo-http-api/src/main/resources/velocity.properties
  16. +0 −13 fcrepo-http-api/src/main/resources/views/common-breadcrumb.vsl
  17. +0 −10 fcrepo-http-api/src/main/resources/views/common-head.vsl
  18. +0 −48 fcrepo-http-api/src/main/resources/views/common-header.vsl
  19. +0 −19 fcrepo-http-api/src/main/resources/views/common-metadata.vsl
  20. +0 −140 fcrepo-http-api/src/main/resources/views/common-node-actions.vsl
  21. +0 −8 fcrepo-http-api/src/main/resources/views/common-node-header.vsl
  22. +0 −59 fcrepo-http-api/src/main/resources/views/common.css
  23. +0 −228 fcrepo-http-api/src/main/resources/views/common.js
  24. +0 −42 fcrepo-http-api/src/main/resources/views/common.vsl
  25. +0 −65 fcrepo-http-api/src/main/resources/views/jcr-namespaces.vsl
  26. +0 −91 fcrepo-http-api/src/main/resources/views/jcr-nodetypes.vsl
  27. +0 −31 fcrepo-http-api/src/main/resources/views/jcr-workspaces.vsl
  28. +0 −76 fcrepo-http-api/src/main/resources/views/mode-root.vsl
  29. +0 −77 fcrepo-http-api/src/main/resources/views/node.vsl
  30. +0 −90 fcrepo-http-api/src/main/resources/views/nt-file.vsl
  31. +0 −76 fcrepo-http-api/src/main/resources/views/nt-resource.vsl
  32. +0 −47 fcrepo-http-api/src/main/resources/views/search-results.vsl
  33. 0 fcrepo-http-api/src/main/resources/views/sitemap-html.xsl
  34. +4 −4 fcrepo-http-api/src/test/resources/spring-test/repo.xml
  35. +8 −6 fcrepo-http-api/src/test/resources/spring-test/test-container.xml
  36. +0 −26 fcrepo-jms/src/main/resources/spring/jms.xml
  37. +6 −6 fcrepo-jms/src/test/resources/spring-test/jms.xml
  38. +3 −4 fcrepo-jms/src/test/resources/spring-test/repo.xml
  39. +12 −14 fcrepo-kernel/src/test/resources/spring-test/repo.xml
  40. +6 −6 fcrepo-rss/src/test/resources/spring-test/repo.xml
  41. +11 −10 fcrepo-rss/src/test/resources/spring-test/test-container.xml
@@ -1,6 +1,8 @@
<?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:p="http://www.springframework.org/schema/p"
xmlns:c="http://www.springframework.org/schema/c"
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">
@@ -12,18 +14,13 @@
<context:component-scan base-package="org.fcrepo.kernel.services" />
<bean name="modeshapeRepofactory" class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean"
depends-on="authenticationProvider">
<property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:repository.json}" />
</bean>
<bean name="pep" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.fcrepo.auth.FedoraPolicyEnforcementPoint" />
</bean>
<bean name="authenticationProvider" class="org.fcrepo.auth.ServletContainerAuthenticationProvider">
<property name="pep" ref="pep"/>
</bean>
depends-on="authenticationProvider" p:repositoryConfiguration="${fcrepo.modeshape.configuration:repository.json}"/>
<bean name="pep" class="org.mockito.Mockito" factory-method="mock" c:classToMock="org.fcrepo.auth.FedoraPolicyEnforcementPoint"/>
<bean name="authenticationProvider" class="org.fcrepo.auth.ServletContainerAuthenticationProvider"
p:pep-ref="pep"/>
<bean class="org.modeshape.jcr.JcrRepositoryFactory" />
</beans>
@@ -1,6 +1,7 @@
<?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:p="http://www.springframework.org/schema/p"
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">
@@ -12,15 +13,13 @@
<context:component-scan base-package="org.fcrepo.kernel.services" />
<bean name="modeshapeRepofactory" class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean"
depends-on="authenticationProvider">
<property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:repository.json}" />
</bean>
depends-on="authenticationProvider" p:repositoryConfiguration="${fcrepo.modeshape.configuration:repository.json}"/>
<bean name="pep" class="org.fcrepo.auth.integration.PermitRootAndPathEndsWithPermitSuffixPEP"/>
<bean name="authenticationProvider" class="org.fcrepo.auth.ServletContainerAuthenticationProvider">
<property name="pep" ref="pep"/>
</bean>
<bean name="authenticationProvider" class="org.fcrepo.auth.ServletContainerAuthenticationProvider"
p:pep-ref="pep"/>
<bean class="org.modeshape.jcr.JcrRepositoryFactory" />
@@ -10,5 +10,5 @@
<!-- Mints PIDs-->
<bean class="org.fcrepo.kernel.identifiers.UUIDPidMinter"/>
<context:component-scan base-package="org.fcrepo.http, org.fcrepo.kernel.services, org.fcrepo.serialization" />
<context:component-scan base-package="org.fcrepo.http, org.fcrepo.kernel.services, org.fcrepo.serialization" />
</beans>
@@ -2,19 +2,20 @@
<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:p="http://www.springframework.org/schema/p"
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">
<context:property-placeholder/>
<!-- show stack traces for easier debugging -->
<!-- <bean id="wildcardExceptionmapper" class="org.fcrepo.http.commons.exceptionhandlers.WildcardExceptionMapper" >
<!-- <bean id="wildcardExceptionmapper" class="org.fcrepo.http.commons.exceptionhandlers.WildcardExceptionMapper" >
<property name="showStackTrace" value="true" />
</bean> -->
<bean id="containerWrapper" class="org.fcrepo.http.commons.test.util.ContainerWrapper" init-method="start" destroy-method="stop" >
<property name="port" value="${test.port:8080}"/>
<property name="configLocation" value="classpath:web.xml" />
</bean>
<bean id="containerWrapper"
class="org.fcrepo.http.commons.test.util.ContainerWrapper"
init-method="start" destroy-method="stop" p:port="${test.port:8080}"
p:configLocation="classpath:web.xml"/>
</beans>
@@ -2,6 +2,7 @@
<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:p="http://www.springframework.org/schema/p"
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">
@@ -11,11 +12,9 @@
<context:annotation-config/>
<bean name="modeshapeRepofactory"
class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean">
<property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:config/rest-sessions/repository.json}"/>
</bean>
class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean"
p:repositoryConfiguration="${fcrepo.modeshape.configuration:config/rest-sessions/repository.json}"/>
<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
</beans>
@@ -2,34 +2,33 @@
<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:p="http://www.springframework.org/schema/p"
xmlns:u="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://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">
<!-- Context that supports the actual ModeShape JCR itself -->
<context:annotation-config/>
<bean name="oauthFilter" class="org.fcrepo.auth.oauth.filter.OAuthFilter">
<property name="realm" value="fedora"/>
<property name="provider">
<bean class="org.fcrepo.auth.oauth.DefaultOAuthResourceProvider">
<!-- mints JCR Sessions : needs to reappear here because it can't be autowired from the enclosed contexts-->
</bean>
</property>
<property name="parameterStyles">
<set
value-type="org.apache.oltu.oauth2.common.message.types.ParameterStyle">
<value>QUERY</value>
<value>HEADER</value>
</set>
</property>
<bean name="oauthFilter" class="org.fcrepo.auth.oauth.filter.OAuthFilter"
p:realm="fedora" p:provider-ref="defaultOAuthResourceProvider"
p:parameterStyles-ref="parameterStyles"/>
<bean id="defaultOAuthResourceProvider" class="org.fcrepo.auth.oauth.DefaultOAuthResourceProvider">
<!-- mints JCR Sessions : needs to reappear here because it can't be autowired from the enclosed contexts-->
</bean>
<u:set id="parameterStyles" value-type="org.apache.oltu.oauth2.common.message.types.ParameterStyle">
<value>QUERY</value>
<value>HEADER</value>
</u:set>
<bean name="wrapFilter"
class="org.fcrepo.auth.oauth.test.filter.AuthenticatedRequestWrappingFilter"/>
<bean name="authNFilter"
class="org.fcrepo.auth.oauth.filter.RestrictToAuthNFilter"/>
@@ -2,14 +2,14 @@
<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:p="http://www.springframework.org/schema/p"
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">
<context:property-placeholder/>
<bean id="containerWrapper" class="org.fcrepo.http.commons.test.util.ContainerWrapper"
init-method="start" destroy-method="stop">
<property name="port" value="${test.port:8080}"/>
<property name="configLocation" value="classpath:web.xml"/>
</bean>
init-method="start" destroy-method="stop"
p:port="${test.port:8080}" p:configLocation="classpath:web.xml"/>
</beans>
@@ -7,6 +7,7 @@
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
<context:annotation-config />
<context:component-scan base-package="org.fcrepo.kernel.services" />
<task:scheduler id="taskScheduler" />

This file was deleted.

Oops, something went wrong.
@@ -3,6 +3,7 @@
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"
xmlns:p="http://www.springframework.org/schema/p"
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
@@ -20,9 +21,8 @@
<bean class="org.fcrepo.kernel.identifiers.UUIDPidMinter"/>
<util:list id="dcgenerators" value-type="org.fcrepo.generator.dublincore.DCGenerator">
<bean class="org.fcrepo.generator.dublincore.WellKnownDatastreamGenerator">
<property name="wellKnownDsid" value="DC"/>
</bean>
<bean class="org.fcrepo.generator.dublincore.WellKnownDatastreamGenerator"
p:wellKnownDsid="DC"/>
<bean class="org.fcrepo.generator.dublincore.JcrPropertiesGenerator"/>
</util:list>
@@ -1,23 +1,22 @@
<?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"
xsi:schemaLocation="
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:p="http://www.springframework.org/schema/p"
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">
<!-- Context that supports the actual ModeShape JCR itself -->
<!-- Context that supports the actual ModeShape JCR itself -->
<context:annotation-config/>
<context:annotation-config/>
<context:property-placeholder/>
<context:property-placeholder/>
<bean name="modeshapeRepofactory"
class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean">
<property name="repositoryConfiguration" value="${fcrepo.modeshape.configuration:/config/rest-sessions/repository.json}"/>
</bean>
<bean name="modeshapeRepofactory"
class="org.fcrepo.kernel.spring.ModeShapeRepositoryFactoryBean"
p:repositoryConfiguration="${fcrepo.modeshape.configuration:/config/rest-sessions/repository.json}"/>
<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
<bean class="org.modeshape.jcr.JcrRepositoryFactory"/>
</beans>
@@ -2,19 +2,18 @@
<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:p="http://www.springframework.org/schema/p"
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">
<context:property-placeholder/>
<!-- show stack traces for easier debugging -->
<bean id="wildcardExceptionmapper" class="org.fcrepo.http.commons.exceptionhandlers.WildcardExceptionMapper" >
<property name="showStackTrace" value="true" />
</bean>
<bean id="wildcardExceptionmapper" class="org.fcrepo.http.commons.exceptionhandlers.WildcardExceptionMapper"
p:showStackTrace="true"/>
<bean id="containerWrapper" class="org.fcrepo.http.commons.test.util.ContainerWrapper" init-method="start" destroy-method="stop" >
<property name="port" value="${test.port:8080}"/>
<property name="configLocation" value="classpath:web.xml" />
</bean>
<bean id="containerWrapper" class="org.fcrepo.http.commons.test.util.ContainerWrapper"
init-method="start" destroy-method="stop"
p:port="${test.port:8080}" p:configLocation="classpath:web.xml"/>
</beans>

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit a8f930f

Please sign in to comment.